aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/generators/shared_generator_tests.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-01-04 13:51:31 -0800
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-01-04 13:51:31 -0800
commitd2bc6f9df6362a0892787b23ec8a68cef7a3e965 (patch)
tree8a075bd51c60b6cfef71ee9c7cf7c7f91d668684 /railties/test/generators/shared_generator_tests.rb
parent5b750c1891871d5dd6dae8b8099d91553ae1b024 (diff)
parentab3cf010ad4e7c3f56b5ec468c0c74e0d998b96d (diff)
downloadrails-d2bc6f9df6362a0892787b23ec8a68cef7a3e965.tar.gz
rails-d2bc6f9df6362a0892787b23ec8a68cef7a3e965.tar.bz2
rails-d2bc6f9df6362a0892787b23ec8a68cef7a3e965.zip
Merge pull request #8760 from amatsuda/railties_failing_tests_fix
fix failing test broken in 15fb7889c5566ddade1d8f74f49bbbc1c0be6057
Diffstat (limited to 'railties/test/generators/shared_generator_tests.rb')
-rw-r--r--railties/test/generators/shared_generator_tests.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/generators/shared_generator_tests.rb b/railties/test/generators/shared_generator_tests.rb
index 1e5a4545a1..e4924c8386 100644
--- a/railties/test/generators/shared_generator_tests.rb
+++ b/railties/test/generators/shared_generator_tests.rb
@@ -48,7 +48,7 @@ module SharedGeneratorTests
def test_options_before_application_name_raises_an_error
content = capture(:stderr){ run_generator(["--pretend", destination_root]) }
- assert_match(/Options should be given after the \w+ name. For details run: rails( plugin)? --help\n/, content)
+ assert_match(/Options should be given after the \w+ name. For details run: rails( plugin new)? --help\n/, content)
end
def test_name_collision_raises_an_error