shoulda-matchers 4.3.0 → 5.0.0.rc1

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

@@ -31,12 +31,13 @@ module Shoulda
           @key = key
         end
 
-        def matches?(controller)
+        def matches?(_controller)
           filters_key?
         end
 
         def failure_message
-          "Expected #{@key} to be filtered; filtered keys: #{filtered_keys.join(', ')}"
+          "Expected #{@key} to be filtered; filtered keys:"\
+            " #{filtered_keys.join(', ')}"
         end
 
         def failure_message_when_negated

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

@@ -1,3 +1,4 @@
+require 'active_support/core_ext/module/delegation'
 module Shoulda
   module Matchers
     module ActionController
@@ -34,10 +35,7 @@ module Shoulda
             expected_value === actual_value
           end
         end
-
-        def empty?
-          flash.empty?
-        end
+        delegate :empty?, to: :flash
 
         def use_now!
           @use_now = true

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

@@ -209,7 +209,8 @@ module Shoulda
         attr_writer :stubbed_params
 
         def initialize(expected_permitted_parameter_names)
-          @expected_permitted_parameter_names = expected_permitted_parameter_names
+          @expected_permitted_parameter_names =
+            expected_permitted_parameter_names
           @action = nil
           @verb = nil
           @request_params = {}
@@ -250,30 +251,29 @@ module Shoulda
           parameters_double_registry.register
 
           Doublespeak.with_doubles_activated do
-            Shoulda::Matchers::RailsShim.make_controller_request(
-              context,
-              verb,
-              action,
-              request_params,
-            )
+            params = { params: request_params }
+
+            context.__send__(verb, action, **params)
           end
 
           unpermitted_parameter_names.empty?
         end
 
         def failure_message
-          "Expected #{verb.upcase} ##{action} to #{expectation},\nbut #{reality}."
+          "Expected #{verb.upcase} ##{action} to #{expectation},"\
+          "\nbut #{reality}."
         end
 
         def failure_message_when_negated
-          "Expected #{verb.upcase} ##{action} not to #{expectation},\nbut it did."
+          "Expected #{verb.upcase} ##{action} not to #{expectation},"\
+          "\nbut it did."
         end
 
         protected
 
-        attr_reader :controller, :double_collections_by_parameter_name, :action, :verb,
-          :request_params, :expected_permitted_parameter_names, :context, :subparameter_name,
-          :parameters_double_registry
+        attr_reader :controller, :double_collections_by_parameter_name, :action,
+          :verb, :request_params, :expected_permitted_parameter_names,
+          :context, :subparameter_name, :parameters_double_registry
 
         def expectation
           message = 'restrict parameters '
@@ -282,7 +282,8 @@ module Shoulda
             message << "on #{subparameter_name.inspect} "
           end
 
-          message << 'to ' + format_parameter_names(expected_permitted_parameter_names)
+          message << 'to '\
+            "#{format_parameter_names(expected_permitted_parameter_names)}"
 
           message
         end
@@ -291,9 +292,9 @@ module Shoulda
           if actual_permitted_parameter_names.empty?
             'it did not restrict any parameters'
           else
-            'the restricted parameters were ' +
-              format_parameter_names(actual_permitted_parameter_names) +
-              ' instead'
+            'the restricted parameters were '\
+            "#{format_parameter_names(actual_permitted_parameter_names)}"\
+            ' instead'
           end
         end
 
@@ -303,12 +304,12 @@ module Shoulda
 
         def actual_permitted_parameter_names
           @_actual_permitted_parameter_names ||= begin
-            if subparameter_name
-              options = { for: subparameter_name }
-            else
-              options = {}
-            end
-
+            options =
+              if subparameter_name
+                { for: subparameter_name }
+              else
+                {}
+              end
             parameters_double_registry.permitted_parameter_names(options)
           end
         end
@@ -329,8 +330,8 @@ module Shoulda
 
         def default_verb
           case action
-            when :create then :post
-            when :update then RailsShim.verb_for_update
+          when :create then :post
+          when :update then RailsShim.verb_for_update
           end
         end
 
@@ -346,7 +347,7 @@ module Shoulda
 
           def register
             double_collection = Doublespeak.double_collection_for(
-              ::ActionController::Parameters.singleton_class
+              ::ActionController::Parameters.singleton_class,
             )
             double_collection.register_proxy(:new).to_return do |call|
               params = call.return_value
@@ -389,7 +390,7 @@ module Shoulda
 
             if double_collections_by_parameter_name.key?(subparameter_name)
               self.class.permitted_parameter_names_within(
-                double_collections_by_parameter_name[subparameter_name]
+                double_collections_by_parameter_name[subparameter_name],
               )
             else
               []
@@ -436,7 +437,8 @@ module Shoulda
         # @private
         class VerbNotDefinedError < StandardError
           def message
-            'You must specify an HTTP verb when using a non-RESTful action. For example: for(:authorize, verb: :post)'
+            'You must specify an HTTP verb when using a non-RESTful action.'\
+            ' For example: for(:authorize, verb: :post)'
           end
         end
       end

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

@@ -26,7 +26,6 @@ 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/allow_mass_assignment_of_matcher'
 require 'shoulda/matchers/active_model/errors'
 require 'shoulda/matchers/active_model/have_secure_password_matcher'
 

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').
@@ -313,7 +313,7 @@ module Shoulda
           :attribute_to_check_message_against,
           :attribute_to_set,
           :context,
-          :instance
+          :instance,
         )
 
         attr_writer(
@@ -423,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.'
@@ -492,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)
@@ -531,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
@@ -597,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
 
@@ -619,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
 
@@ -639,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