diff options
| author | José Valim <jose.valim@gmail.com> | 2011-05-06 08:35:57 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-05-06 08:35:57 -0700 |
| commit | cae68d221cc81232e30049eafa4ff59b2c5f6010 (patch) | |
| tree | ebff0feb10fe8a39a2a50b1be278e3e567576004 /railties/test/generators/app_generator_test.rb | |
| parent | 0e5adbceb7d49f3448eec32a7068807f571bf76c (diff) | |
| parent | a8cfceca55b36129f87a512c7852901e416a1ee9 (diff) | |
| download | rails-cae68d221cc81232e30049eafa4ff59b2c5f6010.tar.gz rails-cae68d221cc81232e30049eafa4ff59b2c5f6010.tar.bz2 rails-cae68d221cc81232e30049eafa4ff59b2c5f6010.zip | |
Merge pull request #414 from asanghi/lh5796
config.generators.orm = false when skipping active record. LightHouse #5796
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 e271095636..8fb31a2429 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -227,9 +227,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 |