shoulda-matchers 3.0.0.rc1 → 3.0.0

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

@@ -16,7 +16,7 @@ module Shoulda
       #       it { should validate_numericality_of(:gpa) }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should validate_numericality_of(:gpa)
       #     end
@@ -42,7 +42,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should validate_numericality_of(:number_of_dependents).on(:create)
       #     end
@@ -65,7 +65,7 @@ module Shoulda
       #       it { should validate_numericality_of(:age).only_integer }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should validate_numericality_of(:age).only_integer
       #     end
@@ -92,7 +92,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should validate_numericality_of(:number_of_cars).
       #         is_less_than(2)
@@ -120,7 +120,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should validate_numericality_of(:birth_year).
       #         is_less_than_or_equal_to(1987)
@@ -144,7 +144,7 @@ module Shoulda
       #       it { should validate_numericality_of(:weight).is_equal_to(150) }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should validate_numericality_of(:weight).is_equal_to(150)
       #     end
@@ -171,7 +171,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should validate_numericality_of(:height).
       #         is_greater_than_or_equal_to(55)
@@ -198,7 +198,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should validate_numericality_of(:legal_age).
       #         is_greater_than(21)
@@ -221,7 +221,7 @@ module Shoulda
       #       it { should validate_numericality_of(:birth_month).even }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should validate_numericality_of(:birth_month).even
       #     end
@@ -244,7 +244,7 @@ module Shoulda
       #       it { should validate_numericality_of(:birth_day).odd }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should validate_numericality_of(:birth_day).odd
       #     end
@@ -269,7 +269,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should validate_numericality_of(:number_of_dependents).
       #         with_message('Number of dependents must be a number')
@@ -291,7 +291,7 @@ module Shoulda
       #       it { should validate_numericality_of(:age).allow_nil }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PostTest < ActiveSupport::TestCase
       #       should validate_numericality_of(:age).allow_nil
       #     end
@@ -412,12 +412,10 @@ module Shoulda
         def failure_message
           first_failing_submatcher.failure_message
         end
-        alias failure_message_for_should failure_message
 
         def failure_message_when_negated
           first_failing_submatcher.failure_message_when_negated
         end
-        alias failure_message_for_should_not failure_message_when_negated
 
         private
 

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

@@ -16,7 +16,7 @@ module Shoulda
       #       it { should validate_presence_of(:arms) }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class RobotTest < ActiveSupport::TestCase
       #       should validate_presence_of(:arms)
       #     end
@@ -73,7 +73,7 @@ module Shoulda
       #       it { should validate_presence_of(:arms).on(:create) }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class RobotTest < ActiveSupport::TestCase
       #       should validate_presence_of(:arms).on(:create)
       #     end
@@ -97,7 +97,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class RobotTest < ActiveSupport::TestCase
       #       should validate_presence_of(:legs).
       #         with_message('Robot has no legs')
@@ -123,7 +123,7 @@ module Shoulda
           if secure_password_being_validated?
             disallows_and_double_checks_value_of!(blank_value, @expected_message)
           else
-            disallows_value_of(blank_value, @expected_message)
+            disallows_original_or_typecast_value?(blank_value, @expected_message)
           end
         end
 
@@ -145,6 +145,12 @@ module Shoulda
           raise ActiveModel::CouldNotSetPasswordError.create(@subject.class)
         end
 
+        def disallows_original_or_typecast_value?(value, message)
+          disallows_value_of(blank_value, @expected_message)
+        rescue ActiveModel::AllowValueMatcher::CouldNotSetAttributeError => error
+          error.actual_value.blank?
+        end
+
         def blank_value
           if collection?
             []

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

@@ -5,8 +5,6 @@ module Shoulda
       class ValidationMatcher
         attr_reader :failure_message
 
-        alias failure_message_for_should failure_message
-
         def initialize(attribute)
           @attribute = attribute
           @strict = false
@@ -27,7 +25,6 @@ module Shoulda
         def failure_message_when_negated
           @failure_message_when_negated || @failure_message
         end
-        alias failure_message_for_should_not failure_message_when_negated
 
         def matches?(subject)
           @subject = subject

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

@@ -23,11 +23,6 @@ module Shoulda
           end
         end
 
-        def capture_range_error(exception)
-          @captured_range_error = exception
-          extend ValidatorWithCapturedRangeError
-        end
-
         def allow_description(allowed_values)
           "allow #{attribute} to be set to #{allowed_values}"
         end
@@ -85,9 +80,6 @@ module Shoulda
 
         def collect_errors_or_exceptions
           collect_messages
-        rescue RangeError => exception
-          capture_range_error(exception)
-          []
         end
 
         def validation_errors

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

@@ -13,7 +13,7 @@ module Shoulda
       #       it { should accept_nested_attributes_for(:doors) }
       #     end
       #
-      #     # Test::Unit (using Shoulda)
+      #     # Minitest (Shoulda) (using Shoulda)
       #     class CarTest < ActiveSupport::TestCase
       #       should accept_nested_attributes_for(:doors)
       #     end
@@ -37,7 +37,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class CarTest < ActiveSupport::TestCase
       #       should accept_nested_attributes_for(:mirrors).
       #         allow_destroy(true)
@@ -59,7 +59,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class CarTest < ActiveSupport::TestCase
       #       should accept_nested_attributes_for(:windows).
       #         limit(3)
@@ -82,7 +82,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class CarTest < ActiveSupport::TestCase
       #       should accept_nested_attributes_for(:engine).
       #         update_only(true)
@@ -127,12 +127,10 @@ module Shoulda
         def failure_message
           "Expected #{expectation} (#{@problem})"
         end
-        alias failure_message_for_should failure_message
 
         def failure_message_when_negated
           "Did not expect #{expectation}"
         end
-        alias failure_message_for_should_not failure_message_when_negated
 
         def description
           description = "accepts_nested_attributes_for :#{@name}"

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

@@ -15,7 +15,7 @@ module Shoulda
       #       it { should belong_to(:organization) }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should belong_to(:organization)
       #     end
@@ -32,7 +32,7 @@ module Shoulda
       #       it { should belong_to(:commentable) }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class CommentTest < ActiveSupport::TestCase
       #       should belong_to(:commentable)
       #     end
@@ -56,7 +56,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should belong_to(:family).
       #         conditions(everyone_is_perfect: false)
@@ -76,7 +76,7 @@ module Shoulda
       #       it { should belong_to(:previous_company).order('hired_on desc') }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should belong_to(:previous_company).order('hired_on desc')
       #     end
@@ -95,7 +95,7 @@ module Shoulda
       #       it { should belong_to(:ancient_city).class_name('City') }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should belong_to(:ancient_city).class_name('City')
       #     end
@@ -116,7 +116,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should belong_to(:great_country).
       #         with_primary_key('country_id')
@@ -138,7 +138,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should belong_to(:great_country).
       #         with_foreign_key('country_id')
@@ -157,7 +157,7 @@ module Shoulda
       #       it { should belong_to(:world).dependent(:destroy) }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should belong_to(:world).dependent(:destroy)
       #     end
@@ -194,7 +194,7 @@ module Shoulda
       #       it { should belong_to(:organization).counter_cache(true) }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should belong_to(:organization).counter_cache(true)
       #     end
@@ -212,7 +212,7 @@ module Shoulda
       #       it { should belong_to(:organization).touch(true) }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should belong_to(:organization).touch(true)
       #     end
@@ -230,7 +230,7 @@ module Shoulda
       #       it { should belong_to(:bank).autosave(true) }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class AccountTest < ActiveSupport::TestCase
       #       should belong_to(:bank).autosave(true)
       #     end
@@ -248,7 +248,7 @@ module Shoulda
       #       it { should belong_to(:organization).inverse_of(:employees) }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should belong_to(:organization).inverse_of(:employees)
       #     end
@@ -271,11 +271,28 @@ module Shoulda
       #       it { should have_many(:friends) }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should have_many(:friends)
       #     end
       #
+      # Note that polymorphic associations are automatically detected and do not
+      # need any qualifiers:
+      #
+      #     class Person < ActiveRecord::Base
+      #       has_many :pictures, as: :imageable
+      #     end
+      #
+      #     # RSpec
+      #     describe Person do
+      #       it { should have_many(:pictures) }
+      #     end
+      #
+      #     # Minitest (Shoulda)
+      #     class PersonTest < ActiveSupport::TestCase
+      #       should have_many(:pictures)
+      #     end
+      #
       # #### Qualifiers
       #
       # ##### conditions
@@ -292,7 +309,7 @@ module Shoulda
       #       it { should have_many(:coins).conditions(quality: 'mint') }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should have_many(:coins).conditions(quality: 'mint')
       #     end
@@ -311,7 +328,7 @@ module Shoulda
       #       it { should have_many(:shirts).order('color') }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should have_many(:shirts).order('color')
       #     end
@@ -330,7 +347,7 @@ module Shoulda
       #       it { should have_many(:hopes).class_name('Dream') }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should have_many(:hopes).class_name('Dream')
       #     end
@@ -348,7 +365,7 @@ module Shoulda
       #       it { should have_many(:worries).with_primary_key('worrier_id') }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should have_many(:worries).with_primary_key('worrier_id')
       #     end
@@ -366,7 +383,7 @@ module Shoulda
       #       it { should have_many(:worries).with_foreign_key('worrier_id') }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should have_many(:worries).with_foreign_key('worrier_id')
       #     end
@@ -384,7 +401,7 @@ module Shoulda
       #       it { should have_many(:secret_documents).dependent(:destroy) }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should have_many(:secret_documents).dependent(:destroy)
       #     end
@@ -403,7 +420,7 @@ module Shoulda
       #       it { should have_many(:acquaintances).through(:friends) }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should have_many(:acquaintances).through(:friends)
       #     end
@@ -426,7 +443,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should have_many(:job_offers).
       #         through(:friends).
@@ -446,7 +463,7 @@ module Shoulda
       #       it { should have_many(:ideas).validate(false) }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should have_many(:ideas).validate(false)
       #     end
@@ -464,7 +481,7 @@ module Shoulda
       #       it { should have_many(:games).autosave(true) }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PlayerTest < ActiveSupport::TestCase
       #       should have_many(:games).autosave(true)
       #     end
@@ -487,7 +504,7 @@ module Shoulda
       #       it { should have_one(:partner) }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should have_one(:partner)
       #     end
@@ -508,7 +525,7 @@ module Shoulda
       #       it { should have_one(:pet).conditions('weight < 80') }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should have_one(:pet).conditions('weight < 80')
       #     end
@@ -527,7 +544,7 @@ module Shoulda
       #       it { should have_one(:focus).order('priority desc') }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should have_one(:focus).order('priority desc')
       #     end
@@ -546,7 +563,7 @@ module Shoulda
       #       it { should have_one(:chance).class_name('Opportunity') }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should have_one(:chance).class_name('Opportunity')
       #     end
@@ -564,7 +581,7 @@ module Shoulda
       #       it { should have_one(:contract).dependent(:nullify) }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should have_one(:contract).dependent(:nullify)
       #     end
@@ -582,7 +599,7 @@ module Shoulda
       #       it { should have_one(:job).with_primary_key('worker_id') }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should have_one(:job).with_primary_key('worker_id')
       #     end
@@ -600,7 +617,7 @@ module Shoulda
       #       it { should have_one(:job).with_foreign_key('worker_id') }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should have_one(:job).with_foreign_key('worker_id')
       #     end
@@ -619,7 +636,7 @@ module Shoulda
       #       it { should have_one(:life).through(:partner) }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should have_one(:life).through(:partner)
       #     end
@@ -638,7 +655,7 @@ module Shoulda
       #       it { should have_one(:car).through(:partner).source(:vehicle) }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should have_one(:car).through(:partner).source(:vehicle)
       #     end
@@ -656,7 +673,7 @@ module Shoulda
       #       it { should have_one(:parking_card).validate(false) }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should have_one(:parking_card).validate(false)
       #     end
@@ -674,7 +691,7 @@ module Shoulda
       #       it { should have_one(:bank).autosave(true) }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class AccountTest < ActiveSupport::TestCase
       #       should have_one(:bank).autosave(true)
       #     end
@@ -698,7 +715,7 @@ module Shoulda
       #       it { should have_and_belong_to_many(:awards) }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should have_and_belong_to_many(:awards)
       #     end
@@ -722,7 +739,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should have_and_belong_to_many(:issues).
       #         conditions(difficulty: 'hard')
@@ -745,7 +762,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should have_and_belong_to_many(:projects).
       #         order('time_spent')
@@ -768,7 +785,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should have_and_belong_to_many(:places_visited).
       #         class_name('City')
@@ -791,7 +808,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should have_and_belong_to_many(:issues).
       #         join_table('people_tickets')
@@ -813,7 +830,7 @@ module Shoulda
       #       end
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should have_and_belong_to_many(:interviews).
       #         validate(false)
@@ -832,7 +849,7 @@ module Shoulda
       #       it { should have_and_belong_to_many(:advertisers).autosave(true) }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class AccountTest < ActiveSupport::TestCase
       #       should have_and_belong_to_many(:advertisers).autosave(true)
       #     end
@@ -944,12 +961,10 @@ module Shoulda
         def failure_message
           "Expected #{expectation} (#{missing_options})"
         end
-        alias failure_message_for_should failure_message
 
         def failure_message_when_negated
           "Did not expect #{expectation}"
         end
-        alias failure_message_for_should_not failure_message_when_negated
 
         def matches?(subject)
           @subject = subject