diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-06-08 21:23:29 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-06-08 21:23:29 +0200 |
| commit | 751f79a03351f1f0d21436b2b947352b97ded093 (patch) | |
| tree | 9dd053597389241398c9173ab7f565697bef055f /railties/test/generators | |
| parent | e7e6ee3e7b075f5447697a6038cb46d65f9b137a (diff) | |
| parent | ab2877cbe89e266ee986fc12e603abd93ac017ad (diff) | |
| download | rails-751f79a03351f1f0d21436b2b947352b97ded093.tar.gz rails-751f79a03351f1f0d21436b2b947352b97ded093.tar.bz2 rails-751f79a03351f1f0d21436b2b947352b97ded093.zip | |
Merge remote branch 'rails/master'
Diffstat (limited to 'railties/test/generators')
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 3975a39ab1..8bd9dc9f39 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -70,9 +70,7 @@ class AppGeneratorTest < Rails::Generators::TestCase end def test_name_collision_raises_an_error - reserved_words = %w[generate g console c server s dbconsole db - application destroy benchmarker profiler - plugin runner test] + reserved_words = %w[application destroy plugin runner test] reserved_words.each do |reserved| content = capture(:stderr){ run_generator [File.join(destination_root, reserved)] } assert_equal "Invalid application name #{reserved}. Please give a name which does not match one of the reserved rails words.\n", content |