X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/420a7289a0b08eee091f6650c2e83166df3fbe69..399ade116adb8250bbf92efa8dfeb3ca1090c7e4:/test/test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index b7b934552..e66d782ff 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,6 +1,21 @@
 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"
@@ -11,6 +26,7 @@ WebMock.disable_net_connect!(:allow_localhost => true)
 module ActiveSupport
   class TestCase
     include FactoryBot::Syntax::Methods
+    include ActiveJob::TestHelper
 
     ##
     # takes a block which is executed in the context of a different
@@ -87,28 +103,12 @@ module ActiveSupport
       @request.env["HTTP_AUTHORIZATION"] = format("Basic %{auth}", :auth => Base64.encode64("#{user}:#{pass}"))
     end
 
-    ##
-    # set oauth token permissions
-    def grant_oauth_token(*tokens)
-      request.env["oauth.token"] = AccessToken.new do |token|
-        tokens.each do |t|
-          token.public_send("#{t}=", true)
-        end
-      end
-    end
-
     ##
     # set request readers to ask for a particular error format
     def error_format(format)
       @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