Merge remote-tracking branch 'upstream/pull/2175'

[rails.git] / test / test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 83cf909dd94f208c5b89c20e024f8e6941e040f4..e66d782ff06bf0b2c2e5eb8417aca58a617ebeea 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,6 +1,21 @@
 require "coveralls"
 Coveralls.wear!("rails")
 
 require "coveralls"
 Coveralls.wear!("rails")
 

+# Override the simplecov output message, since it is mostly unwanted noise
+module SimpleCov
+  module Formatter
+    class HTMLFormatter
+      def output_message(_result); end
+    end
+  end
+end
+
+# Output both the local simplecov html and the coveralls report
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new(
+  [SimpleCov::Formatter::HTMLFormatter,
+   Coveralls::SimpleCov::Formatter]
+)
+

 ENV["RAILS_ENV"] = "test"
 require_relative "../config/environment"
 require "rails/test_help"
 ENV["RAILS_ENV"] = "test"
 require_relative "../config/environment"
 require "rails/test_help"


@@ -11,6 +26,7 @@ WebMock.disable_net_connect!(:allow_localhost => true)
 module ActiveSupport
   class TestCase
     include FactoryBot::Syntax::Methods
 module ActiveSupport
   class TestCase
     include FactoryBot::Syntax::Methods

+    include ActiveJob::TestHelper

 
     ##
     # takes a block which is executed in the context of a different
 
     ##
     # takes a block which is executed in the context of a different


@@ -93,12 +109,6 @@ module ActiveSupport
       @request.env["HTTP_X_ERROR_FORMAT"] = format
     end
 
       @request.env["HTTP_X_ERROR_FORMAT"] = format
     end
 

-    ##
-    # set the raw body to be sent with a POST request
-    def content(c)
-      @request.env["RAW_POST_DATA"] = c.to_s
-    end
-

     ##
     # Used to check that the error header and the forbidden responses are given
     # when the owner of the changset has their data not marked as public
     ##
     # Used to check that the error header and the forbidden responses are given
     # when the owner of the changset has their data not marked as public