diff options
| author | Aditya Sanghi <asanghi@me.com> | 2011-03-23 18:06:22 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-03-23 18:06:30 +0100 |
| commit | 3a7c7dc73d6111e7c821a81d9c56024dd35769a5 (patch) | |
| tree | 2599899ea0e71e850fc8aa0bc5b3c6921b1e4414 | |
| parent | a1edbf720620c672566a1681572c3845452ca51a (diff) | |
| download | rails-3a7c7dc73d6111e7c821a81d9c56024dd35769a5.tar.gz rails-3a7c7dc73d6111e7c821a81d9c56024dd35769a5.tar.bz2 rails-3a7c7dc73d6111e7c821a81d9c56024dd35769a5.zip | |
Fix test for prepend giving a false positive. [#5716 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
| -rw-r--r-- | railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb | 2 | ||||
| -rw-r--r-- | railties/test/generators/shared_generator_tests.rb | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb index c373ca5e67..3cf8410d1e 100644 --- a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb +++ b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb @@ -62,7 +62,7 @@ task :default => :test end def generate_test_dummy(force = false) - opts = (options || {}).slice(:skip_active_record, :skip_javascript, :database, :javascript) + opts = (options || {}).slice(:skip_active_record, :skip_javascript, :database, :javascript, :quiet, :pretend, :force, :skip) opts[:force] = force invoke Rails::Generators::AppGenerator, diff --git a/railties/test/generators/shared_generator_tests.rb b/railties/test/generators/shared_generator_tests.rb index 592da39ccd..c9c5d2fad2 100644 --- a/railties/test/generators/shared_generator_tests.rb +++ b/railties/test/generators/shared_generator_tests.rb @@ -26,8 +26,7 @@ module SharedGeneratorTests def test_plugin_new_generate_pretend run_generator ["testapp", "--pretend"] - - default_files.each{ |path| assert_no_file path } + default_files.each{ |path| assert_no_file File.join("testapp",path) } end def test_invalid_database_option_raises_an_error |