5 files changed, 90 insertions, 10 deletions
diff --git a/activemodel/test/cases/errors_test.rb b/activemodel/test/cases/errors_test.rb
index 4c76bb43a8..8ddedb160a 100644
--- a/activemodel/test/cases/errors_test.rb
+++ b/activemodel/test/cases/errors_test.rb
@@ -66,6 +66,63 @@ class ErrorsTest < ActiveModel::TestCase
     assert_equal ["can not be blank"], person.errors[:name]
   end
 
+  test "should be able to add an error with a symbol" do
+    person = Person.new
+    person.errors.add(:name, :blank)
+    message = person.errors.generate_message(:name, :blank)
+    assert_equal [message], person.errors[:name]
+  end
+
+  test "should be able to add an error with a proc" do
+    person = Person.new
+    message = Proc.new { "can not be blank" }
+    person.errors.add(:name, message)
+    assert_equal ["can not be blank"], person.errors[:name]
+  end
+
+  test "added? should be true if that error was added" do
+    person = Person.new
+    person.errors.add(:name, "can not be blank")
+    assert person.errors.added?(:name, "can not be blank")
+  end
+
+  test "added? should handle when message is a symbol" do
+    person = Person.new
+    person.errors.add(:name, :blank)
+    assert person.errors.added?(:name, :blank)
+  end
+
+  test "added? should handle when message is a proc" do
+    person = Person.new
+    message = Proc.new { "can not be blank" }
+    person.errors.add(:name, message)
+    assert person.errors.added?(:name, message)
+  end
+
+  test "added? should default message to :invalid" do
+    person = Person.new
+    person.errors.add(:name, :invalid)
+    assert person.errors.added?(:name)
+  end
+
+  test "added? should be true when several errors are present, and we ask for one of them" do
+    person = Person.new
+    person.errors.add(:name, "can not be blank")
+    person.errors.add(:name, "is invalid")
+    assert person.errors.added?(:name, "can not be blank")
+  end
+
+  test "added? should be false if no errors are present" do
+    person = Person.new
+    assert !person.errors.added?(:name)
+  end
+
+  test "added? should be false when an error is present, but we check for another error" do
+    person = Person.new
+    person.errors.add(:name, "is invalid")
+    assert !person.errors.added?(:name, "can not be blank")
+  end
+
   test 'should respond to size' do
     person = Person.new
     person.errors.add(:name, "can not be blank")
@@ -112,5 +169,12 @@ class ErrorsTest < ActiveModel::TestCase
     assert_equal ["is invalid"], hash[:email]
   end
 
+  test "generate_message should work without i18n_scope" do
+    person = Person.new
+    assert !Person.respond_to?(:i18n_scope)
+    assert_nothing_raised {
+      person.errors.generate_message(:name, :blank)
+    }
+  end
 end
 
diff --git a/activemodel/test/cases/naming_test.rb b/activemodel/test/cases/naming_test.rb
index 1777ce2aae..5f943729dd 100644
--- a/activemodel/test/cases/naming_test.rb
+++ b/activemodel/test/cases/naming_test.rb
@@ -148,7 +148,7 @@ class NamingWithSuppliedModelNameTest < ActiveModel::TestCase
   end
 
   def test_human
-    'Article'
+    assert_equal 'Article', @model_name.human
   end
 
   def test_route_key
diff --git a/activemodel/test/cases/secure_password_test.rb b/activemodel/test/cases/secure_password_test.rb
index 6950c3be1f..4338a3fc53 100644
--- a/activemodel/test/cases/secure_password_test.rb
+++ b/activemodel/test/cases/secure_password_test.rb
@@ -10,15 +10,13 @@ class SecurePasswordTest < ActiveModel::TestCase
   end
 
   test "blank password" do
-    user = User.new
-    user.password = ''
-    assert !user.valid?, 'user should be invalid'
+    @user.password = ''
+    assert !@user.valid?, 'user should be invalid'
   end
 
   test "nil password" do
-    user = User.new
-    user.password = nil
-    assert !user.valid?, 'user should be invalid'
+    @user.password = nil
+    assert !@user.valid?, 'user should be invalid'
   end
 
   test "password must be present" do
diff --git a/activemodel/test/cases/serialization_test.rb b/activemodel/test/cases/serialization_test.rb
index 29bcdeae67..b8dad9d51f 100644
--- a/activemodel/test/cases/serialization_test.rb
+++ b/activemodel/test/cases/serialization_test.rb
@@ -77,12 +77,12 @@ class SerializationTest < ActiveModel::TestCase
     assert_equal expected , @user.serializable_hash(:methods => [:bar])
   end
 
-  def test_should_not_call_methods_for_attributes
-    def @user.name
+  def test_should_use_read_attribute_for_serialization
+    def @user.read_attribute_for_serialization(n)
       "Jon"
     end
 
-    expected = { "name" => "David" }
+    expected = { "name" => "Jon" }
     assert_equal expected, @user.serializable_hash(:only => :name)
   end
 
@@ -140,4 +140,12 @@ class SerializationTest < ActiveModel::TestCase
     assert_equal expected , @user.serializable_hash(:except => :gender, :include => {:friends => {:except => :gender}})
   end
 
+  def test_multiple_includes_with_options
+    expected =  {"email"=>"david@example.com", "gender"=>"male", "name"=>"David",
+                 :address=>{"street"=>"123 Lane"},
+                 :friends=>[{"name"=>'Joe', "email"=>'joe@example.com', "gender"=>'male'},
+                            {"name"=>'Sue', "email"=>'sue@example.com', "gender"=>'female'}]}
+    assert_equal expected , @user.serializable_hash(:include => [{:address => {:only => "street"}}, :friends])
+  end
+
 end
diff --git a/activemodel/test/cases/serializers/json_serialization_test.rb b/activemodel/test/cases/serializers/json_serialization_test.rb
index 40fdcf20ca..a754d610b9 100644
--- a/activemodel/test/cases/serializers/json_serialization_test.rb
+++ b/activemodel/test/cases/serializers/json_serialization_test.rb
@@ -206,4 +206,14 @@ class JsonSerializationTest < ActiveModel::TestCase
     assert_no_match %r{"preferences":}, json
   end
 
+  test "custom as_json options should be extendible" do
+    def @contact.as_json(options = {}); super(options.merge(:only => [:name])); end
+    json = @contact.to_json
+
+    assert_match %r{"name":"Konata Izumi"}, json
+    assert_no_match %r{"created_at":#{ActiveSupport::JSON.encode(Time.utc(2006, 8, 1))}}, json
+    assert_no_match %r{"awesome":}, json
+    assert_no_match %r{"preferences":}, json
+  end
+
 end