shoulda-matchers 6.5.0 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28aa81eb37b239f9f7715725027b774736992c82c2f6905b0d244a35f9db080d
-  data.tar.gz: 2433121dc12d086b12c19f5313abcaf8c885cd03de594dd3bcaae0f9150c4173
+  metadata.gz: 63256c77182faa2d6d70c24f7f53d5cbb4c8f723ebea8ab062a912cea898d405
+  data.tar.gz: 1bc874eac2eb72cf6e73ff4a8f642deca0f911bb1a8939b7e6d4f257fc1fb3e6
 SHA512:
-  metadata.gz: c3dab42effbda8285e424feab81c543bb2e84d9764b513db8007a6b6bb0a2dd923fc76db8f253013dc701588dda5ca314fa3d7e2de9e15af84a8a84f9245670b
-  data.tar.gz: 6902d75fa7b45c3adc8c97917e9fc1c610be1e99a95bb860ba5112793cdb7653189e4f303f8c879842576a679e3975a520d8ff98dc160ad2168b3fa0b105ecf5
+  metadata.gz: 943c4db0909a15216ec5aa90cb01a04400cf000217f59dc70bfbfb9a4ac264466f757963ed66c79e1acc9174b4d42f445d9fac8f590d926a6699592f05108633
+  data.tar.gz: 914455300f3ae6ceccfec6ce50cac85f201643e4b1bca4cd152a2c8a6b2c45e161d7ba8b9fb9daf41ce90c9faeaee75bef5f03b985a3d38768cba5a8a040adf9

data/README.md

@@ -559,5 +559,4 @@ We are [available for hire][hire].
 [community]: https://thoughtbot.com/community?utm_source=github
 [hire]: https://thoughtbot.com/hire-us?utm_source=github
 
-
 <!-- END /templates/footer.md -->

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

@@ -125,7 +125,7 @@ module Shoulda
       # @return [RouteMatcher]
       #
       def route(method, path, port: nil)
-        RouteMatcher.new(self, method, path, port: port)
+        RouteMatcher.new(self, method, path, port:)
       end
 
       # @private
@@ -190,7 +190,7 @@ module Shoulda
         def route_recognized?
           context.send(
             :assert_routing,
-            { method: method, path: path },
+            { method:, path: },
             params,
           )
           true

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

@@ -27,7 +27,7 @@ module Shoulda
 
         def extract_params_from_string
           controller, action = args[0].split('#')
-          params = (args[1] || {}).merge!(controller: controller, action: action)
+          params = (args[1] || {}).merge!(controller:, action:)
           normalize_values(params)
         end
 

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

@@ -204,9 +204,9 @@ module Shoulda
           def attribute_changed_value_error
             AttributeChangedValueError.create(
               model: object.class,
-              attribute_name: attribute_name,
-              value_written: value_written,
-              value_read: value_read,
+              attribute_name:,
+              value_written:,
+              value_read:,
             )
           end
 
@@ -217,7 +217,7 @@ module Shoulda
           def attribute_does_not_exist_error
             AttributeDoesNotExistError.create(
               model: object.class,
-              attribute_name: attribute_name,
+              attribute_name:,
               value: value_written,
             )
           end

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

@@ -31,9 +31,9 @@ module Shoulda
             @_attribute_setter ||= AttributeSetter.new(
               matcher_name: :allow_value,
               object: instance,
-              attribute_name: attribute_name,
-              value: value,
-              ignore_interference_by_writer: ignore_interference_by_writer,
+              attribute_name:,
+              value:,
+              ignore_interference_by_writer:,
               after_set_callback: after_setting_value_callback,
             )
           end
@@ -46,9 +46,9 @@ module Shoulda
             @_validator ||= Validator.new(
               instance,
               attribute_to_check_message_against,
-              context: context,
+              context:,
               expects_strict: expects_strict?,
-              expected_message: expected_message,
+              expected_message:,
             )
           end
 

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

@@ -672,8 +672,8 @@ pass, or do something else entirely.
 
         def default_attribute_message_values
           defaults = {
-            model_name: model_name,
-            instance: instance,
+            model_name:,
+            instance:,
             attribute: attribute_to_check_message_against,
           }
 

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

@@ -7,7 +7,7 @@ module Shoulda
       # @private
       class NonNullableBooleanError < Shoulda::Matchers::Error
         def self.create(attribute)
-          super(attribute: attribute)
+          super(attribute:)
         end
 
         attr_accessor :attribute
@@ -24,7 +24,7 @@ Hence, this test will fail and there is no way to make it pass.
       # @private
       class CouldNotSetPasswordError < Shoulda::Matchers::Error
         def self.create(model)
-          super(model: model)
+          super(model:)
         end
 
         attr_accessor :model

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

@@ -73,7 +73,7 @@ module Shoulda
 
         def failure_message_when_negated
           MESSAGES[:should_not_have_secure_password] %
-            { subject: @subject.class, description: description }
+            { subject: @subject.class, description: }
         end
 
         protected

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

@@ -153,7 +153,7 @@ module Shoulda
           matcher.with_message(
             @expected_message,
             against: confirmation_attribute,
-            values: { attribute: attribute },
+            values: { attribute: },
           )
         end
       end

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

@@ -8,6 +8,7 @@ module Shoulda
         def initialize(attribute)
           super
           @attribute = attribute
+          @options = {}
           @expects_strict = false
           @subject = nil
           @last_submatcher_run = nil
@@ -106,8 +107,8 @@ module Shoulda
         def allow_value_matcher(value, message = nil, &block)
           build_allow_or_disallow_value_matcher(
             matcher_class: AllowValueMatcher,
-            value: value,
-            message: message,
+            value:,
+            message:,
             &block
           )
         end
@@ -115,8 +116,8 @@ module Shoulda
         def disallow_value_matcher(value, message = nil, &block)
           build_allow_or_disallow_value_matcher(
             matcher_class: DisallowValueMatcher,
-            value: value,
-            message: message,
+            value:,
+            message:,
             &block
           )
         end

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

@@ -105,8 +105,8 @@ module Shoulda
           validation_error_messages = record.errors[attribute]
 
           {
-            all_validation_errors: all_validation_errors,
-            validation_error_messages: validation_error_messages,
+            all_validation_errors:,
+            validation_error_messages:,
             validation_exception_message: nil,
           }
         rescue ::ActiveModel::StrictValidationFailed => e

data/lib/shoulda/matchers/active_record/have_attached_matcher.rb

@@ -20,6 +20,74 @@ module Shoulda
       #       should have_one_attached(:avatar)
       #     end
       #
+      # #### Qualifiers
+      #
+      # ##### service
+      #
+      # Use `service` to assert that the `:service` option was specified.
+      #
+      #     class User < ApplicationRecord
+      #       has_one_attached :avatar, service: :s3
+      #     end
+      #
+      #     # RSpec
+      #     RSpec.describe User, type: :model do
+      #       it { should have_one_attached(:avatar).service(:s3) }
+      #     end
+      #
+      #     # Minitest (Shoulda)
+      #     class UserTest < ActiveSupport::TestCase
+      #       should have_one_attached(:avatar).service(:s3)
+      #     end
+      #
+      # ##### dependent
+      #
+      # Use `dependent` to assert that the `:dependent` option was specified.
+      #
+      #     class User < ApplicationRecord
+      #       has_one_attached :avatar, dependent: :destroy
+      #     end
+      #
+      #     # RSpec
+      #     RSpec.describe User, type: :model do
+      #       it { should have_one_attached(:avatar).dependent(:destroy) }
+      #     end
+      #
+      #     # Minitest (Shoulda)
+      #     class UserTest < ActiveSupport::TestCase
+      #       should have_one_attached(:avatar).dependent(:destroy)
+      #     end
+      #
+      # ##### strict_loading
+      #
+      # Use `strict_loading` to assert that the `:strict_loading` option was specified.
+      #
+      #     class User < ApplicationRecord
+      #       has_one_attached :avatar, strict_loading: true
+      #     end
+      #
+      #     # RSpec
+      #     RSpec.describe User, type: :model do
+      #       it { should have_one_attached(:avatar).strict_loading(true) }
+      #     end
+      #
+      #     # Minitest (Shoulda)
+      #     class UserTest < ActiveSupport::TestCase
+      #       should have_one_attached(:avatar).strict_loading(true)
+      #     end
+      #
+      # Default value is true when no argument is specified:
+      #
+      #     # RSpec
+      #     RSpec.describe User, type: :model do
+      #       it { should have_one_attached(:avatar).strict_loading }
+      #     end
+      #
+      #     # Minitest (Shoulda)
+      #     class UserTest < ActiveSupport::TestCase
+      #       should have_one_attached(:avatar).strict_loading
+      #     end
+      #
       # @return [HaveAttachedMatcher]
       #
       def have_one_attached(name)
@@ -53,11 +121,12 @@ module Shoulda
 
       # @private
       class HaveAttachedMatcher
-        attr_reader :name
+        attr_reader :name, :options
 
         def initialize(macro, name)
           @macro = macro
           @name = name
+          @options = {}
         end
 
         def description
@@ -78,7 +147,7 @@ Did not expect #{expectation}, but it does.
         end
 
         def expectation
-          "#{model_class.name} to #{description}"
+          "#{model_class.name} to #{description}" + build_expectation_suffix
         end
 
         def matches?(subject)
@@ -87,13 +156,42 @@ Did not expect #{expectation}, but it does.
             writer_attribute_exists? &&
             attachments_association_exists? &&
             blobs_association_exists? &&
-            eager_loading_scope_exists?
+            eager_loading_scope_exists? &&
+            service_correct? &&
+            dependent_option_correct?
+        end
+
+        OPTION_METHODS = {
+          service: -> (value) { value },
+          strict_loading: -> (value = true) { value },
+          dependent: -> (value) { value },
+        }.freeze
+
+        OPTION_METHODS.each do |option_name, value_processor|
+          define_method(option_name) do |*args|
+            @options[option_name] = value_processor.call(*args)
+            self
+          end
         end
 
         private
 
         attr_reader :subject, :macro
 
+        def build_expectation_suffix
+          String.new.tap do |suffix|
+            suffix << " with service :#{options[:service]}" if options.key?(:service)
+
+            if options.key?(:strict_loading)
+              suffix << " with strict_loading option set to #{options[:strict_loading]}"
+            end
+
+            if options.key?(:dependent)
+              suffix << " with dependent option set to :#{options[:dependent]}"
+            end
+          end
+        end
+
         def reader_attribute_exists?
           if subject.respond_to?(name)
             true
@@ -127,7 +225,7 @@ Did not expect #{expectation}, but it does.
               :"has_#{macro}",
               attachments_association_name,
             ).
-              conditions(name: name).
+              conditions(name:).
               class_name('ActiveStorage::Attachment').
               inverse_of(:record)
         end
@@ -156,6 +254,7 @@ Did not expect #{expectation}, but it does.
             ).
               through(attachments_association_name).
               class_name('ActiveStorage::Blob').
+              strict_loading(options[:strict_loading]).
               source(:blob)
         end
 
@@ -179,6 +278,40 @@ Did not expect #{expectation}, but it does.
         def model_class
           subject.class
         end
+
+        def dependent_option_correct?
+          dependent = @options[:dependent]
+          return true if dependent.nil? || dependent_option == dependent
+
+          @failure = 'The dependent option for the association called ' \
+                      "#{attachments_association_name} is incorrect " \
+                      "(expected: :#{dependent}, " \
+                      "actual: :#{dependent_option})"
+          false
+        end
+
+        def service_correct?
+          service = @options[:service]
+          return true if service.nil? || service_name == service
+
+          @failure = 'The service for the association called ' \
+                      "#{attachments_association_name} is incorrect " \
+                      "(expected: :#{service}, " \
+                      "actual: :#{service_name})"
+          false
+        end
+
+        def attachment_reflection
+          model_class.attachment_reflections[name.to_s]
+        end
+
+        def service_name
+          attachment_reflection.options[:service_name]
+        end
+
+        def dependent_option
+          attachment_reflection.options[:dependent]
+        end
       end
     end
   end

data/lib/shoulda/matchers/active_record/have_rich_text_matcher.rb

@@ -71,7 +71,7 @@ module Shoulda
         def has_expected_action_text?
           defined?(ActionText::RichText) &&
             @subject.send(rich_text_attribute).
-              instance_of?(ActionText::RichText)
+              is_a?(ActionText::RichText)
         end
 
         def error_description

data/lib/shoulda/matchers/active_record/validate_uniqueness_of_matcher.rb

@@ -758,9 +758,9 @@ module Shoulda
             if case_sensitivity_strategy == :sensitive
               if value == swapcased_value
                 raise NonCaseSwappableValueError.create(
-                  model: model,
+                  model:,
                   attribute: @attribute,
-                  value: value,
+                  value:,
                 )
               end
 
@@ -785,9 +785,9 @@ module Shoulda
             else
               if value == swapcased_value
                 raise NonCaseSwappableValueError.create(
-                  model: model,
+                  model:,
                   attribute: @attribute,
-                  value: value,
+                  value:,
                 )
               end
 
@@ -966,9 +966,9 @@ module Shoulda
             new(
               matcher_name: :validate_uniqueness_of,
               object: record,
-              attribute_name: attribute_name,
-              value: value,
-              ignore_interference_by_writer: ignore_interference_by_writer,
+              attribute_name:,
+              value:,
+              ignore_interference_by_writer:,
             )
         end
 
@@ -1092,7 +1092,7 @@ different altogether.
             )
             description_for_attribute_setter(
               attribute_setter,
-              same_as_existing: same_as_existing,
+              same_as_existing:,
             )
           end
         end

data/lib/shoulda/matchers/doublespeak/double.rb

@@ -77,12 +77,12 @@ module Shoulda
 
           klass.__send__(:define_method, method_name) do |*args, &block|
             call = MethodCall.new(
-              double: double,
+              double:,
               object: self,
               method_name: _method_name,
-              args: args,
-              block: block,
-              caller: caller,
+              args:,
+              block:,
+              caller:,
             )
             implementation.call(call)
           end

data/lib/shoulda/matchers/doublespeak/method_call.rb

@@ -32,7 +32,7 @@ module Shoulda
         end
 
         def to_hash
-          { method_name: method_name, args: args }
+          { method_name:, args: }
         end
 
         def inspect

data/lib/shoulda/matchers/doublespeak/object_double.rb

@@ -24,9 +24,9 @@ module Shoulda
 
         def method_missing(method_name, *args, &block)
           call = MethodCall.new(
-            method_name: method_name,
-            args: args,
-            block: block,
+            method_name:,
+            args:,
+            block:,
             caller: ::Kernel.caller,
           )
           calls << call

data/lib/shoulda/matchers/independent/delegate_method_matcher.rb

@@ -446,8 +446,7 @@ module Shoulda
               rescue Module::DelegationError
                 false
               rescue NoMethodError => e
-                if e.message =~
-                   /undefined method `#{delegate_method}' for nil/
+                if e.message =~ /undefined method [`']#{delegate_method}[`'] for nil/
                   false
                 else
                   raise e
@@ -467,8 +466,7 @@ module Shoulda
               rescue Module::DelegationError
                 false
               rescue NoMethodError => e
-                if e.message =~
-                   /private method `#{delegating_method}' called for/
+                if e.message =~ /private method [`']#{delegating_method}[`'] called for/
                   true
                 else
                   raise e

data/lib/shoulda/matchers/integrations/configuration.rb

@@ -1,5 +1,3 @@
-require 'set'
-
 module Shoulda
   module Matchers
     module Integrations

data/lib/shoulda/matchers/rails_shim.rb

@@ -21,10 +21,6 @@ module Shoulda
           Gem::Version.new('0')
         end
 
-        def active_model_st_6_1?
-          Gem::Requirement.new('< 6.1').satisfied_by?(active_model_version)
-        end
-
         def active_model_lt_7?
           Gem::Requirement.new('< 7').satisfied_by?(active_model_version)
         end

data/lib/shoulda/matchers/routing.rb

@@ -3,7 +3,7 @@ module Shoulda
     # @private
     module Routing
       def route(method, path, port: nil)
-        ActionController::RouteMatcher.new(self, method, path, port: port)
+        ActionController::RouteMatcher.new(self, method, path, port:)
       end
     end
   end

data/lib/shoulda/matchers/util/word_wrap.rb

@@ -34,7 +34,7 @@ module Shoulda
 
       def wrapped_paragraphs
         paragraphs.map do |paragraph|
-          Paragraph.new(paragraph, indent: indent).wrap
+          Paragraph.new(paragraph, indent:).wrap
         end
       end
     end
@@ -100,11 +100,11 @@ module Shoulda
       end
 
       def wrap_lines(lines)
-        lines.map { |line| Line.new(line, indent: indent).wrap }
+        lines.map { |line| Line.new(line, indent:).wrap }
       end
 
       def wrap_generic_paragraph
-        Line.new(combine_paragraph_into_one_line, indent: indent).wrap
+        Line.new(combine_paragraph_into_one_line, indent:).wrap
       end
 
       def combine_paragraph_into_one_line
@@ -188,7 +188,7 @@ module Shoulda
           leftover = line[index + 1..]
         end
 
-        { fitted_line: fitted_line, leftover: leftover }
+        { fitted_line:, leftover: }
       end
 
       def determine_where_to_break_line(line, args)

data/lib/shoulda/matchers/version.rb

@@ -1,6 +1,6 @@
 module Shoulda
   module Matchers
     # @private
-    VERSION = '6.5.0'.freeze
+    VERSION = '7.0.1'.freeze
   end
 end

data/shoulda-matchers.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
     'shoulda-matchers.gemspec']
   s.require_paths = ['lib']
 
-  s.required_ruby_version = '>= 3.0.5'
-  s.add_dependency('activesupport', '>= 5.2.0')
+  s.required_ruby_version = '>= 3.2'
+  s.add_dependency 'activesupport', '>= 7.1'
+  s.add_development_dependency 'mutex_m'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoulda-matchers
 version: !ruby/object:Gem::Version
-  version: 6.5.0
+  version: 7.0.1
 platform: ruby
 authors:
 - Tammer Saleh
@@ -11,10 +11,9 @@ authors:
 - Matt Jankowski
 - Stafford Brunk
 - Elliot Winkler
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-25 00:00:00.000000000 Z
+date: 2025-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -22,14 +21,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: '7.1'
+- !ruby/object:Gem::Dependency
+  name: mutex_m
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 'Shoulda Matchers provides RSpec- and Minitest-compatible one-liners
   to test common Rails functionality that, if written by hand, would be much longer,
   more complex, and error-prone. '
@@ -183,7 +196,6 @@ metadata:
   documentation_uri: https://matchers.shoulda.io/docs
   homepage_uri: https://matchers.shoulda.io
   source_code_uri: https://github.com/thoughtbot/shoulda-matchers
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -191,15 +203,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.5
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Simple one-liner tests for common Rails functionality
 test_files: []