diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2015-08-11 07:56:32 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2015-08-11 14:49:18 -0700 |
| commit | 97bbde76009daa7f4ebdf8a59943cfbbebe4da04 (patch) | |
| tree | db9cb64d06c40bc6f7a821cd109de7a3e7818439 /actionpack/test/dispatch/mapper_test.rb | |
| parent | 73c9e6a7aa7e3d082f969d5f0e5a6a0e2e2e4232 (diff) | |
| download | rails-97bbde76009daa7f4ebdf8a59943cfbbebe4da04.tar.gz rails-97bbde76009daa7f4ebdf8a59943cfbbebe4da04.tar.bz2 rails-97bbde76009daa7f4ebdf8a59943cfbbebe4da04.zip | |
pull up the "options.delete(:controller)" logic
we want to try to pull this logic up to where the user actually passed
in "controller" so that it's close to the related call. That way when
we're down the stack, we don't need to wonder "why are we doing this?"
Diffstat (limited to 'actionpack/test/dispatch/mapper_test.rb')
| -rw-r--r-- | actionpack/test/dispatch/mapper_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/dispatch/mapper_test.rb b/actionpack/test/dispatch/mapper_test.rb index aed1d914f9..18daa62425 100644 --- a/actionpack/test/dispatch/mapper_test.rb +++ b/actionpack/test/dispatch/mapper_test.rb @@ -41,8 +41,8 @@ module ActionDispatch end def test_mapping_requirements - options = { :controller => 'foo', :action => 'bar', :via => :get } - m = Mapper::Mapping.build({}, FakeSet.new, '/store/:name(*rest)', nil, options) + options = { :action => 'bar', :via => :get } + m = Mapper::Mapping.build({}, FakeSet.new, '/store/:name(*rest)', nil, 'foo', options) _, _, requirements, _ = m.to_route assert_equal(/.+?/, requirements[:rest]) end |