Merge pull request #8705 from amparo-luna/change_update_attributes_to_update

Rename update_attributes method to update

2 files changed, 3 insertions, 3 deletions

diff --git a/railties/test/generators/scaffold_controller_generator_test.rb b/railties/test/generators/scaffold_controller_generator_test.rb
index 217648263a..ab00586a64 100644
--- a/railties/test/generators/scaffold_controller_generator_test.rb
+++ b/railties/test/generators/scaffold_controller_generator_test.rb
@@ -35,7 +35,7 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
       end
 
       assert_instance_method :update, content do |m|
-        assert_match(/@user\.update_attributes\(user_params\)/, m)
+        assert_match(/@user\.update\(user_params\)/, m)
         assert_match(/@user\.errors/, m)
       end
 
diff --git a/railties/test/generators/scaffold_generator_test.rb b/railties/test/generators/scaffold_generator_test.rb
index a8dc50f601..431b23b014 100644
--- a/railties/test/generators/scaffold_generator_test.rb
+++ b/railties/test/generators/scaffold_generator_test.rb
@@ -45,7 +45,7 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase
       end
 
       assert_instance_method :update, content do |m|
-        assert_match(/@product_line\.update_attributes\(product_line_params\)/, m)
+        assert_match(/@product_line\.update\(product_line_params\)/, m)
         assert_match(/@product_line\.errors/, m)
       end
 
@@ -162,7 +162,7 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase
       end
 
       assert_instance_method :update, content do |m|
-        assert_match(/@admin_role\.update_attributes\(admin_role_params\)/, m)
+        assert_match(/@admin_role\.update\(admin_role_params\)/, m)
         assert_match(/@admin_role\.errors/, m)
       end