7 files changed, 81 insertions, 12 deletions
diff --git a/activemodel/test/cases/callbacks_test.rb b/activemodel/test/cases/callbacks_test.rb
index 5fede098d1..2ac681b8d8 100644
--- a/activemodel/test/cases/callbacks_test.rb
+++ b/activemodel/test/cases/callbacks_test.rb
@@ -7,6 +7,7 @@ class CallbacksTest < ActiveModel::TestCase
       model.callbacks << :before_around_create
       yield
       model.callbacks << :after_around_create
+      false
     end
   end
 
@@ -24,16 +25,20 @@ class CallbacksTest < ActiveModel::TestCase
 
     after_create do |model|
       model.callbacks << :after_create
+      false
     end
 
     after_create "@callbacks << :final_callback"
 
-    def initialize(valid=true)
-      @callbacks, @valid = [], valid
+    def initialize(options = {})
+      @callbacks = []
+      @valid = options[:valid]
+      @before_create_returns = options[:before_create_returns]
     end
 
     def before_create
       @callbacks << :before_create
+      @before_create_returns
     end
 
     def create
@@ -51,14 +56,20 @@ class CallbacksTest < ActiveModel::TestCase
                                     :after_around_create, :after_create, :final_callback]
   end
 
-  test "after callbacks are always appended" do
+  test "the callback chain is not halted when around or after callbacks return false" do
     model = ModelCallbacks.new
     model.create
     assert_equal model.callbacks.last, :final_callback
   end
 
+  test "the callback chain is halted when a before callback returns false" do
+    model = ModelCallbacks.new(before_create_returns: false)
+    model.create
+    assert_equal model.callbacks.last, :before_create
+  end
+
   test "after callbacks are not executed if the block returns false" do
-    model = ModelCallbacks.new(false)
+    model = ModelCallbacks.new(valid: false)
     model.create
     assert_equal model.callbacks, [ :before_create, :before_around_create,
                                     :create, :after_around_create]
diff --git a/activemodel/test/cases/errors_test.rb b/activemodel/test/cases/errors_test.rb
index 42d0365521..efedd9055f 100644
--- a/activemodel/test/cases/errors_test.rb
+++ b/activemodel/test/cases/errors_test.rb
@@ -59,6 +59,17 @@ class ErrorsTest < ActiveModel::TestCase
     assert_equal false, errors.has_key?(:name), 'errors should not have key :name'
   end
 
+  def test_key?
+    errors = ActiveModel::Errors.new(self)
+    errors[:foo] = 'omg'
+    assert_equal true, errors.key?(:foo), 'errors should have key :foo'
+  end
+
+  def test_no_key
+    errors = ActiveModel::Errors.new(self)
+    assert_equal false, errors.key?(:name), 'errors should not have key :name'
+  end
+
   test "clear errors" do
     person = Person.new
     person.validate!
diff --git a/activemodel/test/cases/helper.rb b/activemodel/test/cases/helper.rb
index 5e80353836..4ce6103593 100644
--- a/activemodel/test/cases/helper.rb
+++ b/activemodel/test/cases/helper.rb
@@ -17,4 +17,4 @@ require 'mocha/setup' # FIXME: stop using mocha
 # FIXME: we have tests that depend on run order, we should fix that and
 # remove this method call.
 require 'active_support/test_case'
-ActiveSupport::TestCase.my_tests_are_order_dependent!
+ActiveSupport::TestCase.test_order = :sorted
diff --git a/activemodel/test/cases/validations/callbacks_test.rb b/activemodel/test/cases/validations/callbacks_test.rb
index 6cd0f4ed4d..5d6d48b824 100644
--- a/activemodel/test/cases/validations/callbacks_test.rb
+++ b/activemodel/test/cases/validations/callbacks_test.rb
@@ -30,11 +30,16 @@ class DogWithTwoValidators < Dog
   before_validation { self.history << 'before_validation_marker2' }
 end
 
-class DogValidatorReturningFalse < Dog
+class DogBeforeValidatorReturningFalse < Dog
   before_validation { false }
   before_validation { self.history << 'before_validation_marker2' }
 end
 
+class DogAfterValidatorReturningFalse < Dog
+  after_validation { false }
+  after_validation { self.history << 'after_validation_marker' }
+end
+
 class DogWithMissingName < Dog
   before_validation { self.history << 'before_validation_marker' }
   validates_presence_of :name
@@ -82,12 +87,18 @@ class CallbacksWithMethodNamesShouldBeCalled < ActiveModel::TestCase
   end
 
   def test_further_callbacks_should_not_be_called_if_before_validation_returns_false
-    d = DogValidatorReturningFalse.new
+    d = DogBeforeValidatorReturningFalse.new
     output = d.valid?
     assert_equal [], d.history
     assert_equal false, output
   end
 
+  def test_further_callbacks_should_be_called_if_after_validation_returns_false
+    d = DogAfterValidatorReturningFalse.new
+    d.valid?
+    assert_equal ['after_validation_marker'], d.history
+  end
+
   def test_validation_test_should_be_done
     d = DogWithMissingName.new
     output = d.valid?
diff --git a/activemodel/test/cases/validations/numericality_validation_test.rb b/activemodel/test/cases/validations/numericality_validation_test.rb
index 3834d327ea..12a22f9c40 100644
--- a/activemodel/test/cases/validations/numericality_validation_test.rb
+++ b/activemodel/test/cases/validations/numericality_validation_test.rb
@@ -59,7 +59,7 @@ class NumericalityValidationTest < ActiveModel::TestCase
 
   def test_validates_numericality_of_with_integer_only_and_proc_as_value
     Topic.send(:define_method, :allow_only_integers?, lambda { false })
-    Topic.validates_numericality_of :approved, only_integer: Proc.new {|topic| topic.allow_only_integers? }
+    Topic.validates_numericality_of :approved, only_integer: Proc.new(&:allow_only_integers?)
 
     invalid!(NIL + BLANK + JUNK)
     valid!(FLOATS + INTEGERS + BIGDECIMAL + INFINITY)
@@ -130,7 +130,7 @@ class NumericalityValidationTest < ActiveModel::TestCase
 
   def test_validates_numericality_with_proc
     Topic.send(:define_method, :min_approved, lambda { 5 })
-    Topic.validates_numericality_of :approved, greater_than_or_equal_to: Proc.new {|topic| topic.min_approved }
+    Topic.validates_numericality_of :approved, greater_than_or_equal_to: Proc.new(&:min_approved)
 
     invalid!([3, 4])
     valid!([5, 6])
diff --git a/activemodel/test/cases/validations/validates_test.rb b/activemodel/test/cases/validations/validates_test.rb
index 699a872e42..8d4b74ee49 100644
--- a/activemodel/test/cases/validations/validates_test.rb
+++ b/activemodel/test/cases/validations/validates_test.rb
@@ -3,7 +3,6 @@ require 'cases/helper'
 require 'models/person'
 require 'models/topic'
 require 'models/person_with_validator'
-require 'validators/email_validator'
 require 'validators/namespace/email_validator'
 
 class ValidatesTest < ActiveModel::TestCase
diff --git a/activemodel/test/cases/validations_test.rb b/activemodel/test/cases/validations_test.rb
index d876f73052..2b932683ea 100644
--- a/activemodel/test/cases/validations_test.rb
+++ b/activemodel/test/cases/validations_test.rb
@@ -167,10 +167,47 @@ class ValidationsTest < ActiveModel::TestCase
   end
 
   def test_invalid_options_to_validate
-    assert_raises(ArgumentError) do
+    error = assert_raises(ArgumentError) do
       # A common mistake -- we meant to call 'validates'
       Topic.validate :title, presence: true
     end
+    message = 'Unknown key: :presence. Valid keys are: :on, :if, :unless, :prepend. Perhaps you meant to call `validates` instead of `validate`?'
+    assert_equal message, error.message
+  end
+
+  def test_callback_options_to_validate
+    klass = Class.new(Topic) do
+      attr_reader :call_sequence
+
+      def initialize(*)
+        super
+        @call_sequence = []
+      end
+
+      private
+        def validator_a
+          @call_sequence << :a
+        end
+
+        def validator_b
+          @call_sequence << :b
+        end
+
+        def validator_c
+          @call_sequence << :c
+        end
+    end
+
+    assert_nothing_raised do
+      klass.validate :validator_a, if: ->{ true }
+      klass.validate :validator_b, prepend: true
+      klass.validate :validator_c, unless: ->{ true }
+    end
+
+    t = klass.new
+
+    assert_predicate t, :valid?
+    assert_equal [:b, :a], t.call_sequence
   end
 
   def test_errors_conversions
@@ -280,7 +317,7 @@ class ValidationsTest < ActiveModel::TestCase
       ActiveModel::Validations::FormatValidator,
       ActiveModel::Validations::LengthValidator,
       ActiveModel::Validations::PresenceValidator
-    ], validators.map { |v| v.class }.sort_by { |c| c.to_s }
+    ], validators.map(&:class).sort_by(&:to_s)
   end
 
   def test_list_of_validators_will_be_empty_when_empty