shoulda-matchers 6.0.0 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '00039d1c47436bb88b431784a2b956713382face294b6bbe5c7599378ce03a55'
-  data.tar.gz: 27640030d1ada19757e5da4d9c10465f422234f8dde9242a54bcb002585c71d5
+  metadata.gz: d549ac8f3629ad37bc56d0d09daf37416ec23d78374a8ed6a630ea23e5c9e487
+  data.tar.gz: f09bc94b6be181564cdde56729c2055192a4725adee4ba8b6b7f8e84429fe9a0
 SHA512:
-  metadata.gz: 51aff6ac4ab386f8df5dec81dfca4f197604d206263b29b711146820dda54ef5f9a9aa723aa6ce14084364eccdcbfbb8c3b1c38f2a4cdcbfc5d3ae8e8c965806
-  data.tar.gz: 476b055e38257cc8d6841a96779a012ef68cd01239c26c15b170c251a4f7655bab6344a7c163361e9ef283142994bc04ed69f8c6bbccf1bae3acfafc5fd62176
+  metadata.gz: 1f3ba08a6d15ad56cb583c0a8289e180854f5d89020b3182b2d6140289800d71bca467f187c9a4718ba26078cc2562f6377d77b00a0e84f2e683079d62ef60d3
+  data.tar.gz: 45d0141c79d9642439c9c03ffcd8e41d1aee993eafaea11fc72812456ead1dcf17d1698e9eb7f311c40945c54c77fc4e573a820ffa115fc344e9b0049ed69479

data/README.md

@@ -55,7 +55,7 @@ Start by including `shoulda-matchers` in your Gemfile:
 
 ```ruby
 group :test do
-  gem 'shoulda-matchers', '~> 5.0'
+  gem 'shoulda-matchers', '~> 6.0'
 end
 ```
 
@@ -117,7 +117,7 @@ Otherwise, add `shoulda-matchers` to your Gemfile:
 
 ```ruby
 group :test do
-  gem 'shoulda-matchers', '~> 5.0'
+  gem 'shoulda-matchers', '~> 6.0'
 end
 ```
 
@@ -385,8 +385,10 @@ about any of them, make sure to [consult the documentation][rubydocs]!
   tests your `belongs_to` associations.
 * **[define_enum_for](lib/shoulda/matchers/active_record/define_enum_for_matcher.rb)**
   tests usage of the `enum` macro.
-* **[have_and_belong_to_many](lib/shoulda/matchers/active_record/association_matcher.rb#L827)**
+* **[have_and_belong_to_many](lib/shoulda/matchers/active_record/association_matcher.rb)**
   tests your `has_and_belongs_to_many` associations.
+* **[have_delegated_type](lib/shoulda/matchers/active_record/association_matcher.rb#L687)**
+  tests usage of the `delegated_type` macro.
 * **[have_db_column](lib/shoulda/matchers/active_record/have_db_column_matcher.rb)**
   tests that the table that backs your model has a specific column.
 * **[have_db_index](lib/shoulda/matchers/active_record/have_db_index_matcher.rb)**
@@ -411,6 +413,8 @@ about any of them, make sure to [consult the documentation][rubydocs]!
   tests usage of `validates_uniqueness_of`.
 * **[normalize](lib/shoulda/matchers/active_record/normalize_matcher.rb)** tests
   usage of the `normalize` macro
+* **[encrypt](lib/shoulda/matchers/active_record/encrypt_matcher.rb)**
+  tests usage of the `encrypts` macro.
 
 ### ActionController matchers
 
@@ -513,16 +517,21 @@ redistributed under the terms specified in the [LICENSE](LICENSE) file.
 
 [thoughtbot-website]: https://thoughtbot.com
 
+<!-- START /templates/footer.md -->
 ## About thoughtbot
 
-![thoughtbot][thoughtbot-logo]
-
-[thoughtbot-logo]: https://thoughtbot.com/brand_assets/93:44.svg
+![thoughtbot](https://thoughtbot.com/thoughtbot-logo-for-readmes.svg)
 
+This repo is maintained and funded by thoughtbot, inc.
 The names and logos for thoughtbot are trademarks of thoughtbot, inc.
 
-We are passionate about open source software. See [our other
-projects][community]. We are [available for hire][hire].
+We love open source software!
+See [our other projects][community].
+
+We are [available for hire][hire].
 
 [community]: https://thoughtbot.com/community?utm_source=github
-[hire]: https://thoughtbot.com?utm_source=github
+[hire]: https://thoughtbot.com/hire-us?utm_source=github
+
+
+<!-- END /templates/footer.md -->

data/lib/shoulda/matchers/action_controller/permit_matcher.rb

@@ -276,16 +276,14 @@ module Shoulda
           :context, :subparameter_name, :parameters_double_registry
 
         def expectation
-          message = 'restrict parameters '
+          String.new('restrict parameters ').tap do |message|
+            if subparameter_name
+              message << "on #{subparameter_name.inspect} "
+            end
 
-          if subparameter_name
-            message << "on #{subparameter_name.inspect} "
+            message << 'to '\
+              "#{format_parameter_names(expected_permitted_parameter_names)}"
           end
-
-          message << 'to '\
-            "#{format_parameter_names(expected_permitted_parameter_names)}"
-
-          message
         end
 
         def reality

data/lib/shoulda/matchers/action_controller/set_session_or_flash_matcher.rb

@@ -83,25 +83,23 @@ module Shoulda
         end
 
         def expectation_description
-          string = 'set'
-
-          string <<
-            if key_set?
-              " #{store.name}[#{key.inspect}]"
-            else
-              " any key in #{store.name}"
-            end
-
-          if expected_value_set?
+          String.new('set').tap do |string|
             string <<
-              if expected_value.is_a?(Regexp)
-                " to a value matching #{expected_value.inspect}"
+              if key_set?
+                " #{store.name}[#{key.inspect}]"
               else
-                " to #{expected_value.inspect}"
+                " any key in #{store.name}"
               end
-          end
 
-          string
+            if expected_value_set?
+              string <<
+                if expected_value.is_a?(Regexp)
+                  " to a value matching #{expected_value.inspect}"
+                else
+                  " to #{expected_value.inspect}"
+                end
+            end
+          end
         end
       end
     end

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

@@ -169,6 +169,36 @@ module Shoulda
       #         on(:create)
       #     end
       #
+      # ##### against
+      #
+      # Use `against` if the validation is on an attribute
+      # other than the attribute being validated:
+      #
+      #     class UserProfile
+      #       include ActiveModel::Model
+      #       attr_accessor :website_url
+      #
+      #       alias_attribute :url, :website_url
+      #
+      #       validates_format_of :url, with: URI.regexp
+      #     end
+      #
+      #     # RSpec
+      #     RSpec.describe UserProfile, type: :model do
+      #       it do
+      #         should allow_value('https://foo.com').
+      #           for(:website_url).
+      #           against(:url)
+      #       end
+      #     end
+      #
+      #     # Minitest (Shoulda)
+      #     class UserProfileTest < ActiveSupport::TestCase
+      #       should allow_value('https://foo.com').
+      #         for(:website_url).
+      #         against(:url)
+      #     end
+      #
       # ##### with_message
       #
       # Use `with_message` if you are using a custom validation message.
@@ -349,6 +379,12 @@ module Shoulda
           self
         end
 
+        def against(attribute)
+          @attribute_to_check_message_against = attribute if attribute.present?
+
+          self
+        end
+
         def with_message(message, given_options = {})
           if message.present?
             @expects_custom_validation_message = true
@@ -550,7 +586,7 @@ module Shoulda
         end
 
         def default_failure_message_preface
-          ''.tap do |preface|
+          String.new.tap do |preface|
             if descriptions_for_preset_values.any?
               preface << 'After setting '
               preface << descriptions_for_preset_values.to_sentence

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

@@ -50,7 +50,7 @@ module Shoulda
           description = ''
 
           if expects_strict?
-            description << ' strictly'
+            description = ' strictly'
           end
 
           description +
@@ -78,11 +78,6 @@ module Shoulda
           comparison_submatchers.matches?(subject)
         end
 
-        def does_not_match?(subject)
-          @subject = subject
-          comparison_submatchers.does_not_match?(subject)
-        end
-
         def comparison_description
           "#{comparison_expectation} #{@value}"
         end

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

@@ -47,6 +47,8 @@ module Shoulda
           did_not_authenticate_correct_password: 'expected %{subject} to'\
             ' authenticate the correct %{attribute}',
           method_not_found: 'expected %{subject} to respond to %{methods}',
+          should_not_have_secure_password: 'expected %{subject} to'\
+            ' not %{description}!',
         }.freeze
 
         def initialize(attribute)
@@ -69,6 +71,11 @@ module Shoulda
           failure.nil?
         end
 
+        def failure_message_when_negated
+          MESSAGES[:should_not_have_secure_password] %
+            { subject: @subject.class, description: description }
+        end
+
         protected
 
         attr_reader :subject

data/lib/shoulda/matchers/active_model/numericality_matchers/submatchers.rb

@@ -13,11 +13,6 @@ module Shoulda
             failing_submatchers.empty?
           end
 
-          def does_not_match?(subject)
-            @subject = subject
-            non_failing_submatchers.empty?
-          end
-
           def failure_message
             failing_submatcher.failure_message
           end

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

@@ -143,12 +143,6 @@ module Shoulda
             @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)

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

@@ -13,12 +13,12 @@ module Shoulda
       #
       #     # RSpec
       #     RSpec.describe Person, type: :model do
-      #       it { should validate_comparison_of(:gpa).greater_than(10) }
+      #       it { should validate_comparison_of(:gpa).is_greater_than(10) }
       #     end
       #
       #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
-      #       should validate_comparison_of(:gpa).greater_than(10)
+      #       should validate_comparison_of(:gpa).is_greater_than(10)
       #     end
       #
       # #### Qualifiers
@@ -39,14 +39,14 @@ module Shoulda
       #     RSpec.describe Person, type: :model do
       #       it do
       #         should validate_comparison_of(:number_of_dependents).
-      #           greater_than(0).
+      #           is_greater_than(0).
       #           on(:create)
       #       end
       #     end
       #
       #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
-      #       should validate_comparison_of(:number_of_dependents).greater_than(0).on(:create)
+      #       should validate_comparison_of(:number_of_dependents).is_greater_than(0).on(:create)
       #     end
       #
       # ##### is_less_than
@@ -353,16 +353,14 @@ module Shoulda
         end
 
         def simple_description
-          description = ''
-
-          description << "validate that :#{attribute} looks like "
-          description << Shoulda::Matchers::Util.a_or_an(allowed_type_name)
+          String.new.tap do |description|
+            description << "validate that :#{attribute} looks like "
+            description << Shoulda::Matchers::Util.a_or_an(allowed_type_name)
 
-          if comparison_descriptions.present?
-            description << " #{comparison_descriptions}"
+            if comparison_descriptions.present?
+              description << " #{comparison_descriptions}"
+            end
           end
-
-          description
         end
 
         def failure_message
@@ -465,7 +463,7 @@ module Shoulda
         def first_submatcher_that_fails_to_not_match
           @_first_submatcher_that_fails_to_not_match ||=
             @submatchers.detect do |submatcher|
-              !submatcher.does_not_match?(subject)
+              submatcher.matches?(subject)
             end
         end
 

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

@@ -309,8 +309,8 @@ EOT
 
         def in_range(range)
           @range = range
-          @minimum = range.first
-          @maximum = range.max
+          @minimum = minimum_range_value
+          @maximum = maximum_range_value
           self
         end
 
@@ -400,6 +400,18 @@ EOT
 
         private
 
+        def minimum_range_value
+          @range.begin
+        end
+
+        def maximum_range_value
+          if @range.exclude_end?
+            @range.end ? (@range.end - 1) : nil
+          else
+            @range.end
+          end
+        end
+
         def matches_for_range?
           disallows_lower_value &&
             allows_minimum_value &&
@@ -441,27 +453,27 @@ EOT
         end
 
         def allows_minimum_value
-          allows_value_of(@minimum, @low_message)
+          @minimum.nil? || allows_value_of(@minimum, @low_message)
         end
 
         def disallows_minimum_value
-          disallows_value_of(@minimum, @low_message)
+          @minimum.nil? || disallows_value_of(@minimum, @low_message)
         end
 
         def allows_maximum_value
-          allows_value_of(@maximum, @high_message)
+          @maximum.nil? || allows_value_of(@maximum, @high_message)
         end
 
         def disallows_maximum_value
-          disallows_value_of(@maximum, @high_message)
+          @maximum.nil? || disallows_value_of(@maximum, @high_message)
         end
 
         def allows_higher_value
-          allows_value_of(@maximum + 1, @high_message)
+          @maximum.nil? || allows_value_of(@maximum + 1, @high_message)
         end
 
         def disallows_higher_value
-          disallows_value_of(@maximum + 1, @high_message)
+          @maximum.nil? || disallows_value_of(@maximum + 1, @high_message)
         end
 
         def allows_all_values_in_array?

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

@@ -453,20 +453,18 @@ module Shoulda
         end
 
         def simple_description
-          description = ''
+          String.new.tap do |description|
+            description << "validate that :#{attribute} looks like "
+            description << Shoulda::Matchers::Util.a_or_an(full_allowed_type)
 
-          description << "validate that :#{attribute} looks like "
-          description << Shoulda::Matchers::Util.a_or_an(full_allowed_type)
-
-          if range_description.present?
-            description << " #{range_description}"
-          end
+            if range_description.present?
+              description << " #{range_description}"
+            end
 
-          if comparison_descriptions.present?
-            description << " #{comparison_descriptions}"
+            if comparison_descriptions.present?
+              description << " #{comparison_descriptions}"
+            end
           end
-
-          description
         end
 
         def failure_message

data/lib/shoulda/matchers/active_model/validation_matcher/build_description.rb

@@ -42,13 +42,12 @@ module Shoulda
             description_clauses = []
 
             if matcher.try(:expects_strict?)
-              description_clauses << 'raising a validation exception'
-
-              if matcher.try(:expects_custom_validation_message?)
-                description_clauses.last << ' with a custom message'
-              end
-
-              description_clauses.last << ' on failure'
+              description_clauses <<
+                if matcher.try(:expects_custom_validation_message?)
+                  'raising a validation exception with a custom message on failure'
+                else
+                  'raising a validation exception on failure'
+                end
             elsif matcher.try(:expects_custom_validation_message?)
               description_clauses <<
                 'producing a custom validation error on failure'