From 06a00038efbbaef127ad8908fffea6799c577440 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Mon, 20 Jan 2014 22:58:14 -0200
Subject: When applying changes or reseting changes create the right class

Before this patch after the changes are applied the changes can be only
accessed using string keys, but before symbols are also accepted.

After this change every state of the model will be consistent.
---
 activemodel/test/cases/dirty_test.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'activemodel/test/cases')

diff --git a/activemodel/test/cases/dirty_test.rb b/activemodel/test/cases/dirty_test.rb
index 54427a1513..efadb2600f 100644
--- a/activemodel/test/cases/dirty_test.rb
+++ b/activemodel/test/cases/dirty_test.rb
@@ -83,6 +83,14 @@ class DirtyTest < ActiveModel::TestCase
     assert_not_nil @model.changes['name']
   end
 
+  test "be cosistent with symbols arguments after the changes are applied" do
+    @model.name = "David"
+    assert @model.attribute_changed?(:name)
+    @model.save
+    @model.name = 'Rafael'
+    assert @model.attribute_changed?(:name)
+  end
+
   test "attribute mutation" do
     @model.instance_variable_set("@name", "Yam")
     assert !@model.name_changed?
-- 
cgit v1.2.3


From fc913d40160dd0c07bc7d2aa0825badded56bbb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Tue, 21 Jan 2014 22:38:07 -0200
Subject: Fix typo

---
 activemodel/test/cases/dirty_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activemodel/test/cases')

diff --git a/activemodel/test/cases/dirty_test.rb b/activemodel/test/cases/dirty_test.rb
index efadb2600f..8b55901a65 100644
--- a/activemodel/test/cases/dirty_test.rb
+++ b/activemodel/test/cases/dirty_test.rb
@@ -83,7 +83,7 @@ class DirtyTest < ActiveModel::TestCase
     assert_not_nil @model.changes['name']
   end
 
-  test "be cosistent with symbols arguments after the changes are applied" do
+  test "be consistent with symbols arguments after the changes are applied" do
     @model.name = "David"
     assert @model.attribute_changed?(:name)
     @model.save
-- 
cgit v1.2.3


From 1c2c5527032f7a79aff53d29e9640e27957f1b49 Mon Sep 17 00:00:00 2001
From: Adrien Coquio <adrien.coquio@gmail.com>
Date: Wed, 22 Jan 2014 15:22:35 +0100
Subject: Add failing test for ActiveModel::Errors#has_key? method

From the doc, this method should return false and not nil if there is no errors for this key
---
 activemodel/test/cases/errors_test.rb | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'activemodel/test/cases')

diff --git a/activemodel/test/cases/errors_test.rb b/activemodel/test/cases/errors_test.rb
index bbd186d83d..481f274936 100644
--- a/activemodel/test/cases/errors_test.rb
+++ b/activemodel/test/cases/errors_test.rb
@@ -54,6 +54,11 @@ class ErrorsTest < ActiveModel::TestCase
     assert errors.has_key?(:foo), 'errors should have key :foo'
   end
 
+  def test_has_no_key
+    errors = ActiveModel::Errors.new(self)
+    assert_equal false, errors.has_key?(:name), 'errors should not have key :name'
+  end
+
   test "clear errors" do
     person = Person.new
     person.validate!
-- 
cgit v1.2.3


From db95c7dcebcd240ba46cc5df4eb2b8f240f497bb Mon Sep 17 00:00:00 2001
From: Adrien Coquio <adrien.coquio@gmail.com>
Date: Wed, 22 Jan 2014 21:25:58 +0100
Subject: Update ActiveModel::Errors.has_key? test

---
 activemodel/test/cases/errors_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activemodel/test/cases')

diff --git a/activemodel/test/cases/errors_test.rb b/activemodel/test/cases/errors_test.rb
index 481f274936..def28578f8 100644
--- a/activemodel/test/cases/errors_test.rb
+++ b/activemodel/test/cases/errors_test.rb
@@ -51,7 +51,7 @@ class ErrorsTest < ActiveModel::TestCase
   def test_has_key?
     errors = ActiveModel::Errors.new(self)
     errors[:foo] = 'omg'
-    assert errors.has_key?(:foo), 'errors should have key :foo'
+    assert_equal true, errors.has_key?(:foo), 'errors should have key :foo'
   end
 
   def test_has_no_key
-- 
cgit v1.2.3


From 19a4ef305d84f4aad633c25f850967bbc375da84 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Mon, 20 Jan 2014 04:21:44 -0800
Subject: Rewrote the tests for has_secure_password

---
 activemodel/test/cases/secure_password_new_test.rb | 181 +++++++++++++++++++++
 1 file changed, 181 insertions(+)
 create mode 100644 activemodel/test/cases/secure_password_new_test.rb

(limited to 'activemodel/test/cases')

diff --git a/activemodel/test/cases/secure_password_new_test.rb b/activemodel/test/cases/secure_password_new_test.rb
new file mode 100644
index 0000000000..174d18ec8b
--- /dev/null
+++ b/activemodel/test/cases/secure_password_new_test.rb
@@ -0,0 +1,181 @@
+require 'cases/helper'
+require 'models/user'
+require 'models/visitor'
+
+require 'active_support/all'
+class SecurePasswordTest < ActiveModel::TestCase
+  setup do
+    ActiveModel::SecurePassword.min_cost = true
+
+    @user = User.new
+    @visitor = Visitor.new
+
+    # Simulate loading an existing user from the DB
+    @existing_user = User.new
+    @existing_user.password_digest = BCrypt::Password.create('password', cost: BCrypt::Engine::MIN_COST)
+  end
+
+  teardown do
+    ActiveModel::SecurePassword.min_cost = false
+  end
+
+  test "create and updating without validations" do
+    assert @visitor.valid?(:create), 'visitor should be valid'
+    assert @visitor.valid?(:update), 'visitor should be valid'
+
+    @visitor.password = '123'
+    @visitor.password_confirmation = '456'
+
+    assert @visitor.valid?(:create), 'visitor should be valid'
+    assert @visitor.valid?(:update), 'visitor should be valid'
+  end
+
+  test "create a new user with validation and a blank password" do
+    @user.password = ''
+    assert !@user.valid?(:create), 'user should be invalid'
+    assert_equal 1, @user.errors.count
+    assert_equal ["can't be blank"], @user.errors[:password]
+  end
+
+  test "create a new user with validation and a nil password" do
+    @user.password = nil
+    assert !@user.valid?(:create), 'user should be invalid'
+    assert_equal 1, @user.errors.count
+    assert_equal ["can't be blank"], @user.errors[:password]
+  end
+
+  test "create a new user with validation and a blank password confirmation" do
+    @user.password = 'password'
+    @user.password_confirmation = ''
+    assert !@user.valid?(:create), 'user should be invalid'
+    assert_equal 1, @user.errors.count
+    assert_equal ["doesn't match Password"], @user.errors[:password_confirmation]
+  end
+
+  test "create a new user with validation and a nil password confirmation" do
+    @user.password = 'password'
+    @user.password_confirmation = nil
+    assert @user.valid?(:create), 'user should be valid'
+  end
+
+  test "create a new user with validation and an incorrect password confirmation" do
+    @user.password = 'password'
+    @user.password_confirmation = 'something else'
+    assert !@user.valid?(:create), 'user should be invalid'
+    assert_equal 1, @user.errors.count
+    assert_equal ["doesn't match Password"], @user.errors[:password_confirmation]
+  end
+
+  test "create a new user with validation and a correct password confirmation" do
+    @user.password = 'password'
+    @user.password_confirmation = 'something else'
+    assert !@user.valid?(:create), 'user should be invalid'
+    assert_equal 1, @user.errors.count
+    assert_equal ["doesn't match Password"], @user.errors[:password_confirmation]
+  end
+
+  test "update an existing user with validation and no change in password" do
+    assert @existing_user.valid?(:update), 'user should be valid'
+  end
+
+  test "updating an existing user with validation and a blank password" do
+    @existing_user.password = ''
+    assert @existing_user.valid?(:update), 'user should be valid'
+  end
+
+  test "updating an existing user with validation and a blank password and password_confirmation" do
+    @existing_user.password = ''
+    @existing_user.password_confirmation = ''
+    assert @existing_user.valid?(:update), 'user should be valid'
+  end
+
+  test "updating an existing user with validation and a nil password" do
+    @existing_user.password = nil
+    assert !@existing_user.valid?(:update), 'user should be invalid'
+    assert_equal 1, @existing_user.errors.count
+    assert_equal ["can't be blank"], @existing_user.errors[:password]
+  end
+
+  test "updating an existing user with validation and a blank password confirmation" do
+    @existing_user.password = 'password'
+    @existing_user.password_confirmation = ''
+    assert !@existing_user.valid?(:update), 'user should be invalid'
+    assert_equal 1, @existing_user.errors.count
+    assert_equal ["doesn't match Password"], @existing_user.errors[:password_confirmation]
+  end
+
+  test "updating an existing user with validation and a nil password confirmation" do
+    @existing_user.password = 'password'
+    @existing_user.password_confirmation = nil
+    assert @existing_user.valid?(:update), 'user should be valid'
+  end
+
+  test "updating an existing user with validation and an incorrect password confirmation" do
+    @existing_user.password = 'password'
+    @existing_user.password_confirmation = 'something else'
+    assert !@existing_user.valid?(:update), 'user should be invalid'
+    assert_equal 1, @existing_user.errors.count
+    assert_equal ["doesn't match Password"], @existing_user.errors[:password_confirmation]
+  end
+
+  test "updating an existing user with validation and a correct password confirmation" do
+    @existing_user.password = 'password'
+    @existing_user.password_confirmation = 'something else'
+    assert !@existing_user.valid?(:update), 'user should be invalid'
+    assert_equal 1, @existing_user.errors.count
+    assert_equal ["doesn't match Password"], @existing_user.errors[:password_confirmation]
+  end
+
+  test "updating an existing user with validation and a blank password digest" do
+    @existing_user.password_digest = ''
+    assert !@existing_user.valid?(:update), 'user should be invalid'
+    assert_equal 1, @existing_user.errors.count
+    assert_equal ["can't be blank"], @existing_user.errors[:password]
+  end
+
+  test "updating an existing user with validation and a nil password digest" do
+    @existing_user.password_digest = nil
+    assert !@existing_user.valid?(:update), 'user should be invalid'
+    assert_equal 1, @existing_user.errors.count
+    assert_equal ["can't be blank"], @existing_user.errors[:password]
+  end
+
+  test "setting a blank password should not change an existing password" do
+    @existing_user.password = ''
+    assert @existing_user.password_digest == 'password'
+  end
+
+  test "setting a nil password should clear an existing password" do
+    @existing_user.password = nil
+    assert_equal nil, @existing_user.password_digest
+  end  
+
+  test "authenticate" do
+    @user.password = "secret"
+
+    assert !@user.authenticate("wrong")
+    assert @user.authenticate("secret")
+  end
+
+  test "Password digest cost defaults to bcrypt default cost when min_cost is false" do
+    ActiveModel::SecurePassword.min_cost = false
+
+    @user.password = "secret"
+    assert_equal BCrypt::Engine::DEFAULT_COST, @user.password_digest.cost
+  end
+
+  test "Password digest cost honors bcrypt cost attribute when min_cost is false" do
+    ActiveModel::SecurePassword.min_cost = false
+    BCrypt::Engine.cost = 5
+
+    @user.password = "secret"
+    assert_equal BCrypt::Engine.cost, @user.password_digest.cost
+  end
+
+  test "Password digest cost can be set to bcrypt min cost to speed up tests" do
+    ActiveModel::SecurePassword.min_cost = true
+
+    @user.password = "secret"
+    assert_equal BCrypt::Engine::MIN_COST, @user.password_digest.cost
+  end
+end
-- 
cgit v1.2.3


From b6ddbfb15897dbd7f5043f3bfd9c83ffcbe2c2c4 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Mon, 20 Jan 2014 05:06:03 -0800
Subject: Removed old tests

---
 activemodel/test/cases/secure_password_new_test.rb | 181 ---------------------
 activemodel/test/cases/secure_password_test.rb     | 179 +++++++++++++-------
 2 files changed, 121 insertions(+), 239 deletions(-)
 delete mode 100644 activemodel/test/cases/secure_password_new_test.rb

(limited to 'activemodel/test/cases')

diff --git a/activemodel/test/cases/secure_password_new_test.rb b/activemodel/test/cases/secure_password_new_test.rb
deleted file mode 100644
index 174d18ec8b..0000000000
--- a/activemodel/test/cases/secure_password_new_test.rb
+++ /dev/null
@@ -1,181 +0,0 @@
-require 'cases/helper'
-require 'models/user'
-require 'models/visitor'
-
-require 'active_support/all'
-class SecurePasswordTest < ActiveModel::TestCase
-  setup do
-    ActiveModel::SecurePassword.min_cost = true
-
-    @user = User.new
-    @visitor = Visitor.new
-
-    # Simulate loading an existing user from the DB
-    @existing_user = User.new
-    @existing_user.password_digest = BCrypt::Password.create('password', cost: BCrypt::Engine::MIN_COST)
-  end
-
-  teardown do
-    ActiveModel::SecurePassword.min_cost = false
-  end
-
-  test "create and updating without validations" do
-    assert @visitor.valid?(:create), 'visitor should be valid'
-    assert @visitor.valid?(:update), 'visitor should be valid'
-
-    @visitor.password = '123'
-    @visitor.password_confirmation = '456'
-
-    assert @visitor.valid?(:create), 'visitor should be valid'
-    assert @visitor.valid?(:update), 'visitor should be valid'
-  end
-
-  test "create a new user with validation and a blank password" do
-    @user.password = ''
-    assert !@user.valid?(:create), 'user should be invalid'
-    assert_equal 1, @user.errors.count
-    assert_equal ["can't be blank"], @user.errors[:password]
-  end
-
-  test "create a new user with validation and a nil password" do
-    @user.password = nil
-    assert !@user.valid?(:create), 'user should be invalid'
-    assert_equal 1, @user.errors.count
-    assert_equal ["can't be blank"], @user.errors[:password]
-  end
-
-  test "create a new user with validation and a blank password confirmation" do
-    @user.password = 'password'
-    @user.password_confirmation = ''
-    assert !@user.valid?(:create), 'user should be invalid'
-    assert_equal 1, @user.errors.count
-    assert_equal ["doesn't match Password"], @user.errors[:password_confirmation]
-  end
-
-  test "create a new user with validation and a nil password confirmation" do
-    @user.password = 'password'
-    @user.password_confirmation = nil
-    assert @user.valid?(:create), 'user should be valid'
-  end
-
-  test "create a new user with validation and an incorrect password confirmation" do
-    @user.password = 'password'
-    @user.password_confirmation = 'something else'
-    assert !@user.valid?(:create), 'user should be invalid'
-    assert_equal 1, @user.errors.count
-    assert_equal ["doesn't match Password"], @user.errors[:password_confirmation]
-  end
-
-  test "create a new user with validation and a correct password confirmation" do
-    @user.password = 'password'
-    @user.password_confirmation = 'something else'
-    assert !@user.valid?(:create), 'user should be invalid'
-    assert_equal 1, @user.errors.count
-    assert_equal ["doesn't match Password"], @user.errors[:password_confirmation]
-  end
-
-  test "update an existing user with validation and no change in password" do
-    assert @existing_user.valid?(:update), 'user should be valid'
-  end
-
-  test "updating an existing user with validation and a blank password" do
-    @existing_user.password = ''
-    assert @existing_user.valid?(:update), 'user should be valid'
-  end
-
-  test "updating an existing user with validation and a blank password and password_confirmation" do
-    @existing_user.password = ''
-    @existing_user.password_confirmation = ''
-    assert @existing_user.valid?(:update), 'user should be valid'
-  end
-
-  test "updating an existing user with validation and a nil password" do
-    @existing_user.password = nil
-    assert !@existing_user.valid?(:update), 'user should be invalid'
-    assert_equal 1, @existing_user.errors.count
-    assert_equal ["can't be blank"], @existing_user.errors[:password]
-  end
-
-  test "updating an existing user with validation and a blank password confirmation" do
-    @existing_user.password = 'password'
-    @existing_user.password_confirmation = ''
-    assert !@existing_user.valid?(:update), 'user should be invalid'
-    assert_equal 1, @existing_user.errors.count
-    assert_equal ["doesn't match Password"], @existing_user.errors[:password_confirmation]
-  end
-
-  test "updating an existing user with validation and a nil password confirmation" do
-    @existing_user.password = 'password'
-    @existing_user.password_confirmation = nil
-    assert @existing_user.valid?(:update), 'user should be valid'
-  end
-
-  test "updating an existing user with validation and an incorrect password confirmation" do
-    @existing_user.password = 'password'
-    @existing_user.password_confirmation = 'something else'
-    assert !@existing_user.valid?(:update), 'user should be invalid'
-    assert_equal 1, @existing_user.errors.count
-    assert_equal ["doesn't match Password"], @existing_user.errors[:password_confirmation]
-  end
-
-  test "updating an existing user with validation and a correct password confirmation" do
-    @existing_user.password = 'password'
-    @existing_user.password_confirmation = 'something else'
-    assert !@existing_user.valid?(:update), 'user should be invalid'
-    assert_equal 1, @existing_user.errors.count
-    assert_equal ["doesn't match Password"], @existing_user.errors[:password_confirmation]
-  end
-
-  test "updating an existing user with validation and a blank password digest" do
-    @existing_user.password_digest = ''
-    assert !@existing_user.valid?(:update), 'user should be invalid'
-    assert_equal 1, @existing_user.errors.count
-    assert_equal ["can't be blank"], @existing_user.errors[:password]
-  end
-
-  test "updating an existing user with validation and a nil password digest" do
-    @existing_user.password_digest = nil
-    assert !@existing_user.valid?(:update), 'user should be invalid'
-    assert_equal 1, @existing_user.errors.count
-    assert_equal ["can't be blank"], @existing_user.errors[:password]
-  end
-
-  test "setting a blank password should not change an existing password" do
-    @existing_user.password = ''
-    assert @existing_user.password_digest == 'password'
-  end
-
-  test "setting a nil password should clear an existing password" do
-    @existing_user.password = nil
-    assert_equal nil, @existing_user.password_digest
-  end  
-
-  test "authenticate" do
-    @user.password = "secret"
-
-    assert !@user.authenticate("wrong")
-    assert @user.authenticate("secret")
-  end
-
-  test "Password digest cost defaults to bcrypt default cost when min_cost is false" do
-    ActiveModel::SecurePassword.min_cost = false
-
-    @user.password = "secret"
-    assert_equal BCrypt::Engine::DEFAULT_COST, @user.password_digest.cost
-  end
-
-  test "Password digest cost honors bcrypt cost attribute when min_cost is false" do
-    ActiveModel::SecurePassword.min_cost = false
-    BCrypt::Engine.cost = 5
-
-    @user.password = "secret"
-    assert_equal BCrypt::Engine.cost, @user.password_digest.cost
-  end
-
-  test "Password digest cost can be set to bcrypt min cost to speed up tests" do
-    ActiveModel::SecurePassword.min_cost = true
-
-    @user.password = "secret"
-    assert_equal BCrypt::Engine::MIN_COST, @user.password_digest.cost
-  end
-end
diff --git a/activemodel/test/cases/secure_password_test.rb b/activemodel/test/cases/secure_password_test.rb
index 0314803af6..174d18ec8b 100644
--- a/activemodel/test/cases/secure_password_test.rb
+++ b/activemodel/test/cases/secure_password_test.rb
@@ -1,77 +1,160 @@
 require 'cases/helper'
 require 'models/user'
-require 'models/oauthed_user'
 require 'models/visitor'
 
+require 'active_support/all'
 class SecurePasswordTest < ActiveModel::TestCase
   setup do
     ActiveModel::SecurePassword.min_cost = true
 
     @user = User.new
     @visitor = Visitor.new
-    @oauthed_user = OauthedUser.new
+
+    # Simulate loading an existing user from the DB
+    @existing_user = User.new
+    @existing_user.password_digest = BCrypt::Password.create('password', cost: BCrypt::Engine::MIN_COST)
   end
 
   teardown do
     ActiveModel::SecurePassword.min_cost = false
   end
 
-  test "blank password" do
-    @user.password = @visitor.password = ''
-    assert !@user.valid?(:create), 'user should be invalid'
+  test "create and updating without validations" do
     assert @visitor.valid?(:create), 'visitor should be valid'
-  end
+    assert @visitor.valid?(:update), 'visitor should be valid'
+
+    @visitor.password = '123'
+    @visitor.password_confirmation = '456'
 
-  test "nil password" do
-    @user.password = @visitor.password = nil
-    assert !@user.valid?(:create), 'user should be invalid'
     assert @visitor.valid?(:create), 'visitor should be valid'
+    assert @visitor.valid?(:update), 'visitor should be valid'
   end
 
-  test "blank password doesn't override previous password" do
-    @user.password = 'test'
+  test "create a new user with validation and a blank password" do
     @user.password = ''
-    assert_equal @user.password, 'test'
+    assert !@user.valid?(:create), 'user should be invalid'
+    assert_equal 1, @user.errors.count
+    assert_equal ["can't be blank"], @user.errors[:password]
+  end
+
+  test "create a new user with validation and a nil password" do
+    @user.password = nil
+    assert !@user.valid?(:create), 'user should be invalid'
+    assert_equal 1, @user.errors.count
+    assert_equal ["can't be blank"], @user.errors[:password]
+  end
+
+  test "create a new user with validation and a blank password confirmation" do
+    @user.password = 'password'
+    @user.password_confirmation = ''
+    assert !@user.valid?(:create), 'user should be invalid'
+    assert_equal 1, @user.errors.count
+    assert_equal ["doesn't match Password"], @user.errors[:password_confirmation]
   end
 
-  test "password must be present" do
-    assert !@user.valid?(:create)
-    assert_equal 1, @user.errors.size
+  test "create a new user with validation and a nil password confirmation" do
+    @user.password = 'password'
+    @user.password_confirmation = nil
+    assert @user.valid?(:create), 'user should be valid'
   end
 
-  test "match confirmation" do
-    @user.password = @visitor.password = "thiswillberight"
-    @user.password_confirmation = @visitor.password_confirmation = "wrong"
+  test "create a new user with validation and an incorrect password confirmation" do
+    @user.password = 'password'
+    @user.password_confirmation = 'something else'
+    assert !@user.valid?(:create), 'user should be invalid'
+    assert_equal 1, @user.errors.count
+    assert_equal ["doesn't match Password"], @user.errors[:password_confirmation]
+  end
 
-    assert !@user.valid?
-    assert @visitor.valid?
+  test "create a new user with validation and a correct password confirmation" do
+    @user.password = 'password'
+    @user.password_confirmation = 'something else'
+    assert !@user.valid?(:create), 'user should be invalid'
+    assert_equal 1, @user.errors.count
+    assert_equal ["doesn't match Password"], @user.errors[:password_confirmation]
+  end
 
-    @user.password_confirmation = "thiswillberight"
+  test "update an existing user with validation and no change in password" do
+    assert @existing_user.valid?(:update), 'user should be valid'
+  end
 
-    assert @user.valid?
+  test "updating an existing user with validation and a blank password" do
+    @existing_user.password = ''
+    assert @existing_user.valid?(:update), 'user should be valid'
   end
 
-  test "authenticate" do
-    @user.password = "secret"
+  test "updating an existing user with validation and a blank password and password_confirmation" do
+    @existing_user.password = ''
+    @existing_user.password_confirmation = ''
+    assert @existing_user.valid?(:update), 'user should be valid'
+  end
 
-    assert !@user.authenticate("wrong")
-    assert @user.authenticate("secret")
+  test "updating an existing user with validation and a nil password" do
+    @existing_user.password = nil
+    assert !@existing_user.valid?(:update), 'user should be invalid'
+    assert_equal 1, @existing_user.errors.count
+    assert_equal ["can't be blank"], @existing_user.errors[:password]
+  end
+
+  test "updating an existing user with validation and a blank password confirmation" do
+    @existing_user.password = 'password'
+    @existing_user.password_confirmation = ''
+    assert !@existing_user.valid?(:update), 'user should be invalid'
+    assert_equal 1, @existing_user.errors.count
+    assert_equal ["doesn't match Password"], @existing_user.errors[:password_confirmation]
   end
 
-  test "User should not be created with blank digest" do
-    assert_raise RuntimeError do
-      @user.run_callbacks :create
-    end
-    @user.password = "supersecretpassword"
-    assert_nothing_raised do
-      @user.run_callbacks :create
-    end
+  test "updating an existing user with validation and a nil password confirmation" do
+    @existing_user.password = 'password'
+    @existing_user.password_confirmation = nil
+    assert @existing_user.valid?(:update), 'user should be valid'
   end
 
-  test "Oauthed user can be created with blank digest" do
-    assert_nothing_raised do
-      @oauthed_user.run_callbacks :create
-    end
+  test "updating an existing user with validation and an incorrect password confirmation" do
+    @existing_user.password = 'password'
+    @existing_user.password_confirmation = 'something else'
+    assert !@existing_user.valid?(:update), 'user should be invalid'
+    assert_equal 1, @existing_user.errors.count
+    assert_equal ["doesn't match Password"], @existing_user.errors[:password_confirmation]
+  end
+
+  test "updating an existing user with validation and a correct password confirmation" do
+    @existing_user.password = 'password'
+    @existing_user.password_confirmation = 'something else'
+    assert !@existing_user.valid?(:update), 'user should be invalid'
+    assert_equal 1, @existing_user.errors.count
+    assert_equal ["doesn't match Password"], @existing_user.errors[:password_confirmation]
+  end
+
+  test "updating an existing user with validation and a blank password digest" do
+    @existing_user.password_digest = ''
+    assert !@existing_user.valid?(:update), 'user should be invalid'
+    assert_equal 1, @existing_user.errors.count
+    assert_equal ["can't be blank"], @existing_user.errors[:password]
+  end
+
+  test "updating an existing user with validation and a nil password digest" do
+    @existing_user.password_digest = nil
+    assert !@existing_user.valid?(:update), 'user should be invalid'
+    assert_equal 1, @existing_user.errors.count
+    assert_equal ["can't be blank"], @existing_user.errors[:password]
+  end
+
+  test "setting a blank password should not change an existing password" do
+    @existing_user.password = ''
+    assert @existing_user.password_digest == 'password'
+  end
+
+  test "setting a nil password should clear an existing password" do
+    @existing_user.password = nil
+    assert_equal nil, @existing_user.password_digest
+  end  
+
+  test "authenticate" do
+    @user.password = "secret"
+
+    assert !@user.authenticate("wrong")
+    assert @user.authenticate("secret")
   end
 
   test "Password digest cost defaults to bcrypt default cost when min_cost is false" do
@@ -95,24 +178,4 @@ class SecurePasswordTest < ActiveModel::TestCase
     @user.password = "secret"
     assert_equal BCrypt::Engine::MIN_COST, @user.password_digest.cost
   end
-
-  test "blank password_confirmation does not result in a confirmation error" do
-    @user.password = ""
-    @user.password_confirmation = ""
-    assert @user.valid?(:update), "user should be valid"
-  end
-
-  test "password_confirmation validations will not be triggered if password_confirmation is not sent" do
-    @user.password = "password"
-    assert @user.valid?(:create)
-  end
-
-  test "will not save if confirmation is blank but password is not" do
-    @user.password = "password"
-    @user.password_confirmation = ""
-    assert_not @user.valid?(:create)
-
-    @user.password_confirmation = "password"
-    assert @user.valid?(:create)
-  end
 end
-- 
cgit v1.2.3


From 98705d88cd8ec705b80a032f8c166072b4e6fffd Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Fri, 24 Jan 2014 19:57:07 -0800
Subject: Some minor fixes

---
 activemodel/test/cases/secure_password_test.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'activemodel/test/cases')

diff --git a/activemodel/test/cases/secure_password_test.rb b/activemodel/test/cases/secure_password_test.rb
index 174d18ec8b..82fd291064 100644
--- a/activemodel/test/cases/secure_password_test.rb
+++ b/activemodel/test/cases/secure_password_test.rb
@@ -2,7 +2,6 @@ require 'cases/helper'
 require 'models/user'
 require 'models/visitor'
 
-require 'active_support/all'
 class SecurePasswordTest < ActiveModel::TestCase
   setup do
     ActiveModel::SecurePassword.min_cost = true
-- 
cgit v1.2.3


From 8855163bdbce23fa539be2c1ef2a49f1aabc6458 Mon Sep 17 00:00:00 2001
From: Vince Puzzella <vincepuz@gmail.com>
Date: Sat, 18 Jan 2014 11:34:38 -0500
Subject: Ability to specify multiple contexts when defining a validation.

Example:

validates_presence_of :name, on: [:update, :custom_validation_context]
---
 .../test/cases/validations/validations_context_test.rb   | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'activemodel/test/cases')

diff --git a/activemodel/test/cases/validations/validations_context_test.rb b/activemodel/test/cases/validations/validations_context_test.rb
index 5f99b320a6..a3daace4a8 100644
--- a/activemodel/test/cases/validations/validations_context_test.rb
+++ b/activemodel/test/cases/validations/validations_context_test.rb
@@ -36,4 +36,20 @@ class ValidationsContextTest < ActiveModel::TestCase
     assert topic.invalid?(:create), "Validation does run on create if 'on' is set to create"
     assert topic.errors[:base].include?(ERROR_MESSAGE)
   end
+
+  test "with a class that adds errors on multiple contexts and validating a new model with no arguments" do
+    Topic.validates_with(ValidatorThatAddsErrors, on: [:context1, :context2])
+    topic = Topic.new
+    assert topic.valid?, "Validation doesn't run when 'on' is set to context1 and context2"
+  end
+
+  test "with a class that adds errors on multiple contexts and validating a new model" do
+    Topic.validates_with(ValidatorThatAddsErrors, on: [:context1, :context2])
+    topic = Topic.new
+    assert topic.invalid?(:context1), "Validation does run on context1 when 'on' is set to context1 and context2"
+    assert topic.errors[:base].include?(ERROR_MESSAGE)
+    topic = Topic.new
+    assert topic.invalid?(:context2), "Validation does run on context2 when 'on' is set to context1 and context2"
+    assert topic.errors[:base].include?(ERROR_MESSAGE)
+  end
 end
-- 
cgit v1.2.3


From 5336ce265a75d3e472bf801e04cac48ee16d9a76 Mon Sep 17 00:00:00 2001
From: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date: Mon, 27 Jan 2014 08:17:20 -0200
Subject: Merge tests about multiple validation contexts

---
 .../test/cases/validations/validations_context_test.rb   | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'activemodel/test/cases')

diff --git a/activemodel/test/cases/validations/validations_context_test.rb b/activemodel/test/cases/validations/validations_context_test.rb
index a3daace4a8..9ad20e8453 100644
--- a/activemodel/test/cases/validations/validations_context_test.rb
+++ b/activemodel/test/cases/validations/validations_context_test.rb
@@ -4,7 +4,6 @@ require 'cases/helper'
 require 'models/topic'
 
 class ValidationsContextTest < ActiveModel::TestCase
-
   def teardown
     Topic.reset_callbacks(:validate)
     Topic._validators.clear
@@ -37,19 +36,16 @@ class ValidationsContextTest < ActiveModel::TestCase
     assert topic.errors[:base].include?(ERROR_MESSAGE)
   end
 
-  test "with a class that adds errors on multiple contexts and validating a new model with no arguments" do
-    Topic.validates_with(ValidatorThatAddsErrors, on: [:context1, :context2])
-    topic = Topic.new
-    assert topic.valid?, "Validation doesn't run when 'on' is set to context1 and context2"
-  end
-
   test "with a class that adds errors on multiple contexts and validating a new model" do
     Topic.validates_with(ValidatorThatAddsErrors, on: [:context1, :context2])
+
     topic = Topic.new
-    assert topic.invalid?(:context1), "Validation does run on context1 when 'on' is set to context1 and context2"
+    assert topic.valid?, "Validation ran with no context given when 'on' is set to context1 and context2"
+
+    assert topic.invalid?(:context1), "Validation did not run on context1 when 'on' is set to context1 and context2"
     assert topic.errors[:base].include?(ERROR_MESSAGE)
-    topic = Topic.new
-    assert topic.invalid?(:context2), "Validation does run on context2 when 'on' is set to context1 and context2"
+
+    assert topic.invalid?(:context2), "Validation did not run on context2 when 'on' is set to context1 and context2"
     assert topic.errors[:base].include?(ERROR_MESSAGE)
   end
 end
-- 
cgit v1.2.3


From 801baeed69fb5b28d9a05b657addb8f4204794ed Mon Sep 17 00:00:00 2001
From: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date: Mon, 27 Jan 2014 08:22:26 -0200
Subject: Use the new clear_validators! api to reset validators in tests

---
 activemodel/test/cases/validations/absence_validation_test.rb    | 6 +++---
 activemodel/test/cases/validations/acceptance_validation_test.rb | 2 +-
 .../test/cases/validations/conditional_validation_test.rb        | 2 +-
 .../test/cases/validations/confirmation_validation_test.rb       | 4 ++--
 activemodel/test/cases/validations/exclusion_validation_test.rb  | 6 +++---
 activemodel/test/cases/validations/format_validation_test.rb     | 8 ++++----
 .../cases/validations/i18n_generate_message_validation_test.rb   | 2 +-
 activemodel/test/cases/validations/i18n_validation_test.rb       | 4 ++--
 activemodel/test/cases/validations/inclusion_validation_test.rb  | 6 +++---
 activemodel/test/cases/validations/length_validation_test.rb     | 4 ++--
 .../test/cases/validations/numericality_validation_test.rb       | 4 ++--
 activemodel/test/cases/validations/presence_validation_test.rb   | 6 +++---
 activemodel/test/cases/validations/validates_test.rb             | 6 +++---
 activemodel/test/cases/validations/validations_context_test.rb   | 3 +--
 activemodel/test/cases/validations/with_validation_test.rb       | 3 +--
 activemodel/test/cases/validations_test.rb                       | 9 +--------
 16 files changed, 33 insertions(+), 42 deletions(-)

(limited to 'activemodel/test/cases')

diff --git a/activemodel/test/cases/validations/absence_validation_test.rb b/activemodel/test/cases/validations/absence_validation_test.rb
index c05d71de5a..795ce16d28 100644
--- a/activemodel/test/cases/validations/absence_validation_test.rb
+++ b/activemodel/test/cases/validations/absence_validation_test.rb
@@ -6,9 +6,9 @@ require 'models/custom_reader'
 
 class AbsenceValidationTest < ActiveModel::TestCase
   teardown do
-    Topic.reset_callbacks(:validate)
-    Person.reset_callbacks(:validate)
-    CustomReader.reset_callbacks(:validate)
+    Topic.clear_validators!
+    Person.clear_validators!
+    CustomReader.clear_validators!
   end
 
   def test_validate_absences
diff --git a/activemodel/test/cases/validations/acceptance_validation_test.rb b/activemodel/test/cases/validations/acceptance_validation_test.rb
index dc413bef30..d9d8c6b0f8 100644
--- a/activemodel/test/cases/validations/acceptance_validation_test.rb
+++ b/activemodel/test/cases/validations/acceptance_validation_test.rb
@@ -8,7 +8,7 @@ require 'models/person'
 class AcceptanceValidationTest < ActiveModel::TestCase
 
   def teardown
-    Topic.reset_callbacks(:validate)
+    Topic.clear_validators!
   end
 
   def test_terms_of_service_agreement_no_acceptance
diff --git a/activemodel/test/cases/validations/conditional_validation_test.rb b/activemodel/test/cases/validations/conditional_validation_test.rb
index 5049d6dd61..1261937b56 100644
--- a/activemodel/test/cases/validations/conditional_validation_test.rb
+++ b/activemodel/test/cases/validations/conditional_validation_test.rb
@@ -6,7 +6,7 @@ require 'models/topic'
 class ConditionalValidationTest < ActiveModel::TestCase
 
   def teardown
-    Topic.reset_callbacks(:validate)
+    Topic.clear_validators!
   end
 
   def test_if_validation_using_method_true
diff --git a/activemodel/test/cases/validations/confirmation_validation_test.rb b/activemodel/test/cases/validations/confirmation_validation_test.rb
index f03de2c24a..4957ba5d0a 100644
--- a/activemodel/test/cases/validations/confirmation_validation_test.rb
+++ b/activemodel/test/cases/validations/confirmation_validation_test.rb
@@ -7,7 +7,7 @@ require 'models/person'
 class ConfirmationValidationTest < ActiveModel::TestCase
 
   def teardown
-    Topic.reset_callbacks(:validate)
+    Topic.clear_validators!
   end
 
   def test_no_title_confirmation
@@ -49,7 +49,7 @@ class ConfirmationValidationTest < ActiveModel::TestCase
     p.karma = "None"
     assert p.valid?
   ensure
-    Person.reset_callbacks(:validate)
+    Person.clear_validators!
   end
 
   def test_title_confirmation_with_i18n_attribute
diff --git a/activemodel/test/cases/validations/exclusion_validation_test.rb b/activemodel/test/cases/validations/exclusion_validation_test.rb
index 81455ba519..1ce41f9bc9 100644
--- a/activemodel/test/cases/validations/exclusion_validation_test.rb
+++ b/activemodel/test/cases/validations/exclusion_validation_test.rb
@@ -7,7 +7,7 @@ require 'models/person'
 class ExclusionValidationTest < ActiveModel::TestCase
 
   def teardown
-    Topic.reset_callbacks(:validate)
+    Topic.clear_validators!
   end
 
   def test_validates_exclusion_of
@@ -50,7 +50,7 @@ class ExclusionValidationTest < ActiveModel::TestCase
     p.karma = "Lifo"
     assert p.valid?
   ensure
-    Person.reset_callbacks(:validate)
+    Person.clear_validators!
   end
 
   def test_validates_exclusion_of_with_lambda
@@ -87,6 +87,6 @@ class ExclusionValidationTest < ActiveModel::TestCase
 
     assert p.valid?
   ensure
-    Person.reset_callbacks(:validate)
+    Person.clear_validators!
   end
 end
diff --git a/activemodel/test/cases/validations/format_validation_test.rb b/activemodel/test/cases/validations/format_validation_test.rb
index 26e8dbf19c..0f91b73cd7 100644
--- a/activemodel/test/cases/validations/format_validation_test.rb
+++ b/activemodel/test/cases/validations/format_validation_test.rb
@@ -7,7 +7,7 @@ require 'models/person'
 class PresenceValidationTest < ActiveModel::TestCase
 
   def teardown
-    Topic.reset_callbacks(:validate)
+    Topic.clear_validators!
   end
 
   def test_validate_format
@@ -68,11 +68,11 @@ class PresenceValidationTest < ActiveModel::TestCase
     assert t.invalid?
     assert_equal ["can't be Invalid title"], t.errors[:title]
   end
-  
+
   def test_validate_format_of_with_multiline_regexp_should_raise_error
     assert_raise(ArgumentError) { Topic.validates_format_of(:title, with: /^Valid Title$/) }
   end
-  
+
   def test_validate_format_of_with_multiline_regexp_and_option
     assert_nothing_raised(ArgumentError) do
       Topic.validates_format_of(:title, with: /^Valid Title$/, multiline: true)
@@ -144,6 +144,6 @@ class PresenceValidationTest < ActiveModel::TestCase
     p.karma = "1234"
     assert p.valid?
   ensure
-    Person.reset_callbacks(:validate)
+    Person.clear_validators!
   end
 end
diff --git a/activemodel/test/cases/validations/i18n_generate_message_validation_test.rb b/activemodel/test/cases/validations/i18n_generate_message_validation_test.rb
index 40a5aee997..93600c587a 100644
--- a/activemodel/test/cases/validations/i18n_generate_message_validation_test.rb
+++ b/activemodel/test/cases/validations/i18n_generate_message_validation_test.rb
@@ -4,7 +4,7 @@ require 'models/person'
 
 class I18nGenerateMessageValidationTest < ActiveModel::TestCase
   def setup
-    Person.reset_callbacks(:validate)
+    Person.clear_validators!
     @person = Person.new
   end
 
diff --git a/activemodel/test/cases/validations/i18n_validation_test.rb b/activemodel/test/cases/validations/i18n_validation_test.rb
index e29771d6b7..d10010537e 100644
--- a/activemodel/test/cases/validations/i18n_validation_test.rb
+++ b/activemodel/test/cases/validations/i18n_validation_test.rb
@@ -6,7 +6,7 @@ require 'models/person'
 class I18nValidationTest < ActiveModel::TestCase
 
   def setup
-    Person.reset_callbacks(:validate)
+    Person.clear_validators!
     @person = Person.new
 
     @old_load_path, @old_backend = I18n.load_path.dup, I18n.backend
@@ -16,7 +16,7 @@ class I18nValidationTest < ActiveModel::TestCase
   end
 
   def teardown
-    Person.reset_callbacks(:validate)
+    Person.clear_validators!
     I18n.load_path.replace @old_load_path
     I18n.backend = @old_backend
   end
diff --git a/activemodel/test/cases/validations/inclusion_validation_test.rb b/activemodel/test/cases/validations/inclusion_validation_test.rb
index 8b90856869..3a8f3080e1 100644
--- a/activemodel/test/cases/validations/inclusion_validation_test.rb
+++ b/activemodel/test/cases/validations/inclusion_validation_test.rb
@@ -8,7 +8,7 @@ require 'models/person'
 class InclusionValidationTest < ActiveModel::TestCase
 
   def teardown
-    Topic.reset_callbacks(:validate)
+    Topic.clear_validators!
   end
 
   def test_validates_inclusion_of_range
@@ -105,7 +105,7 @@ class InclusionValidationTest < ActiveModel::TestCase
     p.karma = "monkey"
     assert p.valid?
   ensure
-    Person.reset_callbacks(:validate)
+    Person.clear_validators!
   end
 
   def test_validates_inclusion_of_with_lambda
@@ -142,6 +142,6 @@ class InclusionValidationTest < ActiveModel::TestCase
 
     assert p.valid?
   ensure
-    Person.reset_callbacks(:validate)
+    Person.clear_validators!
   end
 end
diff --git a/activemodel/test/cases/validations/length_validation_test.rb b/activemodel/test/cases/validations/length_validation_test.rb
index 8b2f886cc4..046ffcb16f 100644
--- a/activemodel/test/cases/validations/length_validation_test.rb
+++ b/activemodel/test/cases/validations/length_validation_test.rb
@@ -6,7 +6,7 @@ require 'models/person'
 
 class LengthValidationTest < ActiveModel::TestCase
   def teardown
-    Topic.reset_callbacks(:validate)
+    Topic.clear_validators!
   end
 
   def test_validates_length_of_with_allow_nil
@@ -354,7 +354,7 @@ class LengthValidationTest < ActiveModel::TestCase
     p.karma = "The Smiths"
     assert p.valid?
   ensure
-    Person.reset_callbacks(:validate)
+    Person.clear_validators!
   end
 
   def test_validates_length_of_for_infinite_maxima
diff --git a/activemodel/test/cases/validations/numericality_validation_test.rb b/activemodel/test/cases/validations/numericality_validation_test.rb
index 84332ed014..f77cf47fb7 100644
--- a/activemodel/test/cases/validations/numericality_validation_test.rb
+++ b/activemodel/test/cases/validations/numericality_validation_test.rb
@@ -9,7 +9,7 @@ require 'bigdecimal'
 class NumericalityValidationTest < ActiveModel::TestCase
 
   def teardown
-    Topic.reset_callbacks(:validate)
+    Topic.clear_validators!
   end
 
   NIL = [nil]
@@ -157,7 +157,7 @@ class NumericalityValidationTest < ActiveModel::TestCase
     p.karma = "1234"
     assert p.valid?
   ensure
-    Person.reset_callbacks(:validate)
+    Person.clear_validators!
   end
 
   def test_validates_numericality_with_invalid_args
diff --git a/activemodel/test/cases/validations/presence_validation_test.rb b/activemodel/test/cases/validations/presence_validation_test.rb
index 2f228cfa83..ecf16d1e16 100644
--- a/activemodel/test/cases/validations/presence_validation_test.rb
+++ b/activemodel/test/cases/validations/presence_validation_test.rb
@@ -8,9 +8,9 @@ require 'models/custom_reader'
 class PresenceValidationTest < ActiveModel::TestCase
 
   teardown do
-    Topic.reset_callbacks(:validate)
-    Person.reset_callbacks(:validate)
-    CustomReader.reset_callbacks(:validate)
+    Topic.clear_validators!
+    Person.clear_validators!
+    CustomReader.clear_validators!
   end
 
   def test_validate_presences
diff --git a/activemodel/test/cases/validations/validates_test.rb b/activemodel/test/cases/validations/validates_test.rb
index c1914b32bc..699a872e42 100644
--- a/activemodel/test/cases/validations/validates_test.rb
+++ b/activemodel/test/cases/validations/validates_test.rb
@@ -11,9 +11,9 @@ class ValidatesTest < ActiveModel::TestCase
   teardown :reset_callbacks
 
   def reset_callbacks
-    Person.reset_callbacks(:validate)
-    Topic.reset_callbacks(:validate)
-    PersonWithValidator.reset_callbacks(:validate)
+    Person.clear_validators!
+    Topic.clear_validators!
+    PersonWithValidator.clear_validators!
   end
 
   def test_validates_with_messages_empty
diff --git a/activemodel/test/cases/validations/validations_context_test.rb b/activemodel/test/cases/validations/validations_context_test.rb
index 9ad20e8453..005bf118c6 100644
--- a/activemodel/test/cases/validations/validations_context_test.rb
+++ b/activemodel/test/cases/validations/validations_context_test.rb
@@ -5,8 +5,7 @@ require 'models/topic'
 
 class ValidationsContextTest < ActiveModel::TestCase
   def teardown
-    Topic.reset_callbacks(:validate)
-    Topic._validators.clear
+    Topic.clear_validators!
   end
 
   ERROR_MESSAGE = "Validation error from validator"
diff --git a/activemodel/test/cases/validations/with_validation_test.rb b/activemodel/test/cases/validations/with_validation_test.rb
index 93716f1433..736c2deea8 100644
--- a/activemodel/test/cases/validations/with_validation_test.rb
+++ b/activemodel/test/cases/validations/with_validation_test.rb
@@ -6,8 +6,7 @@ require 'models/topic'
 class ValidatesWithTest < ActiveModel::TestCase
 
   def teardown
-    Topic.reset_callbacks(:validate)
-    Topic._validators.clear
+    Topic.clear_validators!
   end
 
   ERROR_MESSAGE = "Validation error from validator"
diff --git a/activemodel/test/cases/validations_test.rb b/activemodel/test/cases/validations_test.rb
index 039b6b8872..bee8ece992 100644
--- a/activemodel/test/cases/validations_test.rb
+++ b/activemodel/test/cases/validations_test.rb
@@ -10,17 +10,10 @@ require 'active_support/json'
 require 'active_support/xml_mini'
 
 class ValidationsTest < ActiveModel::TestCase
-
   class CustomStrictValidationException < StandardError; end
 
-  def setup
-    Topic._validators.clear
-  end
-
-  # Most of the tests mess with the validations of Topic, so lets repair it all the time.
-  # Other classes we mess with will be dealt with in the specific tests
   def teardown
-    Topic.reset_callbacks(:validate)
+    Topic.clear_validators!
   end
 
   def test_single_field_validation
-- 
cgit v1.2.3


From 20317f3d4df3ef0e876b5b213551f0d7d81d0c19 Mon Sep 17 00:00:00 2001
From: Kuldeep Aggarwal <kd.engineer@yahoo.co.in>
Date: Tue, 28 Jan 2014 00:13:35 +0530
Subject: use the new clear_validators! api everywhere to reset validators in
 tests

---
 activemodel/test/cases/validations/acceptance_validation_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activemodel/test/cases')

diff --git a/activemodel/test/cases/validations/acceptance_validation_test.rb b/activemodel/test/cases/validations/acceptance_validation_test.rb
index d9d8c6b0f8..e78aa1adaf 100644
--- a/activemodel/test/cases/validations/acceptance_validation_test.rb
+++ b/activemodel/test/cases/validations/acceptance_validation_test.rb
@@ -63,6 +63,6 @@ class AcceptanceValidationTest < ActiveModel::TestCase
     p.karma = "1"
     assert p.valid?
   ensure
-    Person.reset_callbacks(:validate)
+    Person.clear_validators!
   end
 end
-- 
cgit v1.2.3


From 7d196cf360321466c0eefc474bfad1be7e3ea7ab Mon Sep 17 00:00:00 2001
From: Yves Senn <yves.senn@gmail.com>
Date: Tue, 4 Feb 2014 10:27:46 +0100
Subject: `#to_param` returns `nil` if `to_key` returns `nil`. Closes #11399.

The documentation of `#to_key` (http://api.rubyonrails.org/classes/ActiveModel/Conversion.html#method-i-to_key)
states that it returns `nil` if there are no key attributes. `to_param` needs
to be aware of that fact and return `nil` as well.

Previously it raised the following exception:

```
  1) Error:
ConversionTest#test_to_param_returns_nil_if_to_key_is_nil:
NoMethodError: undefined method `join' for nil:NilClass
    /Users/senny/Projects/rails/activemodel/lib/active_model/conversion.rb:65:in `to_param'
    /Users/senny/Projects/rails/activemodel/test/cases/conversion_test.rb:34:in `block in <class:ConversionTest>'
```
---
 activemodel/test/cases/conversion_test.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'activemodel/test/cases')

diff --git a/activemodel/test/cases/conversion_test.rb b/activemodel/test/cases/conversion_test.rb
index 3bb177591d..c5cfbf909d 100644
--- a/activemodel/test/cases/conversion_test.rb
+++ b/activemodel/test/cases/conversion_test.rb
@@ -24,6 +24,16 @@ class ConversionTest < ActiveModel::TestCase
     assert_equal "1", Contact.new(id: 1).to_param
   end
 
+  test "to_param returns nil if to_key is nil" do
+    klass = Class.new(Contact) do
+      def persisted?
+        true
+      end
+    end
+
+    assert_nil klass.new.to_param
+  end
+
   test "to_partial_path default implementation returns a string giving a relative path" do
     assert_equal "contacts/contact", Contact.new.to_partial_path
     assert_equal "helicopters/helicopter", Helicopter.new.to_partial_path,
-- 
cgit v1.2.3


From 8acd58f23cac478c2f5f8a51a9b591a98773baec Mon Sep 17 00:00:00 2001
From: Dmitry Polushkin <dmitry.polushkin@gmail.com>
Date: Sun, 9 Feb 2014 01:34:14 +0000
Subject: add test coverage for activemodel Dirty#reset_changes

---
 activemodel/test/cases/dirty_test.rb | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'activemodel/test/cases')

diff --git a/activemodel/test/cases/dirty_test.rb b/activemodel/test/cases/dirty_test.rb
index 8b55901a65..2853476c91 100644
--- a/activemodel/test/cases/dirty_test.rb
+++ b/activemodel/test/cases/dirty_test.rb
@@ -41,6 +41,10 @@ class DirtyTest < ActiveModel::TestCase
     def save
       changes_applied
     end
+
+    def reload
+      reset_changes
+    end
   end
 
   setup do
@@ -157,4 +161,19 @@ class DirtyTest < ActiveModel::TestCase
     @model.size = 1
     assert @model.size_changed?
   end
+
+  test "reload should reset all changes" do
+    @model.name = 'Dmitry'
+    @model.name_changed?
+    @model.save
+    @model.name = 'Bob'
+
+    assert_equal [nil, 'Dmitry'], @model.previous_changes['name']
+    assert_equal 'Dmitry', @model.changed_attributes['name']
+
+    @model.reload
+
+    assert_equal ActiveSupport::HashWithIndifferentAccess.new, @model.previous_changes
+    assert_equal ActiveSupport::HashWithIndifferentAccess.new, @model.changed_attributes
+  end
 end
-- 
cgit v1.2.3