From 9bb33b4abde84641eb6b93db98412625a095b0ea Mon Sep 17 00:00:00 2001 From: Rob Zolkos Date: Wed, 20 Oct 2010 00:15:35 +1100 Subject: [PATCH 1/2] skip testing framework if app created with --skip-test-unit --- .../rails/app/templates/config/application.rb | 4 ++++ railties/test/generators/app_generator_test.rb | 7 +++++++ 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 00a23a7..fc57256 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 c7339cb..06b2c6a 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.orm = false/, file + end + end + def test_test_unit_is_skipped_if_required run_generator [destination_root, "--skip-test-unit"] assert_no_file "test" -- 1.7.2.3 From bcffdce5b4fcc398d20216777645f2d2bfedb165 Mon Sep 17 00:00:00 2001 From: Rob Zolkos Date: Wed, 20 Oct 2010 00:53:37 +1100 Subject: [PATCH 2/2] fixed test --- railties/test/generators/app_generator_test.rb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 06b2c6a..f4d2027 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -191,7 +191,7 @@ class AppGeneratorTest < Rails::Generators::TestCase 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.orm = false/, file + assert_match /config.generators.test_framework = false/, file end end -- 1.7.2.3