shoulda-matchers 3.1.0 → 5.2.0

data/docs/errors/NonCaseSwappableValueError.md

@@ -46,7 +46,7 @@ error message explains, you have two options:
         end
 
         # RSpec
-        describe User do
+        RSpec.describe User, type: :model do
           context "validations" do
             subject do
               # Note that "123" == "123".swapcase. This is a problem!
@@ -87,7 +87,7 @@ error message explains, you have two options:
         end
         
         # RSpec
-        describe User do
+        RSpec.describe User, type: :model do
           context "validations" do
             subject do
               # Note that "123" == "123".swapcase, but it's okay

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

@@ -1,56 +1,6 @@
 module Shoulda
   module Matchers
     module ActionController
-      # The `use_before_filter` matcher is used to test that a before_filter
-      # callback is defined within your controller.
-      #
-      #     class UsersController < ApplicationController
-      #       before_filter :authenticate_user!
-      #     end
-      #
-      #     # RSpec
-      #     describe UsersController do
-      #       it { should use_before_filter(:authenticate_user!) }
-      #       it { should_not use_before_filter(:prevent_ssl) }
-      #     end
-      #
-      #     # Minitest (Shoulda)
-      #     class UsersControllerTest < ActionController::TestCase
-      #       should use_before_filter(:authenticate_user!)
-      #       should_not use_before_filter(:prevent_ssl)
-      #     end
-      #
-      # @return [CallbackMatcher]
-      #
-      def use_before_filter(callback)
-        CallbackMatcher.new(callback, :before, :filter)
-      end
-
-      # The `use_after_filter` matcher is used to test that an after_filter
-      # callback is defined within your controller.
-      #
-      #     class IssuesController < ApplicationController
-      #       after_filter :log_activity
-      #     end
-      #
-      #     # RSpec
-      #     describe IssuesController do
-      #       it { should use_after_filter(:log_activity) }
-      #       it { should_not use_after_filter(:destroy_user) }
-      #     end
-      #
-      #     # Minitest (Shoulda)
-      #     class IssuesControllerTest < ActionController::TestCase
-      #       should use_after_filter(:log_activity)
-      #       should_not use_after_filter(:destroy_user)
-      #     end
-      #
-      # @return [CallbackMatcher]
-      #
-      def use_after_filter(callback)
-        CallbackMatcher.new(callback, :after, :filter)
-      end
-
       # The `use_before_action` matcher is used to test that a before_action
       # callback is defined within your controller.
       #
@@ -59,7 +9,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe UsersController do
+      #     RSpec.describe UsersController, type: :controller do
       #       it { should use_before_action(:authenticate_user!) }
       #       it { should_not use_before_action(:prevent_ssl) }
       #     end
@@ -84,7 +34,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe IssuesController do
+      #     RSpec.describe IssuesController, type: :controller do
       #       it { should use_after_action(:log_activity) }
       #       it { should_not use_after_action(:destroy_user) }
       #     end
@@ -101,31 +51,6 @@ module Shoulda
         CallbackMatcher.new(callback, :after, :action)
       end
 
-      # The `use_around_filter` matcher is used to test that an around_filter
-      # callback is defined within your controller.
-      #
-      #     class ChangesController < ApplicationController
-      #       around_filter :wrap_in_transaction
-      #     end
-      #
-      #     # RSpec
-      #     describe ChangesController do
-      #       it { should use_around_filter(:wrap_in_transaction) }
-      #       it { should_not use_around_filter(:save_view_context) }
-      #     end
-      #
-      #     # Minitest (Shoulda)
-      #     class ChangesControllerTest < ActionController::TestCase
-      #       should use_around_filter(:wrap_in_transaction)
-      #       should_not use_around_filter(:save_view_context)
-      #     end
-      #
-      # @return [CallbackMatcher]
-      #
-      def use_around_filter(callback)
-        CallbackMatcher.new(callback, :around, :filter)
-      end
-
       # The `use_around_action` matcher is used to test that an around_action
       # callback is defined within your controller.
       #
@@ -134,7 +59,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe ChangesController do
+      #     RSpec.describe ChangesController, type: :controller do
       #       it { should use_around_action(:wrap_in_transaction) }
       #       it { should_not use_around_action(:save_view_context) }
       #     end
@@ -167,11 +92,13 @@ module Shoulda
         end
 
         def failure_message
-          "Expected that #{controller_class.name} would have :#{method_name} as a #{kind}_#{callback_type}"
+          "Expected that #{controller_class.name} would have :#{method_name}"\
+            " as a #{kind}_#{callback_type}"
         end
 
         def failure_message_when_negated
-          "Expected that #{controller_class.name} would not have :#{method_name} as a #{kind}_#{callback_type}"
+          "Expected that #{controller_class.name} would not have"\
+            " :#{method_name} as a #{kind}_#{callback_type}"
         end
 
         def description

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

@@ -10,7 +10,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe ApplicationController do
+      #     RSpec.describe ApplicationController, type: :controller do
       #       it { should filter_param(:secret_key) }
       #     end
       #
@@ -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

@@ -35,7 +35,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe UsersController do
+      #     RSpec.describe UsersController, type: :controller do
       #       it do
       #         params = {
       #           user: {
@@ -96,7 +96,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe UsersController do
+      #     RSpec.describe UsersController, type: :controller do
       #       before do
       #         create(:user, id: 1)
       #       end
@@ -170,7 +170,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe UsersController do
+      #     RSpec.describe UsersController, type: :controller do
       #       before do
       #         create(:user, id: 1)
       #       end
@@ -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,25 +251,29 @@ module Shoulda
           parameters_double_registry.register
 
           Doublespeak.with_doubles_activated do
-            context.__send__(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 '
@@ -277,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
@@ -286,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
 
@@ -298,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
@@ -324,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
 
@@ -336,31 +342,30 @@ module Shoulda
         # @private
         class CompositeParametersDoubleRegistry
           def initialize
-            @parameters_double_registries_by_params = {}
+            @parameters_double_registries = []
           end
 
           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
               parameters_double_registry = ParametersDoubleRegistry.new(params)
               parameters_double_registry.register
-              parameters_double_registries_by_params[params] =
-                parameters_double_registry
+              parameters_double_registries << parameters_double_registry
             end
           end
 
           def permitted_parameter_names(options = {})
-            parameters_double_registries_by_params.flat_map do |params, double_registry|
+            parameters_double_registries.flat_map do |double_registry|
               double_registry.permitted_parameter_names(options)
             end
           end
 
           protected
 
-          attr_reader :parameters_double_registries_by_params
+          attr_reader :parameters_double_registries
         end
 
         # @private
@@ -385,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
               []
@@ -432,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

@@ -14,7 +14,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe PostsController do
+      #     RSpec.describe PostsController, type: :controller do
       #       describe 'GET #show' do
       #         before { get :show }
       #
@@ -28,7 +28,7 @@ module Shoulda
       #       context 'GET #show' do
       #         setup { get :show }
       #
-      #         should redirect_to { posts_path }
+      #         should redirect_to('/posts') { posts_path }
       #         should redirect_to(action: :index)
       #       end
       #     end
@@ -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

@@ -15,7 +15,7 @@ module Shoulda
       #     <%= render 'sidebar' %>
       #
       #     # RSpec
-      #     describe PostsController do
+      #     RSpec.describe PostsController, type: :controller do
       #       describe 'GET #show' do
       #         before { get :show }
       #
@@ -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

@@ -11,7 +11,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe PostsController do
+      #     RSpec.describe PostsController, type: :controller do
       #       describe 'GET #show' do
       #         before { get :show }
       #
@@ -38,7 +38,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe PostsController do
+      #     RSpec.describe PostsController, type: :controller do
       #       describe 'GET #sidebar' do
       #         before { get :sidebar }
       #
@@ -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

@@ -16,7 +16,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe ApplicationController do
+      #     RSpec.describe ApplicationController, type: :controller do
       #       it do
       #         should rescue_from(ActiveRecord::RecordNotFound).
       #           with(:handle_not_found)
@@ -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/respond_with_matcher.rb

@@ -13,7 +13,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe PostsController do
+      #     RSpec.describe PostsController, type: :controller do
       #       describe 'GET #index' do
       #         before { get :index }
       #
@@ -39,7 +39,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe PostsController do
+      #     RSpec.describe PostsController, type: :controller do
       #       describe 'DELETE #destroy' do
       #         before { delete :destroy }
       #
@@ -65,7 +65,7 @@ module Shoulda
       #     end
       #
       #     # RSpec
-      #     describe PostsController do
+      #     RSpec.describe PostsController, type: :controller do
       #       describe 'GET #show' do
       #         before { get :show }
       #