1 files changed, 35 insertions, 2 deletions
diff --git a/activemodel/test/cases/errors_test.rb b/activemodel/test/cases/errors_test.rb
index 85ca8ca835..4c76bb43a8 100644
--- a/activemodel/test/cases/errors_test.rb
+++ b/activemodel/test/cases/errors_test.rb
@@ -33,6 +33,12 @@ class ErrorsTest < ActiveModel::TestCase
     assert errors.include?(:foo), 'errors should include :foo'
   end
 
+  def test_has_key?
+    errors = ActiveModel::Errors.new(self)
+    errors[:foo] = 'omg'
+    assert errors.has_key?(:foo), 'errors should have key :foo'
+  end
+
   test "should return true if no errors" do
     person = Person.new
     person.errors[:foo]
@@ -46,7 +52,6 @@ class ErrorsTest < ActiveModel::TestCase
     person.validate!
     assert_equal ["name can not be nil"], person.errors.full_messages
     assert_equal ["can not be nil"], person.errors[:name]
-
   end
 
   test 'should be able to assign error' do
@@ -72,7 +77,6 @@ class ErrorsTest < ActiveModel::TestCase
     person.errors.add(:name, "can not be blank")
     person.errors.add(:name, "can not be nil")
     assert_equal ["name can not be blank", "name can not be nil"], person.errors.to_a
-
   end
 
   test 'to_hash should return an ordered hash' do
@@ -80,4 +84,33 @@ class ErrorsTest < ActiveModel::TestCase
     person.errors.add(:name, "can not be blank")
     assert_instance_of ActiveSupport::OrderedHash, person.errors.to_hash
   end
+
+  test 'full_messages should return an array of error messages, with the attribute name included' do
+    person = Person.new
+    person.errors.add(:name, "can not be blank")
+    person.errors.add(:name, "can not be nil")
+    assert_equal ["name can not be blank", "name can not be nil"], person.errors.to_a
+  end
+
+  test 'full_message should return the given message if attribute equals :base' do
+    person = Person.new
+    assert_equal "press the button", person.errors.full_message(:base, "press the button")
+  end
+
+  test 'full_message should return the given message with the attribute name included' do
+    person = Person.new
+    assert_equal "name can not be blank", person.errors.full_message(:name, "can not be blank")
+  end
+
+  test 'should return a JSON hash representation of the errors' do
+    person = Person.new
+    person.errors.add(:name, "can not be blank")
+    person.errors.add(:name, "can not be nil")
+    person.errors.add(:email, "is invalid")
+    hash = person.errors.as_json
+    assert_equal ["can not be blank", "can not be nil"], hash[:name]
+    assert_equal ["is invalid"], hash[:email]
+  end
+
 end
+