shoulda-matchers 3.1.0 → 5.2.0

data/lib/shoulda/matchers/active_model/validate_absence_of_matcher.rb

@@ -12,7 +12,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe PowerHungryCountry do
+      #     RSpec.describe PowerHungryCountry, type: :model do
       #       it { should validate_absence_of(:nuclear_weapons) }
       #     end
       #
@@ -35,7 +35,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe PowerHungryCountry do
+      #     RSpec.describe PowerHungryCountry, type: :model do
       #       it { should validate_absence_of(:nuclear_weapons).on(:create) }
       #     end
       #
@@ -57,7 +57,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe PowerHungryCountry do
+      #     RSpec.describe PowerHungryCountry, type: :model do
       #       it do
       #         should validate_absence_of(:nuclear_weapons).
       #           with_message("there shall be peace on Earth")
@@ -88,6 +88,11 @@ module Shoulda
           disallows_value_of(value, @expected_message)
         end
 
+        def does_not_match?(subject)
+          super(subject)
+          allows_value_of(value, @expected_message)
+        end
+
         def simple_description
           "validate that :#{@attribute} is empty/falsy"
         end
@@ -98,15 +103,19 @@ module Shoulda
           if reflection
             obj = reflection.klass.new
             if collection?
-              [ obj ]
+              [obj]
             else
               obj
             end
+          elsif array_column?
+            ['an arbitary value']
+          elsif enum_column?
+            enum_values.first
           else
             case column_type
             when :integer, :float then 1
-            when :decimal then BigDecimal.new(1, 0)
-            when :datetime, :time, :timestamp then Time.now
+            when :decimal then BigDecimal(1, 0)
+            when :datetime, :time, :timestamp then Time.current
             when :date then Date.new
             when :binary then '0'
             else 'an arbitrary value'
@@ -132,6 +141,21 @@ module Shoulda
           @subject.class.respond_to?(:reflect_on_association) &&
             @subject.class.reflect_on_association(@attribute)
         end
+
+        def array_column?
+          @subject.class.respond_to?(:columns_hash) &&
+            @subject.class.columns_hash[@attribute.to_s].respond_to?(:array) &&
+            @subject.class.columns_hash[@attribute.to_s].array
+        end
+
+        def enum_column?
+          @subject.class.respond_to?(:defined_enums) &&
+            @subject.class.defined_enums.key?(@attribute.to_s)
+        end
+
+        def enum_values
+          @subject.class.defined_enums[@attribute.to_s].values
+        end
       end
     end
   end

data/lib/shoulda/matchers/active_model/validate_acceptance_of_matcher.rb

@@ -12,7 +12,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe Registration do
+      #     RSpec.describe Registration, type: :model do
       #       it { should validate_acceptance_of(:eula) }
       #     end
       #
@@ -35,7 +35,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe Registration do
+      #     RSpec.describe Registration, type: :model do
       #       it do
       #         should validate_acceptance_of(:terms_of_service).
       #           on(:create)
@@ -60,7 +60,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe Registration do
+      #     RSpec.describe Registration, type: :model do
       #       it do
       #         should validate_acceptance_of(:terms_of_service).
       #           with_message('You must accept the terms of service')
@@ -91,6 +91,11 @@ module Shoulda
           disallows_value_of(false, @expected_message)
         end
 
+        def does_not_match?(subject)
+          super(subject)
+          allows_value_of(false, @expected_message)
+        end
+
         def simple_description
           %(validate that :#{@attribute} has been set to "1")
         end

data/lib/shoulda/matchers/active_model/validate_confirmation_of_matcher.rb

@@ -12,7 +12,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe User do
+      #     RSpec.describe User, type: :model do
       #       it { should validate_confirmation_of(:email) }
       #     end
       #
@@ -35,7 +35,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe User do
+      #     RSpec.describe User, type: :model do
       #       it { should validate_confirmation_of(:password).on(:create) }
       #     end
       #
@@ -57,7 +57,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe User do
+      #     RSpec.describe User, type: :model do
       #       it do
       #         should validate_confirmation_of(:password).
       #           with_message('Please re-enter your password')
@@ -100,8 +100,22 @@ module Shoulda
             allows_missing_confirmation
         end
 
+        def does_not_match?(subject)
+          super(subject)
+
+          allows_different_value ||
+            disallows_same_value ||
+            disallows_missing_confirmation
+        end
+
         private
 
+        def allows_different_value
+          allows_value_of('different value') do |matcher|
+            qualify_matcher(matcher, 'some value')
+          end
+        end
+
         def disallows_different_value
           disallows_value_of('different value') do |matcher|
             qualify_matcher(matcher, 'some value')
@@ -114,31 +128,32 @@ module Shoulda
           end
         end
 
+        def disallows_same_value
+          disallows_value_of('same value') do |matcher|
+            qualify_matcher(matcher, 'same value')
+          end
+        end
+
         def allows_missing_confirmation
           allows_value_of('any value') do |matcher|
             qualify_matcher(matcher, nil)
           end
         end
 
+        def disallows_missing_confirmation
+          disallows_value_of('any value') do |matcher|
+            qualify_matcher(matcher, nil)
+          end
+        end
+
         def qualify_matcher(matcher, confirmation_attribute_value)
           matcher.values_to_preset = {
-            confirmation_attribute => confirmation_attribute_value
+            confirmation_attribute => confirmation_attribute_value,
           }
           matcher.with_message(
             @expected_message,
             against: confirmation_attribute,
-            values: { attribute: attribute }
-          )
-        end
-
-        def set_confirmation(value)
-          @last_value_set_on_confirmation_attribute = value
-
-          AttributeSetter.set(
-            matcher_name: 'confirmation',
-            object: @subject,
-            attribute_name: confirmation_attribute,
-            value: value
+            values: { attribute: attribute },
           )
         end
       end

data/lib/shoulda/matchers/active_model/validate_exclusion_of_matcher.rb

@@ -16,7 +16,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe Game do
+      #     RSpec.describe Game, type: :model do
       #       it do
       #         should validate_exclusion_of(:supported_os).
       #           in_array(['Mac', 'Linux'])
@@ -35,11 +35,11 @@ module Shoulda
       #       include ActiveModel::Model
       #       attr_accessor :supported_os
       #
-      #       validates_exclusion_of :supported_os, in: ['Mac', 'Linux']
+      #       validates_exclusion_of :supported_os, in: 5..8
       #     end
       #
       #     # RSpec
-      #     describe Game do
+      #     RSpec.describe Game, type: :model do
       #       it do
       #         should validate_exclusion_of(:floors_with_enemies).
       #           in_range(5..8)
@@ -68,7 +68,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe Game do
+      #     RSpec.describe Game, type: :model do
       #       it do
       #         should validate_exclusion_of(:weapon).
       #           in_array(['pistol', 'paintball gun', 'stick']).
@@ -97,7 +97,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe Game do
+      #     RSpec.describe Game, type: :model do
       #       it do
       #         should validate_exclusion_of(:weapon).
       #           in_array(['pistol', 'paintball gun', 'stick']).
@@ -146,11 +146,12 @@ module Shoulda
           else
             description = "validate that :#{@attribute}"
 
-            if @array.many?
-              description << " is neither #{inspected_array}"
-            else
-              description << " is not #{inspected_array}"
-            end
+            description <<
+              if @array.many?
+                " is neither #{inspected_array}"
+              else
+                " is not #{inspected_array}"
+              end
 
             description
           end
@@ -162,15 +163,34 @@ module Shoulda
           if @range
             allows_lower_value &&
               disallows_minimum_value &&
-              allows_higher_value &&
-              disallows_maximum_value
+              disallows_maximum_value &&
+              allows_higher_value
           elsif @array
             disallows_all_values_in_array?
           end
         end
 
+        def does_not_match?(subject)
+          super(subject)
+
+          if @range
+            disallows_lower_value ||
+              allows_minimum_value ||
+              allows_maximum_value ||
+              disallows_higher_value
+          elsif @array
+            allows_any_values_in_array?
+          end
+        end
+
         private
 
+        def allows_any_values_in_array?
+          @array.any? do |value|
+            allows_value_of(value, @expected_message)
+          end
+        end
+
         def disallows_all_values_in_array?
           @array.all? do |value|
             disallows_value_of(value, @expected_message)
@@ -181,18 +201,34 @@ module Shoulda
           @minimum == 0 || allows_value_of(@minimum - 1, @expected_message)
         end
 
-        def allows_higher_value
-          allows_value_of(@maximum + 1, @expected_message)
+        def disallows_lower_value
+          @minimum != 0 && disallows_value_of(@minimum - 1, @expected_message)
+        end
+
+        def allows_minimum_value
+          allows_value_of(@minimum, @expected_message)
         end
 
         def disallows_minimum_value
           disallows_value_of(@minimum, @expected_message)
         end
 
+        def allows_maximum_value
+          allows_value_of(@maximum, @expected_message)
+        end
+
         def disallows_maximum_value
           disallows_value_of(@maximum, @expected_message)
         end
 
+        def allows_higher_value
+          allows_value_of(@maximum + 1, @expected_message)
+        end
+
+        def disallows_higher_value
+          disallows_value_of(@maximum + 1, @expected_message)
+        end
+
         def inspect_message
           if @range
             @range.inspect
@@ -203,8 +239,8 @@ module Shoulda
 
         def inspected_array
           Shoulda::Matchers::Util.inspect_values(@array).to_sentence(
-            two_words_connector: " nor ",
-            last_word_connector: ", nor "
+            two_words_connector: ' nor ',
+            last_word_connector: ', nor ',
           )
         end
       end