aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/dispatch
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2018-03-13 21:30:21 +0100
committerKasper Timm Hansen <kaspth@gmail.com>2018-03-13 21:30:21 +0100
commitf7e7fdc52c35f61eaf0c11dbeb0a267baa0acb82 (patch)
treea2223282d3b3b464760b125aa4be605fba2f43a8 /actionpack/test/dispatch
parent6629d51a2756fadf961bb09df20579cacfef2c8e (diff)
downloadrails-f7e7fdc52c35f61eaf0c11dbeb0a267baa0acb82.tar.gz
rails-f7e7fdc52c35f61eaf0c11dbeb0a267baa0acb82.tar.bz2
rails-f7e7fdc52c35f61eaf0c11dbeb0a267baa0acb82.zip
Fix routing inspector tests broken in https://github.com/rails/rails/commit/6629d51a2756fadf961bb09df20579cacfef2c8e
* 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.
Diffstat (limited to 'actionpack/test/dispatch')
-rw-r--r--actionpack/test/dispatch/routing/inspector_test.rb29
1 files changed, 15 insertions, 14 deletions
diff --git a/actionpack/test/dispatch/routing/inspector_test.rb b/actionpack/test/dispatch/routing/inspector_test.rb
index cf26f9fb3e..9150d5010b 100644
--- a/actionpack/test/dispatch/routing/inspector_test.rb
+++ b/actionpack/test/dispatch/routing/inspector_test.rb
@@ -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