spelling: unknown

[rails.git] / test / test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 41dac890a4e880af2f61fc3ae9d77dca800bd65a..6c8a798aac1d4106b6ac29dec0957c216d7323d6 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -43,6 +43,14 @@ module ActiveSupport
     # Run tests in parallel with specified workers
     parallelize(:workers => :number_of_processors)
 
     # Run tests in parallel with specified workers
     parallelize(:workers => :number_of_processors)
 

+    parallelize_setup do |worker|
+      SimpleCov.command_name "#{SimpleCov.command_name}-#{worker}"
+    end
+
+    parallelize_teardown do
+      SimpleCov.result
+    end
+

     ##
     # takes a block which is executed in the context of a different
     # ActionController instance. this is used so that code can call methods
     ##
     # takes a block which is executed in the context of a different
     # ActionController instance. this is used so that code can call methods


@@ -130,6 +138,12 @@ module ActiveSupport
       { "Authorization" => format("Basic %<auth>s", :auth => Base64.encode64("#{user}:#{pass}")) }
     end
 
       { "Authorization" => format("Basic %<auth>s", :auth => Base64.encode64("#{user}:#{pass}")) }
     end
 

+    ##
+    # return request header for HTTP Bearer Authorization
+    def bearer_authorization_header(token)
+      { "Authorization" => "Bearer #{token}" }
+    end
+

     ##
     # make an OAuth signed request
     def signed_request(method, uri, options = {})
     ##
     # make an OAuth signed request
     def signed_request(method, uri, options = {})


@@ -152,7 +166,7 @@ module ActiveSupport
 
       request.sign!(oauth)
 
 
       request.sign!(oauth)
 

-      method(method).call(request.signed_uri, options)
+      method(method).call(request.signed_uri, **options)

     end
 
     ##
     end
 
     ##


@@ -181,7 +195,7 @@ module ActiveSupport
 
     ##
     # Used to check that the error header and the forbidden responses are given
 
     ##
     # 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
+    # when the owner of the changeset has their data not marked as public

     def assert_require_public_data(msg = "Shouldn't be able to use API when the user's data is not public")
       assert_response :forbidden, msg
       assert_equal("You must make your edits public to upload new data", @response.headers["Error"], "Wrong error message")
     def assert_require_public_data(msg = "Shouldn't be able to use API when the user's data is not public")
       assert_response :forbidden, msg
       assert_equal("You must make your edits public to upload new data", @response.headers["Error"], "Wrong error message")


@@ -235,6 +249,7 @@ module ActiveSupport
     end
 
     def session_for(user)
     end
 
     def session_for(user)

+      get login_path

       post login_path, :params => { :username => user.display_name, :password => "test" }
       follow_redirect!
     end
       post login_path, :params => { :username => user.display_name, :password => "test" }
       follow_redirect!
     end