aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/dispatch/routing
diff options
context:
space:
mode:
authorJeremy Daer <jeremydaer@gmail.com>2016-04-24 15:27:46 -0700
committerJeremy Daer <jeremydaer@gmail.com>2016-04-24 15:27:46 -0700
commit643cac08a325243cab21d870c68a9c4088c58380 (patch)
treea4c4e006015254e7a8249ce323739511340535ec /actionpack/test/dispatch/routing
parentedc2b7718725016e988089b5fb6d6fb9d6e16882 (diff)
parent8ca8a2d773b942c4ea76baabe2df502a339d05b1 (diff)
downloadrails-643cac08a325243cab21d870c68a9c4088c58380.tar.gz
rails-643cac08a325243cab21d870c68a9c4088c58380.tar.bz2
rails-643cac08a325243cab21d870c68a9c4088c58380.zip
Merge pull request #23103 from rails/refactor-handling-of-action-default
Refactor handling of :action default in routing
Diffstat (limited to 'actionpack/test/dispatch/routing')
-rw-r--r--actionpack/test/dispatch/routing/inspector_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/dispatch/routing/inspector_test.rb b/actionpack/test/dispatch/routing/inspector_test.rb
index 9d0d23d6de..5aafcb23c2 100644
--- a/actionpack/test/dispatch/routing/inspector_test.rb
+++ b/actionpack/test/dispatch/routing/inspector_test.rb
@@ -347,7 +347,7 @@ module ActionDispatch
end
assert_equal ["Prefix Verb URI Pattern Controller#Action",
- " GET /:controller(/:action) (?-mix:api\\/[^\\/]+)#:action"], output
+ " GET /:controller(/:action) :controller#:action"], output
end
def test_inspect_routes_shows_resources_route_when_assets_disabled