From dc67d3d2a1480f82ffcce418cf4bcad5dfb2a177 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Mon, 30 Jun 2014 16:55:01 -0300 Subject: Rename rollback_changes to undo_changes To avoid overload with database rollback --- activemodel/test/cases/dirty_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'activemodel/test') diff --git a/activemodel/test/cases/dirty_test.rb b/activemodel/test/cases/dirty_test.rb index d39484a7b9..562fadbb85 100644 --- a/activemodel/test/cases/dirty_test.rb +++ b/activemodel/test/cases/dirty_test.rb @@ -47,7 +47,7 @@ class DirtyTest < ActiveModel::TestCase end def rollback - rollback_changes + undo_changes end end @@ -181,7 +181,7 @@ class DirtyTest < ActiveModel::TestCase assert_equal ActiveSupport::HashWithIndifferentAccess.new, @model.changed_attributes end - test "rollback should restore all previous data" do + test "undo_changes should restore all previous data" do @model.name = 'Dmitry' @model.color = 'Red' @model.save -- cgit v1.2.3