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

[rails.git] / test / test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 41dac890a4e880af2f61fc3ae9d77dca800bd65a..a6147ef29054e817dbe27d7cd9b3c5a146dcf6a6 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)
 
+    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
@@ -152,7 +160,7 @@ module ActiveSupport
 
       request.sign!(oauth)
 
-      method(method).call(request.signed_uri, options)
+      method(method).call(request.signed_uri, **options)
     end
 
     ##
@@ -235,6 +243,7 @@ module ActiveSupport
     end
 
     def session_for(user)
+      get login_path
       post login_path, :params => { :username => user.display_name, :password => "test" }
       follow_redirect!
     end