3 files changed, 48 insertions, 19 deletions
diff --git a/activemodel/test/cases/conversion_test.rb b/activemodel/test/cases/conversion_test.rb
index c5cfbf909d..800cad6d9a 100644
--- a/activemodel/test/cases/conversion_test.rb
+++ b/activemodel/test/cases/conversion_test.rb
@@ -24,6 +24,10 @@ class ConversionTest < ActiveModel::TestCase
     assert_equal "1", Contact.new(id: 1).to_param
   end
 
+  test "to_param returns the string joined by '-'" do
+    assert_equal "abc-xyz", Contact.new(id: ["abc", "xyz"]).to_param
+  end
+
   test "to_param returns nil if to_key is nil" do
     klass = Class.new(Contact) do
       def persisted?
diff --git a/activemodel/test/cases/secure_password_test.rb b/activemodel/test/cases/secure_password_test.rb
index bcd1e04a0f..e59f00c8c5 100644
--- a/activemodel/test/cases/secure_password_test.rb
+++ b/activemodel/test/cases/secure_password_test.rb
@@ -20,7 +20,7 @@ class SecurePasswordTest < ActiveModel::TestCase
     ActiveModel::SecurePassword.min_cost = @original_min_cost
   end
 
-  test "create and updating without validations" do
+  test "create/update without validations" do
     assert @visitor.valid?(:create), 'visitor should be valid'
     assert @visitor.valid?(:update), 'visitor should be valid'
 
@@ -31,6 +31,18 @@ class SecurePasswordTest < ActiveModel::TestCase
     assert @visitor.valid?(:update), 'visitor should be valid'
   end
 
+  test "create a new user with validations and valid password/confirmation" do
+    @user.password = 'password'
+    @user.password_confirmation = 'password'
+
+    assert @user.valid?(:create), 'user should be valid'
+
+    @user.password = 'a' * 72
+    @user.password_confirmation = 'a' * 72
+
+    assert @user.valid?(:create), 'user 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'
@@ -45,6 +57,14 @@ class SecurePasswordTest < ActiveModel::TestCase
     assert_equal ["can't be blank"], @user.errors[:password]
   end
 
+  test 'create a new user with validation and password length greater than 72' do
+    @user.password = 'a' * 73
+    @user.password_confirmation = 'a' * 73
+    assert !@user.valid?(:create), 'user should be invalid'
+    assert_equal 1, @user.errors.count
+    assert_equal ["is too long (maximum is 72 characters)"], @user.errors[:password]
+  end
+
   test "create a new user with validation and a blank password confirmation" do
     @user.password = 'password'
     @user.password_confirmation = ''
@@ -67,15 +87,19 @@ class SecurePasswordTest < ActiveModel::TestCase
     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]
+  test "update an existing user with validation and no change in password" do
+    assert @existing_user.valid?(:update), 'user should be valid'
   end
 
-  test "update an existing user with validation and no change in password" do
+  test "update an existing user with validations and valid password/confirmation" do
+    @existing_user.password = 'password'
+    @existing_user.password_confirmation = 'password'
+
+    assert @existing_user.valid?(:update), 'user should be valid'
+
+    @existing_user.password = 'a' * 72
+    @existing_user.password_confirmation = 'a' * 72
+
     assert @existing_user.valid?(:update), 'user should be valid'
   end
 
@@ -97,6 +121,14 @@ class SecurePasswordTest < ActiveModel::TestCase
     assert_equal ["can't be blank"], @existing_user.errors[:password]
   end
 
+  test 'updating an existing user with validation and password length greater than 72' do
+    @existing_user.password = 'a' * 73
+    @existing_user.password_confirmation = 'a' * 73
+    assert !@existing_user.valid?(:update), 'user should be invalid'
+    assert_equal 1, @existing_user.errors.count
+    assert_equal ["is too long (maximum is 72 characters)"], @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 = ''
@@ -119,14 +151,6 @@ class SecurePasswordTest < ActiveModel::TestCase
     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'
diff --git a/activemodel/test/cases/validations/absence_validation_test.rb b/activemodel/test/cases/validations/absence_validation_test.rb
index 795ce16d28..ebfe1cf4e4 100644
--- a/activemodel/test/cases/validations/absence_validation_test.rb
+++ b/activemodel/test/cases/validations/absence_validation_test.rb
@@ -11,7 +11,7 @@ class AbsenceValidationTest < ActiveModel::TestCase
     CustomReader.clear_validators!
   end
 
-  def test_validate_absences
+  def test_validates_absence_of
     Topic.validates_absence_of(:title, :content)
     t = Topic.new
     t.title = "foo"
@@ -23,11 +23,12 @@ class AbsenceValidationTest < ActiveModel::TestCase
     t.content  = "something"
     assert t.invalid?
     assert_equal ["must be blank"], t.errors[:content]
+    assert_equal [], t.errors[:title]
     t.content = ""
     assert t.valid?
   end
 
-  def test_accepts_array_arguments
+  def test_validates_absence_of_with_array_arguments
     Topic.validates_absence_of %w(title content)
     t = Topic.new
     t.title = "foo"
@@ -37,7 +38,7 @@ class AbsenceValidationTest < ActiveModel::TestCase
     assert_equal ["must be blank"], t.errors[:content]
   end
 
-  def test_validates_acceptance_of_with_custom_error_using_quotes
+  def test_validates_absence_of_with_custom_error_using_quotes
     Person.validates_absence_of :karma, message: "This string contains 'single' and \"double\" quotes"
     p = Person.new
     p.karma = "good"