5 files changed, 8 insertions, 4 deletions
diff --git a/activemodel/lib/active_model/conversion.rb b/activemodel/lib/active_model/conversion.rb
index 06fe0720ef..374265f0d8 100644
--- a/activemodel/lib/active_model/conversion.rb
+++ b/activemodel/lib/active_model/conversion.rb
@@ -83,7 +83,7 @@ module ActiveModel
       # internal method and should not be accessed directly.
       def _to_partial_path #:nodoc:
         @_to_partial_path ||= begin
-          element = ActiveSupport::Inflector.underscore(ActiveSupport::Inflector.demodulize(self))
+          element = ActiveSupport::Inflector.underscore(ActiveSupport::Inflector.demodulize(name))
           collection = ActiveSupport::Inflector.tableize(name)
           "#{collection}/#{element}".freeze
         end
diff --git a/activemodel/lib/active_model/validations/with.rb b/activemodel/lib/active_model/validations/with.rb
index 16bd6670d1..7022f9bee5 100644
--- a/activemodel/lib/active_model/validations/with.rb
+++ b/activemodel/lib/active_model/validations/with.rb
@@ -139,6 +139,8 @@ module ActiveModel
     # class version of this method for more information.
     def validates_with(*args, &block)
       options = args.extract_options!
+      options[:class] = self.class
+
       args.each do |klass|
         validator = klass.new(options, &block)
         validator.validate(self)
diff --git a/activemodel/test/cases/validations_test.rb b/activemodel/test/cases/validations_test.rb
index bee8ece992..cfce8fb8e6 100644
--- a/activemodel/test/cases/validations_test.rb
+++ b/activemodel/test/cases/validations_test.rb
@@ -284,10 +284,11 @@ class ValidationsTest < ActiveModel::TestCase
     auto = Automobile.new
 
     assert          auto.invalid?
-    assert_equal 2, auto.errors.size
+    assert_equal 3, auto.errors.size
 
     auto.make  = 'Toyota'
     auto.model = 'Corolla'
+    auto.approved = '1'
 
     assert auto.valid?
   end
diff --git a/activemodel/test/models/automobile.rb b/activemodel/test/models/automobile.rb
index ece644c40c..4df2fe8b3a 100644
--- a/activemodel/test/models/automobile.rb
+++ b/activemodel/test/models/automobile.rb
@@ -3,10 +3,11 @@ class Automobile
 
   validate :validations
 
-  attr_accessor :make, :model
+  attr_accessor :make, :model, :approved
 
   def validations
     validates_presence_of :make
     validates_length_of   :model, within: 2..10
+    validates_acceptance_of :approved, allow_nil: false
   end
 end
diff --git a/activesupport/lib/active_support/core_ext/kernel/concern.rb b/activesupport/lib/active_support/core_ext/kernel/concern.rb
index c200a78d36..bf72caa058 100644
--- a/activesupport/lib/active_support/core_ext/kernel/concern.rb
+++ b/activesupport/lib/active_support/core_ext/kernel/concern.rb
@@ -3,7 +3,7 @@ require 'active_support/core_ext/module/concerning'
 module Kernel
   # A shortcut to define a toplevel concern, not within a module.
   #
-  # See ActiveSupport::CoreExt::Module::Concerning for more.
+  # See Module::Concerning for more.
   def concern(topic, &module_definition)
     Object.concern topic, &module_definition
   end