From 083031aa24eef57796cc68c53c89caf38b1e0a47 Mon Sep 17 00:00:00 2001 From: Aditya Sanghi Date: Tue, 19 Oct 2010 17:27:59 +0530 Subject: [PATCH] adding no orm generators if skip active record is given --- .../rails/app/templates/config/application.rb | 4 ++++ railties/test/generators/app_generator_test.rb | 5 ++++- 2 files changed, 8 insertions(+), 1 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..7385a6f 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/application.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb @@ -51,6 +51,10 @@ module <%= app_const_base %> # Configure the default encoding used in templates for Ruby 1.9. config.encoding = "utf-8" +<% if options[:skip_active_record] -%> + config.generators.orm = false +<% end -%> + # Configure sensitive parameters which will be filtered from the log file. config.filter_parameters += [:password] end diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index c7339cb..427caaa 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -176,7 +176,10 @@ class AppGeneratorTest < Rails::Generators::TestCase def test_active_record_is_removed_from_frameworks_if_skip_active_record_is_given run_generator [destination_root, "--skip-active-record"] - assert_file "config/application.rb", /#\s+require\s+["']active_record\/railtie["']/ + assert_file "config/application.rb" do |file| + assert_match /#\s+require\s+["']active_record\/railtie["']/, file + assert_match /config.generators.orm = false/, file + end end def test_prototype_and_test_unit_are_added_by_default -- 1.7.1