aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/dispatch/routing_test.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/test/dispatch/routing_test.rb')
-rw-r--r--actionpack/test/dispatch/routing_test.rb11
1 files changed, 6 insertions, 5 deletions
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 93d89f7568..34606512dc 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -281,6 +281,8 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
scope(':version', :version => /.+/) do
resources :users, :id => /.+?/, :format => /json|xml/
end
+
+ get "products/list"
end
get 'sprockets.js' => ::TestRoutingMapper::SprocketsApp
@@ -363,7 +365,6 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
resources :errors, :shallow => true do
resources :notices
end
- get 'api/version'
end
scope :path => 'api' do
@@ -1301,10 +1302,10 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
assert_equal 'account#shorthand', @response.body
end
- def test_match_shorthand_with_module
- assert_equal '/api/version', api_version_path
- get '/api/version'
- assert_equal 'api/api#version', @response.body
+ def test_match_shorthand_inside_namespace_with_controller
+ assert_equal '/api/products/list', api_products_list_path
+ get '/api/products/list'
+ assert_equal 'api/products#list', @response.body
end
def test_dynamically_generated_helpers_on_collection_do_not_clobber_resources_url_helper