diff options
| author | Arun Agrawal <arunagw@gmail.com> | 2012-06-08 18:29:23 +0530 |
|---|---|---|
| committer | Arun Agrawal <arunagw@gmail.com> | 2012-06-08 22:39:14 +0530 |
| commit | 5fa87281ece411393cb167f03b1deda014a82593 (patch) | |
| tree | 9ecd99a13c42c0df2001e0f3d2137d1cf9eec0a6 | |
| parent | cbfcabc9e9c76cba6f335b45aa158ba38683188a (diff) | |
| download | rails-5fa87281ece411393cb167f03b1deda014a82593.tar.gz rails-5fa87281ece411393cb167f03b1deda014a82593.tar.bz2 rails-5fa87281ece411393cb167f03b1deda014a82593.zip | |
We should not include engine.rake file into rake
if we are passing -T which is skip_test_unit
See issue #6673 for more details.
I saw that we are not creating dummy app even if
we do skip_test_unit.
Fixes #6673
| -rw-r--r-- | railties/lib/rails/generators/rails/plugin_new/templates/Rakefile | 2 | ||||
| -rw-r--r-- | railties/test/generators/plugin_new_generator_test.rb | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/Rakefile b/railties/lib/rails/generators/rails/plugin_new/templates/Rakefile index 743036362e..1369140537 100644 --- a/railties/lib/rails/generators/rails/plugin_new/templates/Rakefile +++ b/railties/lib/rails/generators/rails/plugin_new/templates/Rakefile @@ -14,7 +14,7 @@ RDoc::Task.new(:rdoc) do |rdoc| rdoc.rdoc_files.include('lib/**/*.rb') end -<% if full? && !options[:skip_active_record] -%> +<% if full? && !options[:skip_active_record] && !options[:skip_test_unit] -%> APP_RAKEFILE = File.expand_path("../<%= dummy_path -%>/Rakefile", __FILE__) load 'rails/tasks/engine.rake' <% end %> diff --git a/railties/test/generators/plugin_new_generator_test.rb b/railties/test/generators/plugin_new_generator_test.rb index 69c1b21739..1bb84e101e 100644 --- a/railties/test/generators/plugin_new_generator_test.rb +++ b/railties/test/generators/plugin_new_generator_test.rb @@ -58,6 +58,14 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase assert_file "test/integration/navigation_test.rb", /ActionDispatch::IntegrationTest/ end + def test_generating_test_files_in_full_mode_without_unit_test_files + run_generator [destination_root, "-T", "--full"] + + assert_no_directory "test/integration/" + assert_no_file "test" + assert_no_match(/APP_RAKEFILE/, File.read(File.join(destination_root, "Rakefile"))) + end + def test_ensure_that_plugin_options_are_not_passed_to_app_generator FileUtils.cd(Rails.root) assert_no_match(/It works from file!.*It works_from_file/, run_generator([destination_root, "-m", "lib/template.rb"])) |