Permalink
Browse files

Tidy up tests and CHANGELOG for #12598

  • Loading branch information...
1 parent f9f32e0 commit bf191318afb62a66fe37bd2649ecabfc4c8744a6 @pixeltrix pixeltrix committed Jan 20, 2014
View
@@ -1,9 +1,20 @@
-* Add ability to set a prefix name for routes which have hyphen(s).
+* Automatically convert dashes to underscores for shorthand routes, e.g:
+
+ get '/our-work/latest'
+
+ When running `rake routes` you will get the following output:
+
+ Prefix Verb URI Pattern Controller#Action
+ our_work_latest GET /our-work/latest(.:format) our_work#latest
+
+ *Mikko Johansson*
+
+* Automatically convert dashes to underscores for url helpers, e.g:
get '/contact-us' => 'pages#contact'
get '/about-us' => 'pages#about_us'
- The above routes will inspected to
+ When running `rake routes` you will get the following output:
Prefix Verb URI Pattern Controller#Action
contact_us GET /contact-us(.:format) pages#contact
@@ -37,7 +37,6 @@ def self.inspect
end
engine.routes.draw do
get '/cart', :to => 'cart#show'
- get '/view-cart', :to => 'cart#show'
end
output = draw do
@@ -51,8 +50,7 @@ def self.inspect
" blog /blog Blog::Engine",
"",
"Routes for Blog::Engine:",
- " cart GET /cart(.:format) cart#show",
- "view_cart GET /view-cart(.:format) cart#show"
+ " cart GET /cart(.:format) cart#show"
], output
end
@@ -162,6 +160,19 @@ def test_rake_routes_shows_route_with_constraints
], output
end
+ def test_rake_routes_shows_routes_with_dashes
+ output = draw do
+ get 'about-us' => 'pages#about_us'
+ get 'our-work/latest'
+ end
+
+ assert_equal [
+ " Prefix Verb URI Pattern Controller#Action",
+ " about_us GET /about-us(.:format) pages#about_us",
+ "our_work_latest GET /our-work/latest(.:format) our_work#latest"
+ ], output
+ end
+
class RackApp
def self.call(env)
end
@@ -30,12 +30,10 @@ def call(env)
draw do
get 'foo', to: SimpleApp.new('foo#index')
get 'bar', to: SimpleApp.new('bar#index')
- get 'foo-bar', to: SimpleApp.new('bar#index')
end
assert_equal '/foo', url_helpers.foo_path
assert_equal '/bar', url_helpers.bar_path
- assert_equal '/foo-bar', url_helpers.foo_bar_path
end
test "url helpers are updated when route is updated" do
@@ -2912,6 +2912,16 @@ def test_trailing_slash
assert @response.ok?, 'route with trailing slash and with QUERY_STRING should work'
end
+ def test_route_with_dashes_in_path
+ draw do
+ get '/contact-us', to: 'pages#contact_us'
+ end
+
+ get '/contact-us'
+ assert_equal 'pages#contact_us', @response.body
+ assert_equal '/contact-us', contact_us_path
+ end
+
def test_shorthand_route_with_dashes_in_path
draw do
get '/about-us/index'

0 comments on commit bf19131

Please sign in to comment.