diff options
| author | Steve Agalloco <steve.agalloco@gmail.com> | 2010-07-29 22:38:45 -0400 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2010-07-30 11:55:07 -0300 |
| commit | b823e50a54156f688dd0892e7a8671b730814bc6 (patch) | |
| tree | 7f2053383128b66219871c34a57accbbb7ea3c73 | |
| parent | d277b823d0d455c2d7a18cc0eb334890a32ad30e (diff) | |
| download | rails-b823e50a54156f688dd0892e7a8671b730814bc6.tar.gz rails-b823e50a54156f688dd0892e7a8671b730814bc6.tar.bz2 rails-b823e50a54156f688dd0892e7a8671b730814bc6.zip | |
fix for rails app generator when using --pretend option
[#5245 state:committed]
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| -rw-r--r-- | railties/lib/rails/generators/rails/app/app_generator.rb | 2 | ||||
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index 1324cc1f67..96c49a81bb 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -216,7 +216,7 @@ module Rails empty_directory '.' set_default_accessors! - FileUtils.cd(destination_root) + FileUtils.cd(destination_root) unless options[:pretend] end def create_root_files diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 67a878e926..1e0b3bf4c7 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -58,6 +58,12 @@ class AppGeneratorTest < Rails::Generators::TestCase DEFAULT_APP_FILES.each{ |path| assert_file path } end + def test_application_generate_pretend + run_generator ["testapp", "--pretend"] + + DEFAULT_APP_FILES.each{ |path| assert_no_file path } + end + def test_application_controller_and_layout_files run_generator assert_file "app/views/layouts/application.html.erb", /stylesheet_link_tag :all/ |