Merge branch 'master' of git://github.com/rails/rails

2 files changed, 17 insertions, 13 deletions

diff --git a/actionpack/lib/action_dispatch/testing/assertions/routing.rb b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
index e6d6b5a3ef..4bc5275e04 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/routing.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
@@ -134,9 +134,11 @@ module ActionDispatch
           # Assume given controller
           request = ActionController::TestRequest.new
           request.env["REQUEST_METHOD"] = request_method.to_s.upcase if request_method
-          request.path   = path
+          request.path = path
+
+          params = ActionController::Routing::Routes.recognize_path(path, { :method => request.method })
+          request.path_parameters = params.with_indifferent_access
 
-          ActionController::Routing::Routes.recognize(request)
           request
         end
     end
diff --git a/actionpack/lib/action_dispatch/testing/performance_test.rb b/actionpack/lib/action_dispatch/testing/performance_test.rb
index b1ed9d31f4..1b9a6c18b7 100644
--- a/actionpack/lib/action_dispatch/testing/performance_test.rb
+++ b/actionpack/lib/action_dispatch/testing/performance_test.rb
@@ -1,15 +1,17 @@
 require 'active_support/testing/performance'
 require 'active_support/testing/default'
 
-module ActionDispatch
-  # An integration test that runs a code profiler on your test methods.
-  # Profiling output for combinations of each test method, measurement, and
-  # output format are written to your tmp/performance directory.
-  #
-  # By default, process_time is measured and both flat and graph_html output
-  # formats are written, so you'll have two output files per test method.
-  class PerformanceTest < ActionDispatch::IntegrationTest
-    include ActiveSupport::Testing::Performance
-    include ActiveSupport::Testing::Default
+if defined?(ActiveSupport::Testing::Performance)
+  module ActionDispatch
+    # An integration test that runs a code profiler on your test methods.
+    # Profiling output for combinations of each test method, measurement, and
+    # output format are written to your tmp/performance directory.
+    #
+    # By default, process_time is measured and both flat and graph_html output
+    # formats are written, so you'll have two output files per test method.
+    class PerformanceTest < ActionDispatch::IntegrationTest
+      include ActiveSupport::Testing::Performance
+      include ActiveSupport::Testing::Default
+    end
   end
-end
+end
\ No newline at end of file