aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2015-08-03 10:51:34 +0200
committerYves Senn <yves.senn@gmail.com>2015-08-03 10:51:34 +0200
commitc402479f59e248056c87d547ee3ef8482354e917 (patch)
tree6a8e1ddb5368b437c4dd0f9d0760866411a1545d
parentca8f3cac4801e1219b38f575123636436b08129f (diff)
parent74810392254694050ed736ba540918a6bc8f646a (diff)
downloadrails-c402479f59e248056c87d547ee3ef8482354e917.tar.gz
rails-c402479f59e248056c87d547ee3ef8482354e917.tar.bz2
rails-c402479f59e248056c87d547ee3ef8482354e917.zip
Merge pull request #21095 from aditya-kapoor/add-missing-assertion
Add missing assertion for test_route_with_colon_first
-rw-r--r--actionpack/test/controller/routing_test.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index 9bbfb74e72..a333290ade 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -335,9 +335,11 @@ class LegacyRouteSetTests < ActiveSupport::TestCase
def test_route_with_colon_first
rs.draw do
- get '/:controller/:action/:id', :action => 'index', :id => nil
- get ':url', :controller => 'tiny_url', :action => 'translate'
+ get '/:controller/:action/:id', action: 'index', id: nil
+ get ':url', controller: 'content', action: 'translate'
end
+
+ assert_equal({controller: 'content', action: 'translate', url: 'example'}, rs.recognize_path('/example'))
end
def test_route_with_regexp_for_controller