Skip to content

Commit

Permalink
Fixes routes to match verbs and path with -g option
Browse files Browse the repository at this point in the history
  • Loading branch information
abhishekjain16 committed Feb 11, 2016
1 parent 31778a3 commit 4e3931a
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
5 changes: 3 additions & 2 deletions actionpack/lib/action_dispatch/routing/inspector.rb
Expand Up @@ -84,14 +84,15 @@ def normalize_filter(filter)
if filter.is_a?(Hash) && filter[:controller]
{ controller: /#{filter[:controller].downcase.sub(/_?controller\z/, '').sub('::', '/')}/ }
elsif filter
{ controller: /#{filter}/, action: /#{filter}/ }
{ controller: /#{filter}/, action: /#{filter}/, verb: /#{filter}/, name: /#{filter}/, path: /#{filter}/ }
end
end

def filter_routes(filter)
if filter
@routes.select do |route|
filter.any? { |default, value| route.defaults[default] =~ value }
route_wrapper = RouteWrapper.new(route)
filter.any? { |default, value| route_wrapper.send(default) =~ value }
end
else
@routes
Expand Down
10 changes: 9 additions & 1 deletion railties/test/application/rake_test.rb
Expand Up @@ -179,12 +179,20 @@ def test_rake_routes_with_global_search_key
app_file "config/routes.rb", <<-RUBY
Rails.application.routes.draw do
get '/cart', to: 'cart#show'
get '/basketball', to: 'basketball#index'
post '/cart', to: 'cart#create'
get '/basketballs', to: 'basketball#index'
end
RUBY

output = Dir.chdir(app_path){ `bin/rails routes -g show` }
assert_equal "Prefix Verb URI Pattern Controller#Action\n cart GET /cart(.:format) cart#show\n", output

output = Dir.chdir(app_path){ `bin/rails routes -g POST` }
assert_equal "Prefix Verb URI Pattern Controller#Action\n POST /cart(.:format) cart#create\n", output

output = Dir.chdir(app_path){ `bin/rails routes -g basketballs` }
assert_equal " Prefix Verb URI Pattern Controller#Action\n" \
"basketballs GET /basketballs(.:format) basketball#index\n", output
end

def test_rake_routes_with_controller_search_key
Expand Down

0 comments on commit 4e3931a

Please sign in to comment.