shoulda-matchers 4.3.0 → 4.4.1

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

@@ -0,0 +1,106 @@
+module Shoulda
+  module Matchers
+    module ActiveRecord
+      # The `have_implicit_order_column` matcher tests that the model has `implicit_order_column`
+      # assigned to one of the table columns. (Rails 6+ only)
+      #
+      #     class Product < ApplicationRecord
+      #       self.implicit_order_column = :created_at
+      #     end
+      #
+      #     # RSpec
+      #     RSpec.describe Product, type: :model do
+      #       it { should have_implicit_order_column(:created_at) }
+      #     end
+      #
+      #     # Minitest (Shoulda)
+      #     class ProductTest < ActiveSupport::TestCase
+      #       should have_implicit_order_column(:created_at)
+      #     end
+      #
+      # @return [HaveImplicitOrderColumnMatcher]
+      #
+      if RailsShim.active_record_gte_6?
+        def have_implicit_order_column(column_name)
+          HaveImplicitOrderColumnMatcher.new(column_name)
+        end
+      end
+
+      # @private
+      class HaveImplicitOrderColumnMatcher
+        attr_reader :failure_message
+
+        def initialize(column_name)
+          @column_name = column_name
+        end
+
+        def matches?(subject)
+          @subject = subject
+          check_column_exists!
+          check_implicit_order_column_matches!
+          true
+        rescue SecondaryCheckFailedError => error
+          @failure_message = Shoulda::Matchers.word_wrap(
+            "Expected #{model.name} to #{expectation}, " +
+            "but that could not be proved: #{error.message}."
+          )
+          false
+        rescue PrimaryCheckFailedError => error
+          @failure_message = Shoulda::Matchers.word_wrap(
+            "Expected #{model.name} to #{expectation}, but #{error.message}."
+          )
+          false
+        end
+
+        def failure_message_when_negated
+          Shoulda::Matchers.word_wrap(
+            "Expected #{model.name} not to #{expectation}, but it did."
+          )
+        end
+
+        def description
+          expectation
+        end
+
+        private
+
+        attr_reader :column_name, :subject
+
+        def check_column_exists!
+          matcher = HaveDbColumnMatcher.new(column_name)
+
+          if !matcher.matches?(@subject)
+            raise SecondaryCheckFailedError.new(
+              "The :#{model.table_name} table does not have a " +
+              ":#{column_name} column"
+            )
+          end
+        end
+
+        def check_implicit_order_column_matches!
+          if model.implicit_order_column.to_s != column_name.to_s
+            message =
+              if model.implicit_order_column.nil?
+                "implicit_order_column is not set"
+              else
+                "it is :#{model.implicit_order_column}"
+              end
+
+            raise PrimaryCheckFailedError.new(message)
+          end
+        end
+
+        def model
+          subject.class
+        end
+
+        def expectation
+          "have an implicit_order_column of :#{column_name}"
+        end
+
+        class SecondaryCheckFailedError < StandardError; end
+        class PrimaryCheckFailedError < StandardError; end
+      end
+    end
+  end
+end

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

@@ -4,12 +4,7 @@ module Shoulda
       # The `have_secure_token` matcher tests usage of the
       # `has_secure_token` macro.
       #
-      # #### Example
-      #
       #     class User < ActiveRecord
-      #       attr_accessor :token
-      #       attr_accessor :auth_token
-      #
       #       has_secure_token
       #       has_secure_token :auth_token
       #     end
@@ -26,14 +21,32 @@ module Shoulda
       #       should have_secure_token(:auth_token)
       #     end
       #
+      # #### Qualifiers
+      #
+      # ##### ignoring_check_for_db_index
+      #
+      # By default, this matcher tests that an index is defined on your token
+      # column. Use `ignoring_check_for_db_index` if this is not the case.
+      #
+      #     class User < ActiveRecord
+      #       has_secure_token :auth_token
+      #     end
+      #
+      #     # RSpec
+      #     RSpec.describe User, type: :model do
+      #       it { should have_secure_token(:auth_token).ignoring_check_for_db_index }
+      #     end
+      #
+      #     # Minitest (Shoulda)
+      #     class UserTest < ActiveSupport::TestCase
+      #       should have_secure_token(:auth_token).ignoring_check_for_db_index
+      #     end
+      #
       # @return [HaveSecureToken]
       #
-
-      # rubocop:disable Style/PredicateName
       def have_secure_token(token_attribute = :token)
         HaveSecureTokenMatcher.new(token_attribute)
       end
-      # rubocop:enable Style/PredicateName
 
       # @private
       class HaveSecureTokenMatcher
@@ -41,6 +54,7 @@ module Shoulda
 
         def initialize(token_attribute)
           @token_attribute = token_attribute
+          @options = { ignore_check_for_db_index: false }
         end
 
         def description
@@ -65,6 +79,11 @@ module Shoulda
           @errors.empty?
         end
 
+        def ignoring_check_for_db_index
+          @options[:ignore_check_for_db_index] = true
+          self
+        end
+
         private
 
         def run_checks
@@ -75,7 +94,7 @@ module Shoulda
           if !has_expected_db_column?
             @errors << "missing correct column #{token_attribute}:string"
           end
-          if !has_expected_db_index?
+          if !@options[:ignore_check_for_db_index] && !has_expected_db_index?
             @errors << "missing unique index for #{table_and_column}"
           end
           @errors

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

@@ -396,7 +396,7 @@ module Shoulda
         end
 
         def validations
-          model._validators[@attribute].select do |validator|
+          model.validators_on(@attribute).select do |validator|
             validator.is_a?(::ActiveRecord::Validations::UniquenessValidator)
           end
         end
@@ -820,7 +820,7 @@ module Shoulda
           elsif previous_value.respond_to?(:next)
             previous_value.next
           elsif previous_value.respond_to?(:to_datetime)
-            previous_value.to_datetime.next
+            previous_value.to_datetime.in(60).next
           elsif boolean_value?(previous_value)
             !previous_value
           else

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/rails_shim.rb

@@ -21,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

data/lib/shoulda/matchers/util.rb

@@ -4,6 +4,8 @@ module Shoulda
   module Matchers
     # @private
     module Util
+      MAXIMUM_LENGTH_OF_VALUE_TO_DISPLAY = 500
+
       def self.deconstantize(path)
         if defined?(ActiveSupport::Inflector) &&
           ActiveSupport::Inflector.respond_to?(:deconstantize)
@@ -47,7 +49,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 +92,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
 

data/lib/shoulda/matchers/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoulda-matchers
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.4.1
 platform: ruby
 authors:
 - Tammer Saleh
@@ -11,10 +11,10 @@ authors:
 - Matt Jankowski
 - Stafford Brunk
 - Elliot Winkler
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-17 00:00:00.000000000 Z
+date: 2020-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,7 +38,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- MIT-LICENSE
 - README.md
 - docs/errors/NonCaseSwappableValueError.md
 - lib/shoulda-matchers.rb
@@ -113,8 +112,10 @@ files:
 - lib/shoulda/matchers/active_record/association_matchers/source_matcher.rb
 - lib/shoulda/matchers/active_record/association_matchers/through_matcher.rb
 - lib/shoulda/matchers/active_record/define_enum_for_matcher.rb
+- lib/shoulda/matchers/active_record/have_attached_matcher.rb
 - lib/shoulda/matchers/active_record/have_db_column_matcher.rb
 - lib/shoulda/matchers/active_record/have_db_index_matcher.rb
+- lib/shoulda/matchers/active_record/have_implicit_order_column.rb
 - lib/shoulda/matchers/active_record/have_readonly_attribute_matcher.rb
 - lib/shoulda/matchers/active_record/have_rich_text_matcher.rb
 - lib/shoulda/matchers/active_record/have_secure_token_matcher.rb
@@ -138,7 +139,6 @@ files:
 - lib/shoulda/matchers/error.rb
 - lib/shoulda/matchers/independent.rb
 - lib/shoulda/matchers/independent/delegate_method_matcher.rb
-- lib/shoulda/matchers/independent/delegate_method_matcher/stubbed_target.rb
 - lib/shoulda/matchers/independent/delegate_method_matcher/target_not_defined_error.rb
 - lib/shoulda/matchers/integrations.rb
 - lib/shoulda/matchers/integrations/configuration.rb
@@ -177,7 +177,7 @@ 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: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -192,8 +192,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Simple one-liner tests for common Rails functionality
 test_files: []

data/MIT-LICENSE

@@ -1,22 +0,0 @@
-Copyright (c) 2006-2020, Tammer Saleh and thoughtbot, inc.
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.

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

@@ -1,37 +0,0 @@
-module Shoulda
-  module Matchers
-    module Independent
-      class DelegateMethodMatcher
-        # @private
-        class StubbedTarget
-          def initialize(method)
-            @received_method = false
-            @received_arguments = []
-            stub_method(method)
-          end
-
-          def has_received_method?
-            received_method
-          end
-
-          def has_received_arguments?(*args)
-            args == received_arguments
-          end
-
-          protected
-
-          def stub_method(method)
-            class_eval do
-              define_method method do |*args|
-                @received_method = true
-                @received_arguments = args
-              end
-            end
-          end
-
-          attr_reader :received_method, :received_arguments
-        end
-      end
-    end
-  end
-end