shoulda-matchers 4.1.2 → 4.5.0

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

@@ -27,7 +27,7 @@ module Shoulda
             method_name: method_name,
             args: args,
             block: block,
-            caller: ::Kernel.caller
+            caller: ::Kernel.caller,
           )
           calls << call
           (calls_by_method_name[method_name] ||= []) << call

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

@@ -14,11 +14,7 @@ module Shoulda
         end
 
         def returns(value = nil, &block)
-          if block
-            @implementation = block
-          else
-            @implementation = proc { value }
-          end
+          @implementation = block || proc { value }
         end
 
         def call(call)

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

@@ -39,13 +39,13 @@ module Shoulda
         private
 
         def activate
-          double_collections_by_class.each do |klass, double_collection|
+          double_collections_by_class.each do |_klass, double_collection|
             double_collection.activate
           end
         end
 
         def deactivate
-          double_collections_by_class.each do |klass, double_collection|
+          double_collections_by_class.each do |_klass, double_collection|
             double_collection.deactivate
           end
         end

data/lib/shoulda/matchers/error.rb

@@ -18,7 +18,7 @@ module Shoulda
       end
 
       def message
-        ""
+        ''
       end
 
       def inspect

data/lib/shoulda/matchers/independent.rb

@@ -1,5 +1,4 @@
 require 'shoulda/matchers/independent/delegate_method_matcher'
-require 'shoulda/matchers/independent/delegate_method_matcher/stubbed_target'
 require 'shoulda/matchers/independent/delegate_method_matcher/target_not_defined_error'
 
 module Shoulda

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

@@ -219,9 +219,9 @@ module Shoulda
           end
 
           if expects_to_allow_nil_delegate_object?
-            string << ", allowing "
+            string << ', allowing '
             string << formatted_delegate_object_reader_method_name
-            string << " to return nil"
+            string << ' to return nil'
           end
 
           string
@@ -245,7 +245,7 @@ module Shoulda
         def with_prefix(prefix = nil)
           @delegating_method =
             :"#{build_delegating_method_prefix(prefix)}_#{delegate_method}"
-            delegate_method
+          delegate_method
           self
         end
 
@@ -256,8 +256,8 @@ module Shoulda
 
         def build_delegating_method_prefix(prefix)
           case prefix
-            when true, nil then delegate_object_reader_method
-            else prefix
+          when true, nil then delegate_object_reader_method
+          else prefix
           end
         end
 
@@ -344,7 +344,7 @@ module Shoulda
           if options[:include_module]
             class_under_test.to_s
           else
-            ""
+            ''
           end
         end
 
@@ -398,11 +398,12 @@ module Shoulda
                 true
               rescue Module::DelegationError
                 false
-              rescue NoMethodError => error
-                if error.message =~ /undefined method `#{delegate_method}' for nil:NilClass/
+              rescue NoMethodError => e
+                if e.message =~
+                   /undefined method `#{delegate_method}' for nil:NilClass/
                   false
                 else
-                  raise error
+                  raise e
                 end
               end
             else
@@ -439,17 +440,17 @@ module Shoulda
         end
 
         def formatted_calls_on_delegate_object
-          string = ""
+          string = ''
 
           if calls_on_delegate_object.any?
             string << "\n\n"
             calls_on_delegate_object.each_with_index do |call, i|
               name = call.method_name
-              args = call.args.map { |arg| arg.inspect }.join(', ')
-              string << "#{i+1}) #{name}(#{args})\n"
+              args = call.args.map(&:inspect).join(', ')
+              string << "#{i + 1}) #{name}(#{args})\n"
             end
           else
-            string << " (none)"
+            string << ' (none)'
           end
 
           string.rstrip!

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

@@ -60,7 +60,7 @@ EOT
         end
 
         def no_test_frameworks_added?
-          @test_frameworks.empty? || !@test_frameworks.any?(&:present?)
+          @test_frameworks.empty? || @test_frameworks.none?(&:present?)
         end
 
         def no_libraries_added?

data/lib/shoulda/matchers/integrations/libraries/action_controller.rb

@@ -13,7 +13,7 @@ module Shoulda
             test_framework.include(matchers_module, type: :controller)
 
             include_into(::ActionController::TestCase, matchers_module) do
-              def subject
+              def subject # rubocop:disable Lint/NestedMethodDefinition
                 @controller
               end
             end

data/lib/shoulda/matchers/integrations/libraries/rails.rb

@@ -12,8 +12,8 @@ module Shoulda
             :active_model,
             :active_record,
             :action_controller,
-            :routing
-          ]
+            :routing,
+          ].freeze
 
           def integrate_with(test_framework)
             Shoulda::Matchers.assertion_exception_class =

data/lib/shoulda/matchers/integrations/test_frameworks/active_support_test_case.rb

@@ -9,7 +9,7 @@ module Shoulda
           def validate!
           end
 
-          def include(*modules, **options)
+          def include(*modules, **_options)
             test_case_class.include(*modules)
           end
 

data/lib/shoulda/matchers/integrations/test_frameworks/minitest_4.rb

@@ -9,7 +9,7 @@ module Shoulda
           def validate!
           end
 
-          def include(*modules, **options)
+          def include(*modules, **_options)
             test_case_class.class_eval do
               include(*modules)
               extend(*modules)

data/lib/shoulda/matchers/integrations/test_frameworks/minitest_5.rb

@@ -10,7 +10,7 @@ module Shoulda
           def validate!
           end
 
-          def include(*modules, **options)
+          def include(*modules, **_options)
             test_case_class.class_eval do
               include(*modules)
               extend(*modules)

data/lib/shoulda/matchers/integrations/test_frameworks/missing_test_framework.rb

@@ -20,7 +20,7 @@ Shoulda::Matchers.configure do |config|
     with.test_framework :test_unit
   end
 end
-EOT
+            EOT
           end
 
           def include(*modules, **options)

data/lib/shoulda/matchers/integrations/test_frameworks/test_unit.rb

@@ -9,7 +9,7 @@ module Shoulda
           def validate!
           end
 
-          def include(*modules, **options)
+          def include(*modules, **_options)
             test_case_class.class_eval do
               include(*modules)
               extend(*modules)

data/lib/shoulda/matchers/rails_shim.rb

@@ -1,12 +1,8 @@
 module Shoulda
   module Matchers
     # @private
-    module RailsShim
+    module RailsShim # rubocop:disable Metrics/ModuleLength
       class << self
-        def action_pack_gte_4_1?
-          Gem::Requirement.new('>= 4.1').satisfied_by?(action_pack_version)
-        end
-
         def action_pack_gte_5?
           Gem::Requirement.new('>= 5').satisfied_by?(action_pack_version)
         end
@@ -25,6 +21,10 @@ module Shoulda
           Gem::Requirement.new('>= 5').satisfied_by?(active_record_version)
         end
 
+        def active_record_gte_6?
+          Gem::Requirement.new('>= 6').satisfied_by?(active_record_version)
+        end
+
         def active_record_version
           Gem::Version.new(::ActiveRecord::VERSION::STRING)
         rescue NameError
@@ -85,15 +85,6 @@ module Shoulda
           serialized_attributes_for(model)[attribute_name.to_s]
         end
 
-        def type_cast_default_for(model, column)
-          if model.respond_to?(:column_defaults)
-            # Rails 4.2
-            model.column_defaults[column.name]
-          else
-            column.default
-          end
-        end
-
         def tables_and_views(connection)
           if active_record_gte_5?
             connection.data_sources
@@ -103,11 +94,7 @@ module Shoulda
         end
 
         def verb_for_update
-          if action_pack_gte_4_1?
-            :patch
-          else
-            :put
-          end
+          :patch
         end
 
         def validation_message_key_for_association_required_option
@@ -193,10 +180,12 @@ module Shoulda
           options
         )
           default_translation_keys = [
-            :"activemodel.errors.models.#{model_name}.attributes.#{attribute}.#{type}",
+            :"activemodel.errors.models.#{model_name}.attributes.#{attribute}
+              .#{type}",
             :"activemodel.errors.models.#{model_name}.#{type}",
             :"activemodel.errors.messages.#{type}",
-            :"activerecord.errors.models.#{model_name}.attributes.#{attribute}.#{type}",
+            :"activerecord.errors.models.#{model_name}.attributes.#{attribute}
+              .#{type}",
             :"activerecord.errors.models.#{model_name}.#{type}",
             :"activerecord.errors.messages.#{type}",
             :"errors.attributes.#{attribute}.#{type}",

data/lib/shoulda/matchers/util.rb

@@ -4,9 +4,13 @@ module Shoulda
   module Matchers
     # @private
     module Util
+      MAXIMUM_LENGTH_OF_VALUE_TO_DISPLAY = 500
+
       def self.deconstantize(path)
-        if defined?(ActiveSupport::Inflector) &&
+        if (
+          defined?(ActiveSupport::Inflector) &&
           ActiveSupport::Inflector.respond_to?(:deconstantize)
+        )
           ActiveSupport::Inflector.deconstantize(path)
         else
           path.to_s[0...(path.to_s.rindex('::') || 0)]
@@ -14,8 +18,10 @@ module Shoulda
       end
 
       def self.safe_constantize(camel_cased_word)
-        if defined?(ActiveSupport::Inflector) &&
+        if (
+          defined?(ActiveSupport::Inflector) &&
           ActiveSupport::Inflector.respond_to?(:safe_constantize)
+        )
           ActiveSupport::Inflector.safe_constantize(camel_cased_word)
         else
           begin
@@ -28,6 +34,7 @@ module Shoulda
 
       def self.indent(string, width)
         return if !string
+
         indentation = ' ' * width
         string.split(/[\n\r]/).map { |line| indentation + line }.join("\n")
       end
@@ -47,7 +54,12 @@ module Shoulda
         when Range
           inspect_range(value)
         else
-          "‹#{value.inspect}›"
+          inspected_value = value.inspect
+          if inspected_value.length > MAXIMUM_LENGTH_OF_VALUE_TO_DISPLAY
+            "‹#{inspected_value[0, MAXIMUM_LENGTH_OF_VALUE_TO_DISPLAY]}...›"
+          else
+            "‹#{inspected_value}›"
+          end
         end
       end
 
@@ -85,7 +97,7 @@ module Shoulda
           when :datetime, :timestamp
             DateTime.new(2100, 1, 1)
           when :time
-            Time.new(2100, 1, 1)
+            Time.new(2000, 1, 1)
           when :uuid
             SecureRandom.uuid
           when :boolean

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

@@ -5,7 +5,7 @@ module Shoulda
       TERMINAL_WIDTH = 72
 
       def word_wrap(document, options = {})
-        Document.new(document, options).wrap
+        Document.new(document, **options).wrap
       end
     end
 
@@ -41,10 +41,10 @@ module Shoulda
 
     # @private
     class Text < ::String
-      LIST_ITEM_REGEXP = /\A((?:[a-z0-9]+(?:\)|\.)|\*) )/
+      LIST_ITEM_REGEXP = /\A((?:[a-z0-9]+(?:\)|\.)|\*) )/.freeze
 
       def indented?
-        self =~ /\A[ ]+/
+        self =~ /\A +/
       end
 
       def list_item?
@@ -88,11 +88,11 @@ module Shoulda
       end
 
       def combine_list_item_lines(lines)
-        lines.reduce([]) do |combined_lines, line|
+        lines.inject([]) do |combined_lines, line|
           if line.list_item?
             combined_lines << line
           else
-            combined_lines.last << (' ' + line).squeeze(' ')
+            combined_lines.last << (" #{line}").squeeze(' ')
           end
 
           combined_lines
@@ -114,7 +114,7 @@ module Shoulda
 
     # @private
     class Line
-      OFFSETS = { left: -1, right: +1 }
+      OFFSETS = { left: -1, right: +1 }.freeze
 
       def initialize(line, indent: 0)
         @indent = indent
@@ -169,7 +169,7 @@ module Shoulda
         end
       end
 
-      def wrap_line(line, direction: :left)
+      def wrap_line(line)
         index = nil
 
         if line.length > Shoulda::Matchers::WordWrap::TERMINAL_WIDTH
@@ -185,7 +185,7 @@ module Shoulda
           leftover = ''
         else
           fitted_line = line[0..index].rstrip
-          leftover = line[index + 1 .. -1]
+          leftover = line[index + 1..-1]
         end
 
         { fitted_line: fitted_line, leftover: leftover }

data/lib/shoulda/matchers/version.rb

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

data/lib/shoulda/matchers/warn.rb

@@ -5,13 +5,13 @@ module Shoulda
 
     # @private
     def self.warn(message)
-      header = "Warning from shoulda-matchers:"
-      divider = "*" * TERMINAL_MAX_WIDTH
+      header = 'Warning from shoulda-matchers:'
+      divider = '*' * TERMINAL_MAX_WIDTH
       wrapped_message = word_wrap(message)
       full_message = [
         divider,
         [header, wrapped_message.strip].join("\n\n"),
-        divider
+        divider,
       ].join("\n")
 
       Kernel.warn(full_message)

data/shoulda-matchers.gemspec

@@ -18,19 +18,22 @@ Gem::Specification.new do |s|
   s.homepage    = 'https://matchers.shoulda.io/'
   s.summary     = 'Simple one-liner tests for common Rails functionality'
   s.license     = 'MIT'
-  s.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.'
-  s.metadata    = {
+  s.description = <<~DESC.tr("\n", ' ').squeeze(' ')
+    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.
+  DESC
+
+  s.metadata = {
     'bug_tracker_uri' => 'https://github.com/thoughtbot/shoulda-matchers/issues',
-    'changelog_uri' => 'https://github.com/thoughtbot/shoulda-matchers/blob/master/NEWS.md',
+    'changelog_uri' => 'https://github.com/thoughtbot/shoulda-matchers/blob/master/CHANGELOG.md',
     'documentation_uri' => 'https://matchers.shoulda.io/docs',
     'homepage_uri' => 'https://matchers.shoulda.io',
     'source_code_uri' => 'https://github.com/thoughtbot/shoulda-matchers',
   }
 
-  s.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z -- {docs,lib,README.md,MIT-LICENSE,shoulda-matchers.gemspec}`.
-      split("\x0")
-  end
+  s.files = Dir['{docs,lib}/**/*', 'README.md', 'LICENSE',
+    'shoulda-matchers.gemspec']
   s.require_paths = ['lib']
 
   s.required_ruby_version = '>= 2.4.0'