diff options
| author | Aditya Sanghi <asanghi@me.com> | 2011-05-06 20:29:11 +0530 |
|---|---|---|
| committer | Aditya Sanghi <asanghi@me.com> | 2011-05-06 20:29:11 +0530 |
| commit | 9b5c29038df3ffc4a4038aac7e5cba0c5b088729 (patch) | |
| tree | 724b74b4cf35e8b90cb747dd3dfcf694d19f7b11 /railties/test/generators/app_generator_test.rb | |
| parent | 75e1e2175d81b7047145768e72a0541b3266abed (diff) | |
| download | rails-9b5c29038df3ffc4a4038aac7e5cba0c5b088729.tar.gz rails-9b5c29038df3ffc4a4038aac7e5cba0c5b088729.tar.bz2 rails-9b5c29038df3ffc4a4038aac7e5cba0c5b088729.zip | |
default orm and test_framework to false; change application.rb template accordingly
Diffstat (limited to 'railties/test/generators/app_generator_test.rb')
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 64ccaa762f..327b758a61 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -230,9 +230,13 @@ 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.test_framework = false/, file - end + assert_file "config/application.rb", /#\s+require\s+["']rails\/test_unit\/railtie["']/ + end + + def test_no_active_record_or_test_unit_if_skips_given + run_generator [destination_root, "--skip-test-unit", "--skip-active-record"] + assert_file "config/application.rb", /#\s+require\s+["']rails\/test_unit\/railtie["']/ + assert_file "config/application.rb", /#\s+require\s+["']active_record\/railtie["']/ end def test_new_hash_style |