shoulda-matchers 3.0.0.rc1 → 3.0.0

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

@@ -31,15 +31,18 @@ module Shoulda
           self
         end
 
+        def ignoring_interference_by_writer
+          @allow_matcher.ignoring_interference_by_writer
+          self
+        end
+
         def failure_message
           @allow_matcher.failure_message_when_negated
         end
-        alias failure_message_for_should failure_message
 
         def failure_message_when_negated
           @allow_matcher.failure_message
         end
-        alias failure_message_for_should_not failure_message_when_negated
 
         def strict
           @allow_matcher.strict

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

@@ -19,7 +19,7 @@ module Shoulda
       #       it { should have_secure_password }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class UserTest < ActiveSupport::TestCase
       #       should have_secure_password
       #     end
@@ -34,8 +34,6 @@ module Shoulda
       class HaveSecurePasswordMatcher
         attr_reader :failure_message
 
-        alias failure_message_for_should failure_message
-
         CORRECT_PASSWORD = "aBcDe12345"
         INCORRECT_PASSWORD = "password"
 

data/lib/shoulda/matchers/active_model/numericality_matchers/comparison_matcher.rb

@@ -24,33 +24,42 @@ module Shoulda
             @strict = false
           end
 
+          def description
+            message = "validate that #{@attribute} is #{comparison_expectation} #{@value}"
+
+            if @strict
+              message << " strictly"
+            end
+
+            message
+          end
+
           def for(attribute)
             @attribute = attribute
             self
           end
 
-          def matches?(subject)
-            @subject = subject
-            all_bounds_correct?
-          end
-
           def with_message(message)
             @message = message
+            self
           end
 
-          def comparison_description
-            "#{expectation} #{@value}"
+          def matches?(subject)
+            @subject = subject
+            all_bounds_correct?
           end
 
           def failure_message
             last_failing_submatcher.failure_message
           end
-          alias failure_message_for_should failure_message
 
           def failure_message_when_negated
             last_failing_submatcher.failure_message_when_negated
           end
-          alias failure_message_for_should_not failure_message_when_negated
+
+          def comparison_description
+            "#{comparison_expectation} #{@value}"
+          end
 
           private
 
@@ -71,7 +80,11 @@ module Shoulda
           def submatchers
             @_submatchers ||=
               comparison_combos.map do |diff, submatcher_method_name|
-                matcher = __send__(submatcher_method_name, @value + diff, nil)
+                matcher = __send__(
+                  submatcher_method_name,
+                  (@value + diff).to_s,
+                  nil
+                )
                 matcher.with_message(@message, values: { count: @value })
                 matcher
               end
@@ -118,7 +131,7 @@ module Shoulda
             [-diff, 0, diff]
           end
 
-          def expectation
+          def comparison_expectation
             case @operator
               when :> then "greater than"
               when :>= then "greater than or equal to"

data/lib/shoulda/matchers/active_model/numericality_matchers/even_number_matcher.rb

@@ -8,9 +8,10 @@ module Shoulda
 
           def initialize(attribute, options = {})
             @attribute = attribute
-            @disallow_value_matcher = DisallowValueMatcher.new(NON_EVEN_NUMBER_VALUE).
-                for(@attribute).
-                with_message(:even)
+            @disallow_value_matcher =
+              DisallowValueMatcher.new(NON_EVEN_NUMBER_VALUE.to_s).
+              for(@attribute).
+              with_message(:even)
           end
 
           def allowed_type

data/lib/shoulda/matchers/active_model/numericality_matchers/numeric_type_matcher.rb

@@ -38,12 +38,10 @@ module Shoulda
           def failure_message
             @disallow_value_matcher.failure_message
           end
-          alias failure_message_for_should failure_message
 
           def failure_message_when_negated
             @disallow_value_matcher.failure_message_when_negated
           end
-          alias failure_message_for_should_not failure_message_when_negated
         end
       end
     end

data/lib/shoulda/matchers/active_model/numericality_matchers/odd_number_matcher.rb

@@ -8,9 +8,10 @@ module Shoulda
 
           def initialize(attribute, options = {})
             @attribute = attribute
-            @disallow_value_matcher = DisallowValueMatcher.new(NON_ODD_NUMBER_VALUE).
-                for(@attribute).
-                with_message(:odd)
+            @disallow_value_matcher =
+              DisallowValueMatcher.new(NON_ODD_NUMBER_VALUE.to_s).
+              for(@attribute).
+              with_message(:odd)
           end
 
           def allowed_type

data/lib/shoulda/matchers/active_model/numericality_matchers/only_integer_matcher.rb

@@ -7,7 +7,8 @@ module Shoulda
           NON_INTEGER_VALUE = 0.1
           def initialize(attribute)
             @attribute = attribute
-            @disallow_value_matcher = DisallowValueMatcher.new(NON_INTEGER_VALUE).
+            @disallow_value_matcher =
+              DisallowValueMatcher.new(NON_INTEGER_VALUE.to_s).
               for(attribute).
               with_message(:not_an_integer)
           end

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

@@ -16,7 +16,7 @@ module Shoulda
       #       it { should validate_absence_of(:arms) }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class ArtilleryTest < ActiveSupport::TestCase
       #       should validate_absence_of(:arms)
       #     end
@@ -39,7 +39,7 @@ module Shoulda
       #       it { should validate_absence_of(:arms).on(:create) }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class ArtilleryTest < ActiveSupport::TestCase
       #       should validate_absence_of(:arms).on(:create)
       #     end
@@ -64,7 +64,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class ArtilleryTest < ActiveSupport::TestCase
       #       should validate_absence_of(:arms).
       #         with_message("We're fresh outta arms here, soldier!")
@@ -86,6 +86,7 @@ module Shoulda
         def matches?(subject)
           super(subject)
           @expected_message ||= :present
+
           disallows_value_of(value, @expected_message)
         end
 
@@ -103,21 +104,22 @@ module Shoulda
             else
               obj
             end
-          elsif [Fixnum, Float].include?(attribute_class)
-            1
-          elsif attribute_class == BigDecimal
-            BigDecimal.new(1, 0)
-          elsif !attribute_class || attribute_class == String
-            'an arbitrary value'
           else
-            attribute_class.new
+            case column_type
+            when :integer, :float then 1
+            when :decimal then BigDecimal.new(1, 0)
+            when :datetime, :time, :timestamp then Time.now
+            when :date then Date.new
+            when :binary then "0"
+            else 'an arbitrary value'
+            end
           end
         end
 
-        def attribute_class
+        def column_type
           @subject.class.respond_to?(:columns_hash) &&
-            @subject.class.columns_hash[@attribute.to_s].respond_to?(:klass) &&
-            @subject.class.columns_hash[@attribute.to_s].klass
+            @subject.class.columns_hash[@attribute.to_s].respond_to?(:type) &&
+            @subject.class.columns_hash[@attribute.to_s].type
         end
 
         def collection?

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

@@ -16,7 +16,7 @@ module Shoulda
       #       it { should validate_acceptance_of(:eula) }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class RegistrationTest < ActiveSupport::TestCase
       #       should validate_acceptance_of(:eula)
       #     end
@@ -42,7 +42,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class RegistrationTest < ActiveSupport::TestCase
       #       should validate_acceptance_of(:terms_of_service).on(:create)
       #     end
@@ -67,7 +67,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class RegistrationTest < ActiveSupport::TestCase
       #       should validate_acceptance_of(:terms_of_service).
       #         with_message('You must accept the terms of service')

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

@@ -16,7 +16,7 @@ module Shoulda
       #       it { should validate_confirmation_of(:email) }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class UserTest < ActiveSupport::TestCase
       #       should validate_confirmation_of(:email)
       #     end
@@ -39,7 +39,7 @@ module Shoulda
       #       it { should validate_confirmation_of(:password).on(:create) }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class UserTest < ActiveSupport::TestCase
       #       should validate_confirmation_of(:password).on(:create)
       #     end
@@ -64,7 +64,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class UserTest < ActiveSupport::TestCase
       #       should validate_confirmation_of(:password).
       #         with_message('Please re-enter your password')

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

@@ -23,7 +23,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class GameTest < ActiveSupport::TestCase
       #       should validate_exclusion_of(:supported_os).
       #         in_array(['Mac', 'Linux'])
@@ -46,7 +46,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class GameTest < ActiveSupport::TestCase
       #       should validate_exclusion_of(:floors_with_enemies).
       #         in_range(5..8)
@@ -76,7 +76,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class GameTest < ActiveSupport::TestCase
       #       should validate_exclusion_of(:weapon).
       #         in_array(['pistol', 'paintball gun', 'stick']).
@@ -105,7 +105,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class GameTest < ActiveSupport::TestCase
       #       should validate_exclusion_of(:weapon).
       #         in_array(['pistol', 'paintball gun', 'stick']).

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

@@ -24,7 +24,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class IssueTest < ActiveSupport::TestCase
       #       should validate_inclusion_of(:state).
       #         in_array(%w(open resolved unresolved))
@@ -44,7 +44,7 @@ module Shoulda
       #       it { should validate_inclusion_of(:state).in_range(1..5) }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class IssueTest < ActiveSupport::TestCase
       #       should validate_inclusion_of(:state).in_range(1..5)
       #     end
@@ -87,7 +87,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class IssueTest < ActiveSupport::TestCase
       #       should validate_inclusion_of(:severity).
       #         in_array(%w(low medium high)).
@@ -116,7 +116,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class IssueTest < ActiveSupport::TestCase
       #       should validate_inclusion_of(:severity).
       #         in_array(%w(low medium high)).
@@ -152,7 +152,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should validate_inclusion_of(:age).
       #         in_range(0..65).
@@ -188,7 +188,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should validate_inclusion_of(:age).
       #         in_range(0..21).
@@ -218,7 +218,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class IssueTest < ActiveSupport::TestCase
       #       should validate_inclusion_of(:state).
       #         in_array(%w(open resolved unresolved)).
@@ -248,7 +248,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class IssueTest < ActiveSupport::TestCase
       #       should validate_inclusion_of(:state).
       #         in_array(%w(open resolved unresolved)).

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

@@ -25,7 +25,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class UserTest < ActiveSupport::TestCase
       #       should validate_length_of(:password).
       #         is_at_least(10).
@@ -51,7 +51,7 @@ module Shoulda
       #       it { should validate_length_of(:bio).is_at_least(15) }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #
       #     class UserTest < ActiveSupport::TestCase
       #       should validate_length_of(:bio).is_at_least(15)
@@ -75,7 +75,7 @@ module Shoulda
       #       it { should validate_length_of(:status_update).is_at_most(140) }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class UserTest < ActiveSupport::TestCase
       #       should validate_length_of(:status_update).is_at_most(140)
       #     end
@@ -98,7 +98,7 @@ module Shoulda
       #       it { should validate_length_of(:favorite_superhero).is_equal_to(6) }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class UserTest < ActiveSupport::TestCase
       #       should validate_length_of(:favorite_superhero).is_equal_to(6)
       #     end
@@ -123,7 +123,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class UserTest < ActiveSupport::TestCase
       #       should validate_length_of(:password).
       #         is_at_least(5).is_at_most(30)
@@ -151,7 +151,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class UserTest < ActiveSupport::TestCase
       #       should validate_length_of(:password).
       #         is_at_least(10).
@@ -180,7 +180,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class UserTest < ActiveSupport::TestCase
       #       should validate_length_of(:secret_key).
       #         is_at_least(15).
@@ -209,7 +209,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class UserTest < ActiveSupport::TestCase
       #       should validate_length_of(:secret_key).
       #         is_at_most(100).