diff options
| author | Mikel Lindsaar <raasdnil@gmail.com> | 2010-02-03 15:42:53 +1100 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2010-02-03 15:52:05 +1100 |
| commit | 76d5428c3360ae837107ccedb418fc7b0d2aa578 (patch) | |
| tree | b7cb797bff83f3d6aad54850095d7b5cc31fbad2 /railties | |
| parent | 9a83bd5006b6f996cbd68045d2d4d7f7dac24de1 (diff) | |
| download | rails-76d5428c3360ae837107ccedb418fc7b0d2aa578.tar.gz rails-76d5428c3360ae837107ccedb418fc7b0d2aa578.tar.bz2 rails-76d5428c3360ae837107ccedb418fc7b0d2aa578.zip | |
Updating index.html to remove script/generate and making railties tests pass again
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/generators/rails/app/templates/public/index.html | 2 | ||||
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 28 |
2 files changed, 5 insertions, 25 deletions
diff --git a/railties/lib/generators/rails/app/templates/public/index.html b/railties/lib/generators/rails/app/templates/public/index.html index b153ae392f..ef916f9c5a 100644 --- a/railties/lib/generators/rails/app/templates/public/index.html +++ b/railties/lib/generators/rails/app/templates/public/index.html @@ -255,7 +255,7 @@ <ol> <li> - <h2>Use <code>script/generate</code> to create your models and controllers</h2> + <h2>Use <code>rails generate</code> to create your models and controllers</h2> <p>To see all available options, run it without parameters.</p> </li> diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 95a33c50f8..93ef67818d 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -35,7 +35,7 @@ class AppGeneratorTest < Rails::Generators::TestCase public/images public/javascripts public/stylesheets - script/performance + script/rails test/fixtures test/functional test/integration @@ -98,34 +98,14 @@ class AppGeneratorTest < Rails::Generators::TestCase assert_no_file "test" end - def test_shebang_is_added_to_files + def test_shebang_is_added_to_rails_file run_generator [destination_root, "--ruby", "foo/bar/baz"] - - %w( - about - console - dbconsole - destroy - generate - plugin - runner - server - ).each { |path| assert_file "script/#{path}", /#!foo\/bar\/baz/ } + assert_file "script/rails", /#!foo\/bar\/baz/ end def test_shebang_when_is_the_same_as_default_use_env run_generator [destination_root, "--ruby", Thor::Util.ruby_command] - - %w( - about - console - dbconsole - destroy - generate - plugin - runner - server - ).each { |path| assert_file "script/#{path}", /#!\/usr\/bin\/env/ } + assert_file "script/rails", /#!\/usr\/bin\/env/ end def test_template_from_dir_pwd |