aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-09-30 19:56:09 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2012-09-30 19:56:09 -0700
commit34239cc511ac8de9a23e84fd6835a2f2440d2863 (patch)
tree89dd5ede55fa5eb5b6303e0e4b5949ffbd991ef2 /railties
parent2547f369898839354d046c13a754be332eb755f7 (diff)
parentb09e5922e1d26b0867e7113309cc0696561cfd95 (diff)
downloadrails-34239cc511ac8de9a23e84fd6835a2f2440d2863.tar.gz
rails-34239cc511ac8de9a23e84fd6835a2f2440d2863.tar.bz2
rails-34239cc511ac8de9a23e84fd6835a2f2440d2863.zip
Merge pull request #7811 from iHiD/resource_generator_routes_master
Fix the build (Broken scaffold routes test)
Diffstat (limited to 'railties')
-rw-r--r--railties/test/generators/scaffold_generator_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/generators/scaffold_generator_test.rb b/railties/test/generators/scaffold_generator_test.rb
index 40c5188042..f802f3c4ad 100644
--- a/railties/test/generators/scaffold_generator_test.rb
+++ b/railties/test/generators/scaffold_generator_test.rb
@@ -142,7 +142,7 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase
# Route
assert_file "config/routes.rb" do |route|
- assert_match(/namespace :admin do resources :roles end$/, route)
+ assert_match(/^ namespace :admin do\n resources :roles\n end$/, route)
end
# Controller