diff options
| author | Brian Hahn <brian.hahn@crowdflower.com> | 2013-09-04 16:43:36 -0700 |
|---|---|---|
| committer | Brian Hahn <brian.hahn@crowdflower.com> | 2013-09-06 11:08:41 -0700 |
| commit | 03ac291526b04586a0f0db0f531f18f14be792c6 (patch) | |
| tree | 0a9e5bf5973002ce97c85dc75fbe84358edf977e /actionpack/lib | |
| parent | 59a35610459da7368e79179c9d33bc6e4697adb1 (diff) | |
| download | rails-03ac291526b04586a0f0db0f531f18f14be792c6.tar.gz rails-03ac291526b04586a0f0db0f531f18f14be792c6.tar.bz2 rails-03ac291526b04586a0f0db0f531f18f14be792c6.zip | |
pass the extra params to the rack test environment so that routes with block constraints have access
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 3 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/assertions/routing.rb | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index 6e63f92ff3..d9671a4932 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -611,9 +611,10 @@ module ActionDispatch def recognize_path(path, environment = {}) method = (environment[:method] || "GET").to_s.upcase path = Journey::Router::Utils.normalize_path(path) unless path =~ %r{://} + extras = environment[:extras] || {} begin - env = Rack::MockRequest.env_for(path, {:method => method}) + env = Rack::MockRequest.env_for(path, {:method => method, :params => extras}) rescue URI::InvalidURIError => e raise ActionController::RoutingError, e.message end diff --git a/actionpack/lib/action_dispatch/testing/assertions/routing.rb b/actionpack/lib/action_dispatch/testing/assertions/routing.rb index b10aab9029..2a25d3fcc6 100644 --- a/actionpack/lib/action_dispatch/testing/assertions/routing.rb +++ b/actionpack/lib/action_dispatch/testing/assertions/routing.rb @@ -39,7 +39,7 @@ module ActionDispatch # # Test a custom route # assert_recognizes({:controller => 'items', :action => 'show', :id => '1'}, 'view/item1') def assert_recognizes(expected_options, path, extras={}, message=nil) - request = recognized_request_for(path) + request = recognized_request_for(path, extras) expected_options = expected_options.clone extras.each_key { |key| expected_options.delete key } unless extras.nil? @@ -179,7 +179,7 @@ module ActionDispatch private # Recognizes the route for a given path. - def recognized_request_for(path) + def recognized_request_for(path, extras = {}) if path.is_a?(Hash) method = path[:method] path = path[:path] @@ -207,7 +207,7 @@ module ActionDispatch request.request_method = method if method - params = @routes.recognize_path(path, { :method => method }) + params = @routes.recognize_path(path, { :method => method, :extras => extras }) request.path_parameters = params.with_indifferent_access request |