diff options
| author | José Valim <jose.valim@plataformatec.com.br> | 2012-01-31 07:58:33 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@plataformatec.com.br> | 2012-01-31 07:58:33 -0800 |
| commit | 40b218977ecf171852f6b00587b77602edf180de (patch) | |
| tree | 88dc32742bb7f01501bb389f4afede574d6bb80a /railties/test | |
| parent | bc194cf564243899a4d2f97f2d2f3f50d72ff379 (diff) | |
| parent | 25a69e2ea51e419af8fc72dffdea94edb7e24e55 (diff) | |
| download | rails-40b218977ecf171852f6b00587b77602edf180de.tar.gz rails-40b218977ecf171852f6b00587b77602edf180de.tar.bz2 rails-40b218977ecf171852f6b00587b77602edf180de.zip | |
Merge pull request #4792 from rafaelfranca/build-fix
Only add ActiveRecord configuration if it is present
Diffstat (limited to 'railties/test')
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 33a51fe782..e2c98274b1 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -202,6 +202,7 @@ class AppGeneratorTest < Rails::Generators::TestCase run_generator [destination_root, "--skip-active-record"] assert_no_file "config/database.yml" assert_file "config/application.rb", /#\s+require\s+["']active_record\/railtie["']/ + assert_file "config/application.rb", /#\s+config\.active_record\.dependent_restrict_raises = false/ assert_file "test/test_helper.rb" do |helper_content| assert_no_match(/fixtures :all/, helper_content) end |