kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Fix routing inspector tests broken in 6629d51a27

Browse source 
* Renames grep_pattern to grep throughout.
* Fixes setup not calling super by calling setup with a block.
* Converts test helper method to a private one, like we have it other places.
* Uses keyword arguments to get around awkward draw({ grep: "x" }, Action…)
  construction.
This commit is contained in:
Kasper Timm Hansen 2018-03-13 21:30:21 +01:00
parent 6629d51a27
commit f7e7fdc52c
No known key found for this signature in database
GPG key ID: 191153215EDA53D8
1 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
actionpack/test/dispatch/routing/inspector_test.rb
View file

@ -16,16 +16,10 @@ end
module ActionDispatch
module Routing
class RoutesInspectorTest < ActiveSupport::TestCase
def setup
setup do
@set = ActionDispatch::Routing::RouteSet.new
end
def draw(options = {}, formater = ActionDispatch::Routing::ConsoleFormatter::Sheet.new, &block)
@set.draw(&block)
inspector = ActionDispatch::Routing::RoutesInspector.new(@set.routes)
inspector.format(formater, options).split("\n")
end
def test_displaying_routes_for_engines
engine = Class.new(Rails::Engine) do
def self.inspect
@ -306,7 +300,7 @@ module ActionDispatch
end
def test_routes_can_be_filtered
output = draw(grep_pattern: "posts") do
output = draw(grep: "posts") do
resources :articles
resources :posts
end
@ -335,7 +329,7 @@ module ActionDispatch
get "/cart", to: "cart#show"
end
output = draw({}, ActionDispatch::Routing::ConsoleFormatter::Expanded.new) do
output = draw(formatter: ActionDispatch::Routing::ConsoleFormatter::Expanded.new) do
get "/custom/assets", to: "custom_assets#show"
get "/custom/furnitures", to: "custom_furnitures#show"
mount engine => "/blog", :as => "blog"
@ -368,7 +362,7 @@ module ActionDispatch
end
def test_no_routes_matched_filter_when_expanded
output = draw({ grep_pattern: "rails/dummy" }, ActionDispatch::Routing::ConsoleFormatter::Expanded.new) do
output = draw(grep: "rails/dummy", formatter: ActionDispatch::Routing::ConsoleFormatter::Expanded.new) do
get "photos/:id" => "photos#show", :id => /[A-Z]\d{5}/
end
@ -379,7 +373,7 @@ module ActionDispatch
end
def test_not_routes_when_expanded
output = draw({ grep_pattern: "rails/dummy" }, ActionDispatch::Routing::ConsoleFormatter::Expanded.new) {}
output = draw(grep: "rails/dummy", formatter: ActionDispatch::Routing::ConsoleFormatter::Expanded.new) {}
assert_equal [
"You don't have any routes defined!",
@ -391,7 +385,7 @@ module ActionDispatch
end
def test_routes_can_be_filtered_with_namespaced_controllers
output = draw(grep_pattern: "admin/posts") do
output = draw(grep: "admin/posts") do
resources :articles
namespace :admin do
resources :posts
@ -445,7 +439,7 @@ module ActionDispatch
end
def test_no_routes_matched_filter
output = draw(grep_pattern: "rails/dummy") do
output = draw(grep: "rails/dummy") do
get "photos/:id" => "photos#show", :id => /[A-Z]\d{5}/
end
@ -456,7 +450,7 @@ module ActionDispatch
end
def test_no_routes_were_defined
output = draw(grep_pattern: "Rails::DummyController") {}
output = draw(grep: "Rails::DummyController") {}
assert_equal [
"You don't have any routes defined!",
@ -489,6 +483,13 @@ module ActionDispatch
"custom_assets GET /custom/assets(.:format) custom_assets#show",
], output
end
private
def draw(formatter: ActionDispatch::Routing::ConsoleFormatter::Sheet.new, **options, &block)
@set.draw(&block)
inspector = ActionDispatch::Routing::RoutesInspector.new(@set.routes)
inspector.format(formatter, options).split("\n")
end
end
end
end