skip testing framework if app created with --skip-test-unit [#5796 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>

2 files changed, 11 insertions, 0 deletions

diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb
index 00a23a7b89..6e515756fe 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/application.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -48,6 +48,10 @@ module <%= app_const_base %>
     # config.action_view.javascript_expansions[:defaults] = %w(jquery rails)
 <% end -%>
 
+<% if options[:skip_test_unit] -%>
+    config.generators.test_framework = false
+<% end -%>
+
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"
 
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index c7339cb8d2..f4d2027874 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -188,6 +188,13 @@ class AppGeneratorTest < Rails::Generators::TestCase
     assert_file "test"
   end
   
+  def test_test_unit_is_removed_from_frameworks_if_skip_test_unit_is_given
+    run_generator [destination_root, "--skip-test-unit"]
+    assert_file "config/application.rb" do |file|
+      assert_match /config.generators.test_framework = false/, file
+    end
+  end
+  
   def test_test_unit_is_skipped_if_required
     run_generator [destination_root, "--skip-test-unit"]
     assert_no_file "test"