Merge commit 'rails/master'

3 files changed, 5 insertions, 6 deletions

diff --git a/activemodel/examples/validations.rb b/activemodel/examples/validations.rb
index 3f8311ff96..b039897ea5 100644
--- a/activemodel/examples/validations.rb
+++ b/activemodel/examples/validations.rb
@@ -1,4 +1,4 @@
-require 'activemodel'
+require 'active_model'
 
 class Person
   include ActiveModel::Conversion
diff --git a/activemodel/lib/active_model/errors.rb b/activemodel/lib/active_model/errors.rb
index 590420de0b..7a48960f89 100644
--- a/activemodel/lib/active_model/errors.rb
+++ b/activemodel/lib/active_model/errors.rb
@@ -114,7 +114,7 @@ module ActiveModel
       full_messages
     end
 
-    # Translates an error message in it's default scope (<tt>activemodel.errrors.messages</tt>).
+    # Translates an error message in its default scope (<tt>activemodel.errors.messages</tt>).
     # Error messages are first looked up in <tt>models.MODEL.attributes.ATTRIBUTE.MESSAGE</tt>, if it's not there,
     # it's looked up in <tt>models.MODEL.MESSAGE</tt> and if that is not there it returns the translation of the
     # default message (e.g. <tt>activemodel.errors.messages.MESSAGE</tt>). The translated model name,
diff --git a/activemodel/lib/active_model/lint.rb b/activemodel/lib/active_model/lint.rb
index 46af8ca9de..478f887043 100644
--- a/activemodel/lib/active_model/lint.rb
+++ b/activemodel/lib/active_model/lint.rb
@@ -2,7 +2,7 @@ require "test/unit"
 require "test/unit/ui/console/testrunner"
 
 # You can test whether an object is compliant with the ActiveModel API by
-# calling ActiveModel::Compliance.test(object). It will emit a Test::Unit
+# calling ActiveModel::Lint.test(object). It will emit a Test::Unit
 # output that tells you whether your object is fully compliant, or if not,
 # which aspects of the API are not implemented.
 #
@@ -13,7 +13,6 @@ require "test/unit/ui/console/testrunner"
 #
 # Objects you pass in are expected to return a compliant object from a
 # call to to_model. It is perfectly fine for to_model to return self.
-
 module ActiveModel
   module Lint
     def self.test(object, verbosity = 2, output = STDOUT)
@@ -59,7 +58,7 @@ module ActiveModel
       end
 
       def test_destroyed?
-        assert @object.respond_to?(:new_record?), "The model should respond to destroyed?"
+        assert @object.respond_to?(:destroyed?), "The model should respond to destroyed?"
         assert_boolean "destroyed?", @object.destroyed?
       end
 
@@ -93,4 +92,4 @@ module ActiveModel
       include Errors
     end
   end
-end
\ No newline at end of file
+end