shoulda-matchers 4.4.0 → 5.0.0

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

@@ -75,14 +75,12 @@ module Shoulda
         private
 
         def redirects_to_url?
-          begin
-            @context.__send__(:assert_redirected_to, url)
-            @failure_message_when_negated = "Didn't expect to redirect to #{url}"
-            true
-          rescue Shoulda::Matchers.assertion_exception_class => error
-            @failure_message = error.message
-            false
-          end
+          @context.__send__(:assert_redirected_to, url)
+          @failure_message_when_negated = "Didn't expect to redirect to #{url}"
+          true
+        rescue Shoulda::Matchers.assertion_exception_class => e
+          @failure_message = e.message
+          false
         end
 
         def url

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

@@ -71,14 +71,12 @@ module Shoulda
         private
 
         def renders_template?
-          begin
-            @context.__send__(:assert_template, @options, @message)
-            @failure_message_when_negated = "Didn't expect to render #{@template}"
-            true
-          rescue Shoulda::Matchers.assertion_exception_class => error
-            @failure_message = error.message
-            false
-          end
+          @context.__send__(:assert_template, @options, @message)
+          @failure_message_when_negated = "Didn't expect to render #{@template}"
+          true
+        rescue Shoulda::Matchers.assertion_exception_class => e
+          @failure_message = e.message
+          false
         end
       end
     end

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

@@ -64,12 +64,12 @@ module Shoulda
       # @private
       class RenderWithLayoutMatcher
         def initialize(expected_layout)
-          if expected_layout
-            @expected_layout = expected_layout.to_s
-          else
-            @expected_layout = nil
-          end
-
+          @expected_layout =
+            if expected_layout
+              expected_layout.to_s
+            else
+              nil
+            end
           @controller = nil
         end
 
@@ -95,11 +95,12 @@ module Shoulda
 
         def description
           description = 'render with '
-          if @expected_layout.nil?
-            description << 'a layout'
-          else
-            description << "the #{@expected_layout.inspect} layout"
-          end
+          description <<
+            if @expected_layout.nil?
+              'a layout'
+            else
+              "the #{@expected_layout.inspect} layout"
+            end
           description
         end
 
@@ -118,7 +119,9 @@ module Shoulda
         end
 
         def rendered_layouts
-          recorded_layouts.keys.compact.map { |layout| layout.sub(%r{^layouts/}, '') }
+          recorded_layouts.keys.compact.map { |layout|
+            layout.sub(%r{^layouts/}, '')
+          }
         end
 
         def recorded_layouts
@@ -135,7 +138,7 @@ module Shoulda
 
         def result
           if rendered_with_layout?
-            'rendered with ' + rendered_layouts.map(&:inspect).join(', ')
+            "rendered with #{rendered_layouts.map(&:inspect).join(', ')}"
           else
             'rendered without a layout'
           end

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

@@ -79,7 +79,8 @@ module Shoulda
           end
 
           unless handler_exists?
-            expectation << " but #{controller} does not respond to #{expected_method}"
+            expectation << " but #{controller} does not respond to"\
+              " #{expected_method}"
           end
           expectation
         end

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

@@ -177,13 +177,12 @@ module Shoulda
 
         def add_port_to_path(path, port)
           if port
-            "http://example.com:#{port}" + path
+            "https://example.com:#{port}" + path
           else
             path
           end
         end
 
-
         def guess_controller_if_necessary(controller)
           params[:controller] ||= controller.controller_path
         end
@@ -195,11 +194,11 @@ module Shoulda
             params,
           )
           true
-        rescue ::ActionController::RoutingError => error
-          @failure_message = error.message
+        rescue ::ActionController::RoutingError => e
+          @failure_message = e.message
           false
-        rescue Shoulda::Matchers.assertion_exception_class => error
-          @failure_message = error.message
+        rescue Shoulda::Matchers.assertion_exception_class => e
+          @failure_message = e.message
           false
         end
       end

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

@@ -3,7 +3,7 @@ module Shoulda
     module ActionController
       # @private
       class RouteParams
-        PARAMS_TO_SYMBOLIZE = %i{ format }
+        PARAMS_TO_SYMBOLIZE = %i{format}.freeze
 
         def initialize(args)
           @args = args

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

@@ -20,7 +20,9 @@ module Shoulda
         def to(expected_value = nil, &block)
           if block
             unless context_set?
-              message = "When specifying a value as a block, a context must be specified beforehand, e.g., #{store.name}.in_context(context).to { ... }"
+              message = 'When specifying a value as a block, a context must be'\
+                ' specified beforehand,'\
+                " e.g., #{store.name}.in_context(context).to { ... }"
               raise ArgumentError, message
             end
 
@@ -42,12 +44,14 @@ module Shoulda
         end
 
         def failure_message
-          "Expected #{controller.class} to #{expectation_description}, but it did not"
+          "Expected #{controller.class} to #{expectation_description},"\
+          ' but it did not'
         end
         alias_method :failure_message_for_should, :failure_message
 
         def failure_message_when_negated
-          "Expected #{controller.class} not to #{expectation_description}, but it did"
+          "Expected #{controller.class} not to #{expectation_description},"\
+          ' but it did'
         end
         alias_method :failure_message_for_should_not,
           :failure_message_when_negated
@@ -81,18 +85,20 @@ module Shoulda
         def expectation_description
           string = 'set'
 
-          if key_set?
-            string << " #{store.name}[#{key.inspect}]"
-          else
-            string << " any key in #{store.name}"
-          end
-
-          if expected_value_set?
-            if expected_value.is_a?(Regexp)
-              string << " to a value matching #{expected_value.inspect}"
+          string <<
+            if key_set?
+              " #{store.name}[#{key.inspect}]"
             else
-              string << " to #{expected_value.inspect}"
+              " any key in #{store.name}"
             end
+
+          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
 
           string

data/lib/shoulda/matchers/active_model.rb

@@ -1,9 +1,33 @@
-require 'shoulda/matchers/active_model/allow_mass_assignment_of_matcher'
 require 'shoulda/matchers/active_model/helpers'
 require 'shoulda/matchers/active_model/qualifiers'
 require 'shoulda/matchers/active_model/validation_matcher'
+require 'shoulda/matchers/active_model/validation_matcher/build_description'
+require 'shoulda/matchers/active_model/validator'
+require 'shoulda/matchers/active_model/allow_value_matcher'
+require 'shoulda/matchers/active_model/allow_value_matcher/attribute_changed_value_error'
+require 'shoulda/matchers/active_model/allow_value_matcher/attribute_does_not_exist_error'
+require 'shoulda/matchers/active_model/allow_value_matcher/attribute_setter'
+require 'shoulda/matchers/active_model/allow_value_matcher/attribute_setter_and_validator'
+require 'shoulda/matchers/active_model/allow_value_matcher/attribute_setters'
+require 'shoulda/matchers/active_model/allow_value_matcher/attribute_setters_and_validators'
+require 'shoulda/matchers/active_model/allow_value_matcher/successful_check'
+require 'shoulda/matchers/active_model/allow_value_matcher/successful_setting'
+require 'shoulda/matchers/active_model/disallow_value_matcher'
+require 'shoulda/matchers/active_model/validate_length_of_matcher'
+require 'shoulda/matchers/active_model/validate_inclusion_of_matcher'
+require 'shoulda/matchers/active_model/validate_exclusion_of_matcher'
 require 'shoulda/matchers/active_model/validate_absence_of_matcher'
 require 'shoulda/matchers/active_model/validate_presence_of_matcher'
+require 'shoulda/matchers/active_model/validate_acceptance_of_matcher'
+require 'shoulda/matchers/active_model/validate_confirmation_of_matcher'
+require 'shoulda/matchers/active_model/validate_numericality_of_matcher'
+require 'shoulda/matchers/active_model/numericality_matchers/numeric_type_matcher'
+require 'shoulda/matchers/active_model/numericality_matchers/comparison_matcher'
+require 'shoulda/matchers/active_model/numericality_matchers/odd_number_matcher'
+require 'shoulda/matchers/active_model/numericality_matchers/even_number_matcher'
+require 'shoulda/matchers/active_model/numericality_matchers/only_integer_matcher'
+require 'shoulda/matchers/active_model/errors'
+require 'shoulda/matchers/active_model/have_secure_password_matcher'
 
 module Shoulda
   module Matchers
@@ -64,20 +88,6 @@ module Shoulda
     #     end
     #
     module ActiveModel
-      autoload :AllowValueMatcher, 'shoulda/matchers/active_model/allow_value_matcher'
-      autoload :CouldNotDetermineValueOutsideOfArray, 'shoulda/matchers/active_model/errors'
-      autoload :CouldNotSetPasswordError, 'shoulda/matchers/active_model/errors'
-      autoload :DisallowValueMatcher, 'shoulda/matchers/active_model/disallow_value_matcher'
-      autoload :HaveSecurePasswordMatcher, 'shoulda/matchers/active_model/have_secure_password_matcher'
-      autoload :NonNullableBooleanError, 'shoulda/matchers/active_model/errors'
-      autoload :NumericalityMatchers, 'shoulda/matchers/active_model/numericality_matchers'
-      autoload :ValidateAcceptanceOfMatcher, 'shoulda/matchers/active_model/validate_acceptance_of_matcher'
-      autoload :ValidateConfirmationOfMatcher, 'shoulda/matchers/active_model/validate_confirmation_of_matcher'
-      autoload :ValidateExclusionOfMatcher, 'shoulda/matchers/active_model/validate_exclusion_of_matcher'
-      autoload :ValidateInclusionOfMatcher, 'shoulda/matchers/active_model/validate_inclusion_of_matcher'
-      autoload :ValidateLengthOfMatcher, 'shoulda/matchers/active_model/validate_length_of_matcher'
-      autoload :ValidateNumericalityOfMatcher, 'shoulda/matchers/active_model/validate_numericality_of_matcher'
-      autoload :Validator, 'shoulda/matchers/active_model/validator'
     end
   end
 end

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

@@ -18,14 +18,14 @@ module Shoulda
       #
       #     # RSpec
       #     RSpec.describe UserProfile, type: :model do
-      #       it { should allow_value('http://foo.com').for(:website_url) }
-      #       it { should allow_value('http://bar.com').for(:website_url) }
+      #       it { should allow_value('https://foo.com').for(:website_url) }
+      #       it { should allow_value('https://bar.com').for(:website_url) }
       #     end
       #
       #     # Minitest (Shoulda)
       #     class UserProfileTest < ActiveSupport::TestCase
-      #       should allow_value('http://foo.com').for(:website_url)
-      #       should allow_value('http://bar.com').for(:website_url)
+      #       should allow_value('https://foo.com').for(:website_url)
+      #       should allow_value('https://bar.com').for(:website_url)
       #     end
       #
       # You can also test multiple values in one go, if you like. In the
@@ -36,7 +36,7 @@ module Shoulda
       #     # RSpec
       #     RSpec.describe UserProfile, type: :model do
       #       it do
-      #         should allow_values('http://foo.com', 'http://bar.com').
+      #         should allow_values('https://foo.com', 'https://bar.com').
       #           for(:website_url)
       #       end
       #
@@ -48,7 +48,7 @@ module Shoulda
       #
       #     # Minitest (Shoulda)
       #     class UserProfileTest < ActiveSupport::TestCase
-      #       should allow_values('http://foo.com', 'http://bar.com/baz').
+      #       should allow_values('https://foo.com', 'https://bar.com/baz').
       #         for(:website_url)
       #
       #       should_not allow_values('foo', 'buz').
@@ -305,15 +305,6 @@ module Shoulda
 
       # @private
       class AllowValueMatcher
-        autoload :AttributeChangedValueError, 'shoulda/matchers/active_model/allow_value_matcher/attribute_changed_value_error'
-        autoload :AttributeDoesNotExistError, 'shoulda/matchers/active_model/allow_value_matcher/attribute_does_not_exist_error'
-        autoload :AttributeSetter,  'shoulda/matchers/active_model/allow_value_matcher/attribute_setter'
-        autoload :AttributeSetterAndValidator, 'shoulda/matchers/active_model/allow_value_matcher/attribute_setter_and_validator'
-        autoload :AttributeSetters, 'shoulda/matchers/active_model/allow_value_matcher/attribute_setters'
-        autoload :AttributeSettersAndValidators, 'shoulda/matchers/active_model/allow_value_matcher/attribute_setters_and_validators'
-        autoload :SuccessfulCheck, 'shoulda/matchers/active_model/allow_value_matcher/successful_check'
-        autoload :SuccessfulSetting, 'shoulda/matchers/active_model/allow_value_matcher/successful_setting'
-
         include Helpers
         include Qualifiers::IgnoringInterferenceByWriter
 
@@ -322,7 +313,7 @@ module Shoulda
           :attribute_to_check_message_against,
           :attribute_to_set,
           :context,
-          :instance
+          :instance,
         )
 
         attr_writer(
@@ -432,55 +423,56 @@ module Shoulda
           end
 
           if include_attribute_changed_value_message?
-            message << "\n\n" + attribute_changed_value_message.call
+            message << "\n\n#{attribute_changed_value_message.call}"
           end
 
           Shoulda::Matchers.word_wrap(message)
         end
 
-        def failure_message_when_negated
+        def failure_message_when_negated # rubocop:disable Metrics/MethodLength
           attribute_setter = result.attribute_setter
 
           if attribute_setter.unsuccessfully_checked?
             message = attribute_setter.failure_message
           else
             validator = result.validator
-            message = failure_message_preface.call + ' invalid'
+            message = "#{failure_message_preface.call} invalid"
 
             if validator.type_of_message_matched?
               if validator.has_messages?
                 message << ' and to'
 
-                if validator.captured_validation_exception?
+                if validator.captured_validation_exception? # rubocop:disable Metrics/BlockNesting
                   message << ' raise a validation exception with message'
                 else
                   message << ' produce'
 
-                  if expected_message.is_a?(Regexp)
-                    message << ' a'
-                  else
-                    message << ' the'
-                  end
+                  message <<
+                    if expected_message.is_a?(Regexp) # rubocop:disable Metrics/BlockNesting
+                      ' a'
+                    else
+                      ' the'
+                    end
 
                   message << ' validation error'
                 end
 
-                if expected_message.is_a?(Regexp)
+                if expected_message.is_a?(Regexp) # rubocop:disable Metrics/BlockNesting
                   message << ' matching '
                   message << Shoulda::Matchers::Util.inspect_value(
-                    expected_message
+                    expected_message,
                   )
                 else
                   message << " #{expected_message.inspect}"
                 end
 
-                unless validator.captured_validation_exception?
+                unless validator.captured_validation_exception? # rubocop:disable Metrics/BlockNesting
                   message << " on :#{attribute_to_check_message_against}"
                 end
 
                 message << '. The record was indeed invalid, but'
 
-                if validator.captured_validation_exception?
+                if validator.captured_validation_exception? # rubocop:disable Metrics/BlockNesting
                   message << ' the exception message was '
                   message << validator.validation_exception_message.inspect
                   message << ' instead.'
@@ -501,7 +493,7 @@ module Shoulda
           end
 
           if include_attribute_changed_value_message?
-            message << "\n\n" + attribute_changed_value_message.call
+            message << "\n\n#{attribute_changed_value_message.call}"
           end
 
           Shoulda::Matchers.word_wrap(message)
@@ -540,7 +532,8 @@ module Shoulda
 
         def run(strategy)
           attribute_setters_for_values_to_preset.first_failing ||
-            attribute_setters_and_validators_for_values_to_set.public_send(strategy)
+            attribute_setters_and_validators_for_values_to_set.
+              public_send(strategy)
         end
 
         def failure_message_preface
@@ -606,14 +599,14 @@ pass, or do something else entirely.
           @_attribute_setters_and_validators_for_values_to_set ||=
             AttributeSettersAndValidators.new(
               self,
-              values_to_set.map { |value| [attribute_to_set, value] }
+              values_to_set.map { |value| [attribute_to_set, value] },
             )
         end
 
         def inspected_values_to_set
           Shoulda::Matchers::Util.inspect_values(values_to_set).to_sentence(
-            two_words_connector: " or ",
-            last_word_connector: ", or "
+            two_words_connector: ' or ',
+            last_word_connector: ', or ',
           )
         end
 
@@ -628,7 +621,7 @@ pass, or do something else entirely.
         def default_attribute_message
           default_error_message(
             options[:expected_message],
-            default_attribute_message_values
+            default_attribute_message_values,
           )
         end
 
@@ -648,7 +641,7 @@ pass, or do something else entirely.
 
         def human_attribute_name
           instance.class.human_attribute_name(
-            attribute_to_check_message_against
+            attribute_to_check_message_against,
           )
         end
       end