2 files changed, 19 insertions, 6 deletions
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"
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 93600c587a..3eeb80a48b 100644
--- a/activemodel/test/cases/validations/i18n_generate_message_validation_test.rb
+++ b/activemodel/test/cases/validations/i18n_generate_message_validation_test.rb
@@ -72,28 +72,40 @@ class I18nGenerateMessageValidationTest < ActiveModel::TestCase
   end
 
   # validates_length_of: generate_message(attr, :too_long, message: custom_message, count: option_value.end)
-  def test_generate_message_too_long_with_default_message
+  def test_generate_message_too_long_with_default_message_plural
     assert_equal "is too long (maximum is 10 characters)", @person.errors.generate_message(:title, :too_long, count: 10)
   end
 
+  def test_generate_message_too_long_with_default_message_singular
+    assert_equal "is too long (maximum is 1 character)", @person.errors.generate_message(:title, :too_long, count: 1)
+  end
+
   def test_generate_message_too_long_with_custom_message
     assert_equal 'custom message 10', @person.errors.generate_message(:title, :too_long, message: 'custom message %{count}', count: 10)
   end
 
   # validates_length_of: generate_message(attr, :too_short, default: custom_message, count: option_value.begin)
-  def test_generate_message_too_short_with_default_message
+  def test_generate_message_too_short_with_default_message_plural
     assert_equal "is too short (minimum is 10 characters)", @person.errors.generate_message(:title, :too_short, count: 10)
   end
 
+  def test_generate_message_too_short_with_default_message_singular
+    assert_equal "is too short (minimum is 1 character)", @person.errors.generate_message(:title, :too_short, count: 1)
+  end
+
   def test_generate_message_too_short_with_custom_message
     assert_equal 'custom message 10', @person.errors.generate_message(:title, :too_short, message: 'custom message %{count}', count: 10)
   end
 
   # validates_length_of: generate_message(attr, :wrong_length, message: custom_message, count: option_value)
-  def test_generate_message_wrong_length_with_default_message
+  def test_generate_message_wrong_length_with_default_message_plural
     assert_equal "is the wrong length (should be 10 characters)", @person.errors.generate_message(:title, :wrong_length, count: 10)
   end
 
+  def test_generate_message_wrong_length_with_default_message_singular
+    assert_equal "is the wrong length (should be 1 character)", @person.errors.generate_message(:title, :wrong_length, count: 1)
+  end
+
   def test_generate_message_wrong_length_with_custom_message
     assert_equal 'custom message 10', @person.errors.generate_message(:title, :wrong_length, message: 'custom message %{count}', count: 10)
   end