Merge pull request #5275 from rafaelfranca/master

Only add the whitelist_attributes option if ActiveRecord is present

2 files changed, 10 insertions, 1 deletions

diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index a3c24c392b..cf6f9b90c9 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\.whitelist_attributes = true/
     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)
@@ -350,6 +351,11 @@ class AppGeneratorTest < Rails::Generators::TestCase
     end
   end
 
+  def test_active_record_whitelist_attributes_is_present_application_config
+    run_generator
+    assert_file "config/application.rb", /config\.active_record\.whitelist_attributes = true/
+  end
+
   def test_active_record_dependent_restrict_raises_is_present_application_config
     run_generator
     assert_file "config/application.rb", /config\.active_record\.dependent_restrict_raises = false/
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb
index 4fb5e6a4eb..b0be555c4c 100644
--- a/railties/test/isolation/abstract_unit.rb
+++ b/railties/test/isolation/abstract_unit.rb
@@ -247,7 +247,10 @@ module TestHelpers
                     :activemodel,
                     :activerecord,
                     :activeresource] - arr
-      remove_from_config "config.active_record.dependent_restrict_raises = false" if to_remove.include? :activerecord
+      if to_remove.include? :activerecord
+        remove_from_config "config.active_record.whitelist_attributes = true"
+        remove_from_config "config.active_record.dependent_restrict_raises = false"
+      end
       $:.reject! {|path| path =~ %r'/(#{to_remove.join('|')})/' }
     end