aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/generators
diff options
context:
space:
mode:
authorAndrew White <pixeltrix@users.noreply.github.com>2015-04-14 08:45:18 +0100
committerAndrew White <pixeltrix@users.noreply.github.com>2015-04-14 08:45:18 +0100
commit4fb3a55528d9e73c3dc49a838703408a8a33485b (patch)
tree01a6900b6e89379e607acf07dbe1701c3b3a830e /railties/test/generators
parent524d40591eaa2f4d007409bfad386f6b107492eb (diff)
parentd2be2a9166815f862dad24d160c643589e80b259 (diff)
downloadrails-4fb3a55528d9e73c3dc49a838703408a8a33485b.tar.gz
rails-4fb3a55528d9e73c3dc49a838703408a8a33485b.tar.bz2
rails-4fb3a55528d9e73c3dc49a838703408a8a33485b.zip
Merge pull request #19751 from y-yagi/fix_indent_of_controller
fix indent in routes when using namespaced controllers
Diffstat (limited to 'railties/test/generators')
-rw-r--r--railties/test/generators/controller_generator_test.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/railties/test/generators/controller_generator_test.rb b/railties/test/generators/controller_generator_test.rb
index a7d56dd352..1351151afb 100644
--- a/railties/test/generators/controller_generator_test.rb
+++ b/railties/test/generators/controller_generator_test.rb
@@ -96,6 +96,8 @@ class ControllerGeneratorTest < Rails::Generators::TestCase
def test_namespaced_routes_are_created_in_routes
run_generator ["admin/dashboard", "index"]
- assert_file "config/routes.rb", /namespace :admin do\n\s+get 'dashboard\/index'\n/
+ assert_file "config/routes.rb" do |route|
+ assert_match(/^ namespace :admin do\n get 'dashboard\/index'\n end$/, route)
+ end
end
end