Framework backtrace cleaning is handled by ActiveSupport now

1 files changed, 19 insertions, 23 deletions

diff --git a/actionpack/lib/action_controller/testing/assertions/routing.rb b/actionpack/lib/action_controller/testing/assertions/routing.rb
index 5101751cea..f3f4f54fe3 100644
--- a/actionpack/lib/action_controller/testing/assertions/routing.rb
+++ b/actionpack/lib/action_controller/testing/assertions/routing.rb
@@ -44,19 +44,17 @@ module ActionController
           request_method = nil
         end
 
-        clean_backtrace do
-          ActionController::Routing::Routes.reload if ActionController::Routing::Routes.empty?
-          request = recognized_request_for(path, request_method)
+        ActionController::Routing::Routes.reload if ActionController::Routing::Routes.empty?
+        request = recognized_request_for(path, request_method)
 
-          expected_options = expected_options.clone
-          extras.each_key { |key| expected_options.delete key } unless extras.nil?
+        expected_options = expected_options.clone
+        extras.each_key { |key| expected_options.delete key } unless extras.nil?
 
-          expected_options.stringify_keys!
-          routing_diff = expected_options.diff(request.path_parameters)
-          msg = build_message(message, "The recognized options <?> did not match <?>, difference: <?>",
-              request.path_parameters, expected_options, expected_options.diff(request.path_parameters))
-          assert_block(msg) { request.path_parameters == expected_options }
-        end
+        expected_options.stringify_keys!
+        routing_diff = expected_options.diff(request.path_parameters)
+        msg = build_message(message, "The recognized options <?> did not match <?>, difference: <?>",
+            request.path_parameters, expected_options, expected_options.diff(request.path_parameters))
+        assert_block(msg) { request.path_parameters == expected_options }
       end
 
       # Asserts that the provided options can be used to generate the provided path.  This is the inverse of +assert_recognizes+.
@@ -78,21 +76,19 @@ module ActionController
       #   # Asserts that the generated route gives us our custom route
       #   assert_generates "changesets/12", { :controller => 'scm', :action => 'show_diff', :revision => "12" }
       def assert_generates(expected_path, options, defaults={}, extras = {}, message=nil)
-        clean_backtrace do
-          expected_path = "/#{expected_path}" unless expected_path[0] == ?/
-          # Load routes.rb if it hasn't been loaded.
-          ActionController::Routing::Routes.reload if ActionController::Routing::Routes.empty?
+        expected_path = "/#{expected_path}" unless expected_path[0] == ?/
+        # Load routes.rb if it hasn't been loaded.
+        ActionController::Routing::Routes.reload if ActionController::Routing::Routes.empty?
 
-          generated_path, extra_keys = ActionController::Routing::Routes.generate_extras(options, defaults)
-          found_extras = options.reject {|k, v| ! extra_keys.include? k}
+        generated_path, extra_keys = ActionController::Routing::Routes.generate_extras(options, defaults)
+        found_extras = options.reject {|k, v| ! extra_keys.include? k}
 
-          msg = build_message(message, "found extras <?>, not <?>", found_extras, extras)
-          assert_block(msg) { found_extras == extras }
+        msg = build_message(message, "found extras <?>, not <?>", found_extras, extras)
+        assert_block(msg) { found_extras == extras }
 
-          msg = build_message(message, "The generated path <?> did not match <?>", generated_path,
-              expected_path)
-          assert_block(msg) { expected_path == generated_path }
-        end
+        msg = build_message(message, "The generated path <?> did not match <?>", generated_path,
+            expected_path)
+        assert_block(msg) { expected_path == generated_path }
       end
 
       # Asserts that path and options match both ways; in other words, it verifies that <tt>path</tt> generates