shoulda-matchers 2.7.0 → 2.8.0.rc1

data/spec/{shoulda → unit/shoulda}/matchers/action_controller/strong_parameters_matcher_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'unit_spec_helper'
 
-describe Shoulda::Matchers::ActionController do
+describe Shoulda::Matchers::ActionController, type: :controller do
   describe '#permit' do
     it 'matches when the sent parameter is allowed' do
       controller_for_resource_with_strong_parameters(action: :create) do
@@ -37,7 +37,7 @@ describe Shoulda::Matchers::ActionController do
   end
 end
 
-describe Shoulda::Matchers::ActionController::StrongParametersMatcher do
+describe Shoulda::Matchers::ActionController::StrongParametersMatcher, type: :controller do
   describe '#description' do
     it 'returns the correct string' do
       options = { action: :create, method: :post }
@@ -261,11 +261,12 @@ describe Shoulda::Matchers::ActionController::StrongParametersMatcher do
     context 'when given :create' do
       it 'POSTs to the controller' do
         controller = ActionController::Base.new
-        context = mock()
-        context.expects(:post).with(:create, {})
+        context = build_context
         matcher = described_class.new([:name]).in_context(context).for(:create)
 
         matcher.matches?(controller)
+
+        expect(context).to have_received(:post).with(:create, {})
       end
     end
 
@@ -273,20 +274,22 @@ describe Shoulda::Matchers::ActionController::StrongParametersMatcher do
       if rails_gte_4_1?
         it 'PATCHes to the controller' do
           controller = ActionController::Base.new
-          context = mock()
-          context.expects(:patch).with(:update, {})
+          context = build_context
           matcher = described_class.new([:name]).in_context(context).for(:update)
 
           matcher.matches?(controller)
+
+          expect(context).to have_received(:patch).with(:update, {})
         end
       else
         it 'PUTs to the controller' do
           controller = ActionController::Base.new
-          context = mock()
-          context.expects(:put).with(:update, {})
+          context = build_context
           matcher = described_class.new([:name]).in_context(context).for(:update)
 
           matcher.matches?(controller)
+
+          expect(context).to have_received(:put).with(:update, {})
         end
       end
     end
@@ -294,13 +297,14 @@ describe Shoulda::Matchers::ActionController::StrongParametersMatcher do
     context 'when given a custom action and verb' do
       it 'calls the action with the verb' do
         controller = ActionController::Base.new
-        context = mock()
-        context.expects(:delete).with(:hide, {})
+        context = build_context
         matcher = described_class.new([:name]).
           in_context(context).
           for(:hide, verb: :delete)
 
         matcher.matches?(controller)
+
+        expect(context).to have_received(:delete).with(:hide, {})
       end
     end
   end
@@ -319,5 +323,9 @@ describe Shoulda::Matchers::ActionController::StrongParametersMatcher do
     end
   end
 
+  def build_context
+    double('context', post: nil, put: nil, patch: nil, delete: nil)
+  end
+
   class SimulatedError < StandardError; end
 end

data/spec/{shoulda → unit/shoulda}/matchers/active_model/allow_mass_assignment_of_matcher_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'unit_spec_helper'
 
-describe Shoulda::Matchers::ActiveModel::AllowMassAssignmentOfMatcher do
+describe Shoulda::Matchers::ActiveModel::AllowMassAssignmentOfMatcher, type: :model do
   context '#description' do
     context 'without a role' do
       it 'includes the attribute name' do

data/spec/{shoulda → unit/shoulda}/matchers/active_model/allow_value_matcher_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'unit_spec_helper'
 
-describe Shoulda::Matchers::ActiveModel::AllowValueMatcher do
+describe Shoulda::Matchers::ActiveModel::AllowValueMatcher, type: :model do
   context "#description" do
     it 'describes itself with multiple values' do
       matcher = allow_value('foo', 'bar').for(:baz)
@@ -88,27 +88,53 @@ describe Shoulda::Matchers::ActiveModel::AllowValueMatcher do
     end
   end
 
-  context 'an attribute where the message occurs on another attribute' do
-    it 'allows a good value' do
-      expect(record_with_custom_validation).to \
-        allow_value('good value').for(:attr).with_message(/some message/, against: :attr2)
-    end
+  context 'when the attribute being validated is different than the attribute that receives the validation error' do
+    include UnitTests::AllowValueMatcherHelpers
+
+    context 'when the validation error message was provided directly' do
+      it 'passes given a valid value' do
+        builder = builder_for_record_with_different_error_attribute
+        expect(builder.record).
+          to allow_value(builder.valid_value).
+          for(builder.attribute_to_validate).
+          with_message(builder.message,
+            against: builder.attribute_that_receives_error
+          )
+      end
 
-    it 'rejects a bad value' do
-      expect(record_with_custom_validation).not_to \
-        allow_value('bad value').for(:attr).with_message(/some message/, against: :attr2)
+      it 'fails given an invalid value' do
+        builder = builder_for_record_with_different_error_attribute
+        invalid_value = "#{builder.valid_value} (invalid)"
+        expect(builder.record).
+          not_to allow_value(invalid_value).
+          for(builder.attribute_to_validate).
+          with_message(builder.message,
+            against: builder.attribute_that_receives_error
+          )
+      end
     end
 
-    def record_with_custom_validation
-      define_model :example, attr: :string, attr2: :string do
-        validate :custom_validation
+    context 'when the validation error message was provided via i18n' do
+      it 'passes given a valid value' do
+        builder = builder_for_record_with_different_error_attribute_using_i18n
+        expect(builder.record).
+          to allow_value(builder.valid_value).
+          for(builder.attribute_to_validate).
+          with_message(builder.validation_message_key,
+            against: builder.attribute_that_receives_error
+          )
+      end
 
-        def custom_validation
-          if self[:attr] != 'good value'
-            self.errors[:attr2] << 'some message'
-          end
-        end
-      end.new
+      it 'fails given an invalid value' do
+        builder = builder_for_record_with_different_error_attribute_using_i18n
+        invalid_value = "#{builder.valid_value} (invalid)"
+        expect(builder.record).
+          not_to allow_value(invalid_value).
+          for(builder.attribute_to_validate).
+          with_message(builder.validation_message_key,
+            against: builder.attribute_that_receives_error
+          )
+      end
     end
   end
 
@@ -194,8 +220,10 @@ describe Shoulda::Matchers::ActiveModel::AllowValueMatcher do
 
         matcher.matches?(validating_format(with: /abc/, strict: true))
 
-        expect(matcher.failure_message_when_negated).to eq 'Expected exception to include /abc/ ' +
-          'when attr is set to "xyz", got Attr is invalid'
+        expect(matcher.failure_message_when_negated).to eq(
+          %{Expected exception to include /abc/ when attr is set to "xyz",\n} +
+          %{got: "Attr is invalid"}
+        )
       end
     end
   end

data/spec/{shoulda → unit/shoulda}/matchers/active_model/disallow_value_matcher_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'unit_spec_helper'
 
-describe Shoulda::Matchers::ActiveModel::DisallowValueMatcher do
+describe Shoulda::Matchers::ActiveModel::DisallowValueMatcher, type: :model do
   context 'an attribute with a format validation' do
     it 'does not match if the value is allowed' do
       expect(validating_format(with: /abc/)).not_to matcher('abcde').for(:attr)
@@ -36,8 +36,12 @@ describe Shoulda::Matchers::ActiveModel::DisallowValueMatcher do
     end
 
     it "delegates its failure message to its allow matcher's negative failure message" do
-      allow_matcher = stub_everything(failure_message_when_negated: 'allow matcher failure')
-      Shoulda::Matchers::ActiveModel::AllowValueMatcher.stubs(:new).returns(allow_matcher)
+      allow_matcher = double('allow_matcher',
+        failure_message_when_negated: 'allow matcher failure',
+      ).as_null_object
+      allow(Shoulda::Matchers::ActiveModel::AllowValueMatcher).
+        to receive(:new).
+        and_return(allow_matcher)
 
       matcher = matcher('abcde').for(:attr).with_message('good message')
       matcher.matches?(validating_format(with: /abc/, message: 'good message'))

data/spec/{shoulda → unit/shoulda}/matchers/active_model/exception_message_finder_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'unit_spec_helper'
 
-describe Shoulda::Matchers::ActiveModel::ExceptionMessageFinder do
+describe Shoulda::Matchers::ActiveModel::ExceptionMessageFinder, type: :model do
   if active_model_3_2?
     context '#allow_description' do
       it 'describes its attribute' do
@@ -64,7 +64,7 @@ describe Shoulda::Matchers::ActiveModel::ExceptionMessageFinder do
 
         description = finder.messages_description
 
-        expect(description).to eq 'Attr is invalid'
+        expect(description).to eq ': "Attr is invalid"'
       end
 
       it 'describes errors when there are none' do
@@ -72,7 +72,7 @@ describe Shoulda::Matchers::ActiveModel::ExceptionMessageFinder do
 
         description = finder.messages_description
 
-        expect(description).to eq 'no exception'
+        expect(description).to eq ' no exception'
       end
     end
 

data/spec/{shoulda → unit/shoulda}/matchers/active_model/have_secure_password_matcher_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'unit_spec_helper'
 
-describe Shoulda::Matchers::ActiveModel::HaveSecurePasswordMatcher do
+describe Shoulda::Matchers::ActiveModel::HaveSecurePasswordMatcher, type: :model do
   if active_model_3_1?
     it 'matches when the subject configures has_secure_password with default options' do
       working_model = define_model(:example, password_digest: :string) { has_secure_password }

data/spec/{shoulda → unit/shoulda}/matchers/active_model/helpers_spec.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require 'spec_helper'
+require 'unit_spec_helper'
 
 describe Shoulda::Matchers::ActiveModel::Helpers do
   include Shoulda::Matchers::ActiveModel
@@ -98,7 +98,7 @@ describe Shoulda::Matchers::ActiveModel::Helpers do
     record = define_model :example, attr: :string do
       validates_length_of :attr, is: 40, allow_blank: true
     end.new
-    expect(record).to ensure_length_of(:attr).is_equal_to(40)
+    expect(record).to validate_length_of(:attr).is_equal_to(40)
   end
 
   def store_translations(options = {without: []})
@@ -153,6 +153,10 @@ describe Shoulda::Matchers::ActiveModel::Helpers do
     message = options.delete(:message)
     type = options.delete(:type)
 
-    ActiveModel::Errors.any_instance.expects(:generate_message).with(attribute, type, {}).at_least_once.returns(message)
+    expect_any_instance_of(ActiveModel::Errors).
+      to receive(:generate_message).
+      with(attribute, type, {}).
+      at_least(1).
+      and_return(message)
   end
 end

data/spec/{shoulda → unit/shoulda}/matchers/active_model/numericality_matchers/comparison_matcher_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'unit_spec_helper'
 
 describe Shoulda::Matchers::ActiveModel::NumericalityMatchers::ComparisonMatcher do
   subject { described_class.new(matcher, 0, :>) }

data/spec/{shoulda → unit/shoulda}/matchers/active_model/numericality_matchers/even_number_matcher_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'unit_spec_helper'
 
 describe Shoulda::Matchers::ActiveModel::NumericalityMatchers::EvenNumberMatcher  do
   subject { described_class.new(:attr) }

data/spec/{shoulda → unit/shoulda}/matchers/active_model/numericality_matchers/odd_number_matcher_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'unit_spec_helper'
 
 describe Shoulda::Matchers::ActiveModel::NumericalityMatchers::OddNumberMatcher  do
   subject { described_class.new(:attr) }

data/spec/{shoulda → unit/shoulda}/matchers/active_model/numericality_matchers/only_integer_matcher_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'unit_spec_helper'
 
 describe Shoulda::Matchers::ActiveModel::NumericalityMatchers::OnlyIntegerMatcher do
   subject { described_class.new(:attr) }

data/spec/{shoulda → unit/shoulda}/matchers/active_model/validate_absence_of_matcher_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'unit_spec_helper'
 
-describe Shoulda::Matchers::ActiveModel::ValidateAbsenceOfMatcher do
+describe Shoulda::Matchers::ActiveModel::ValidateAbsenceOfMatcher, type: :model do
   if active_model_4_0?
     def self.available_column_types
       [
@@ -59,7 +59,7 @@ describe Shoulda::Matchers::ActiveModel::ValidateAbsenceOfMatcher do
       end
 
       it 'provides the correct failure message' do
-        message = %{Expected errors to include "must be blank" when attr is set to "an arbitrary value", got no errors}
+        message = %{Expected errors to include "must be blank" when attr is set to "an arbitrary value",\ngot no errors}
 
         expect { expect(active_model_with(:attr)).to validate_absence_of(:attr) }.to fail_with_message(message)
       end

data/spec/{shoulda → unit/shoulda}/matchers/active_model/validate_acceptance_of_matcher_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'unit_spec_helper'
 
-describe Shoulda::Matchers::ActiveModel::ValidateAcceptanceOfMatcher do
+describe Shoulda::Matchers::ActiveModel::ValidateAcceptanceOfMatcher, type: :model do
   context 'a model with an acceptance validation' do
     it 'accepts when the attributes match' do
       expect(validating_acceptance).to matcher

data/spec/unit/shoulda/matchers/active_model/validate_confirmation_of_matcher_spec.rb

@@ -0,0 +1,63 @@
+require 'unit_spec_helper'
+
+describe Shoulda::Matchers::ActiveModel::ValidateConfirmationOfMatcher, type: :model do
+  include UnitTests::ConfirmationMatcherHelpers
+
+  context '#description' do
+    it 'states that the confirmation must match its base attribute' do
+      builder = builder_for_record_validating_confirmation
+      message = "require #{builder.confirmation_attribute} to match #{builder.attribute_to_confirm}"
+      matcher = described_class.new(builder.attribute_to_confirm)
+      expect(matcher.description).to eq(message)
+    end
+  end
+
+  context 'when the model has a confirmation validation' do
+    it 'passes' do
+      builder = builder_for_record_validating_confirmation
+      expect(builder.record).
+        to validate_confirmation_of(builder.attribute_to_confirm)
+    end
+
+    context 'when a nil message is specified' do
+      it 'ignores it' do
+        builder = builder_for_record_validating_confirmation
+        expect(builder.record).
+          to validate_confirmation_of(builder.attribute_to_confirm).
+          with_message(nil)
+      end
+    end
+  end
+
+  context 'when the model does not have a confirmation validation' do
+    it 'fails' do
+      model = define_model(:example, attribute_to_confirm: :string)
+      record = model.new
+      expect(record).not_to validate_confirmation_of(:attribute_to_confirm)
+    end
+  end
+
+  context 'when both validation and matcher specify a custom message' do
+    it 'passes when the expected and actual messages match' do
+      builder = builder_for_record_validating_confirmation(message: 'custom')
+      expect(builder.record).
+        to validate_confirmation_of(builder.attribute_to_confirm).
+        with_message(/custom/)
+    end
+
+    it 'fails when the expected and actual messages do not match' do
+      builder = builder_for_record_validating_confirmation(message: 'custom')
+      expect(builder.record).
+        not_to validate_confirmation_of(builder.attribute_to_confirm).
+        with_message(/wrong/)
+    end
+  end
+
+  context 'when the validation specifies a message via i18n' do
+    it 'passes' do
+      builder = builder_for_record_validating_confirmation_with_18n_message
+      expect(builder.record).
+        to validate_confirmation_of(builder.attribute_to_confirm)
+    end
+  end
+end

data/spec/{shoulda → unit/shoulda}/matchers/active_model/validate_exclusion_of_matcher_spec.rb

@@ -1,12 +1,13 @@
-require 'spec_helper'
+require 'unit_spec_helper'
 
-describe Shoulda::Matchers::ActiveModel do
+describe Shoulda::Matchers::ActiveModel, type: :model do
   describe '#ensure_exclusion_of' do
     it 'is aliased to #validate_exclusion_of' do
-      matchers.expects(:validate_exclusion_of).with(:attr)
+      allow(matchers).to receive(:validate_exclusion_of)
 
       silence_warnings do
         matchers.ensure_exclusion_of(:attr)
+        expect(matchers).to have_received(:validate_exclusion_of).with(:attr)
       end
     end
   end
@@ -16,7 +17,7 @@ describe Shoulda::Matchers::ActiveModel do
   end
 end
 
-describe Shoulda::Matchers::ActiveModel::ValidateExclusionOfMatcher do
+describe Shoulda::Matchers::ActiveModel::ValidateExclusionOfMatcher, type: :model do
   context 'an attribute which must be excluded from a range' do
     it 'accepts ensuring the correct range' do
       expect(validating_exclusion(in: 2..5)).

data/spec/{shoulda → unit/shoulda}/matchers/active_model/validate_inclusion_of_matcher_spec.rb

@@ -1,12 +1,13 @@
-require 'spec_helper'
+require 'unit_spec_helper'
 
-describe Shoulda::Matchers::ActiveModel do
+describe Shoulda::Matchers::ActiveModel, type: :model do
   describe '#ensure_inclusion_of' do
     it 'is aliased to #validate_inclusion_of' do
-      matchers.expects(:validate_inclusion_of).with(:attr)
+      allow(matchers).to receive(:validate_inclusion_of)
 
       silence_warnings do
         matchers.ensure_inclusion_of(:attr)
+        expect(matchers).to have_received(:validate_inclusion_of)
       end
     end
   end
@@ -16,7 +17,7 @@ describe Shoulda::Matchers::ActiveModel do
   end
 end
 
-describe Shoulda::Matchers::ActiveModel::ValidateInclusionOfMatcher do
+describe Shoulda::Matchers::ActiveModel::ValidateInclusionOfMatcher, type: :model do
   shared_context 'for a generic attribute' do
     def self.testing_values_of_option(option_name, &block)
       [nil, true, false].each do |option_value|
@@ -188,8 +189,6 @@ describe Shoulda::Matchers::ActiveModel::ValidateInclusionOfMatcher do
       end
 
       it 'does not match when validation uses the default message instead of given message' do
-        skip 'does not work'
-
         builder = build_object_allowing(valid_values)
 
         expect_not_to_match_on_values(builder, valid_values) do |matcher|
@@ -198,8 +197,6 @@ describe Shoulda::Matchers::ActiveModel::ValidateInclusionOfMatcher do
       end
 
       it 'does not match when validation uses a message but it is not same as given' do
-        skip 'does not work'
-
         builder = build_object_allowing(valid_values, message: 'a different message')
 
         expect_not_to_match_on_values(builder, valid_values) do |matcher|
@@ -218,8 +215,6 @@ describe Shoulda::Matchers::ActiveModel::ValidateInclusionOfMatcher do
       end
 
       it 'does not match when validation uses the default message instead of given message' do
-        skip 'does not work'
-
         builder = build_object_allowing(valid_values)
 
         expect_not_to_match_on_values(builder, valid_values) do |matcher|
@@ -228,8 +223,6 @@ describe Shoulda::Matchers::ActiveModel::ValidateInclusionOfMatcher do
       end
 
       it 'does not match when validation uses a message but it does not match regex' do
-        skip 'does not work'
-
         builder = build_object_allowing(valid_values, message: 'a different message')
 
         expect_not_to_match_on_values(builder, valid_values) do |matcher|
@@ -444,7 +437,7 @@ describe Shoulda::Matchers::ActiveModel::ValidateInclusionOfMatcher do
       it 'matches' do
         valid_values = [true, false]
         builder = build_object_allowing(valid_values)
-        capture(:stderr) do
+        silence_stderr do
           expect_to_match_in_array(builder, valid_values)
         end
       end
@@ -476,7 +469,7 @@ describe Shoulda::Matchers::ActiveModel::ValidateInclusionOfMatcher do
           it 'matches' do
             valid_values = [nil]
             builder = build_object_allowing(valid_values)
-            capture(:stderr) do
+            silence_stderr do
               expect_to_match_in_array(builder, valid_values)
             end
           end