diff options
| author | Aditya Sanghi <asanghi@me.com> | 2011-05-06 18:04:20 +0530 |
|---|---|---|
| committer | Aditya Sanghi <asanghi@me.com> | 2011-05-06 18:04:20 +0530 |
| commit | 75e1e2175d81b7047145768e72a0541b3266abed (patch) | |
| tree | bdc57d6fec4c819b8b5a2972ff3ae24e62f94a1f /railties/test/generators | |
| parent | be9857c21d9bf3e4c51a159b7d4edef69e203a57 (diff) | |
| download | rails-75e1e2175d81b7047145768e72a0541b3266abed.tar.gz rails-75e1e2175d81b7047145768e72a0541b3266abed.tar.bz2 rails-75e1e2175d81b7047145768e72a0541b3266abed.zip | |
When skipping skip active record, mark config.generators.orm to false; LH 5796 remainder
Diffstat (limited to 'railties/test/generators')
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index e271095636..64ccaa762f 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -161,7 +161,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_creation_of_a_test_directory |