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

[rails.git] / test / test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index b7b93455206e1fb5d01090cdec53b5bca27f94f9..747edf016056b30c7a0e10b347ed72cc4ec9b466 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -11,6 +11,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 +88,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