shoulda 2.11.0 → 2.11.1

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

@@ -71,7 +71,7 @@ module Shoulda # :nodoc:
 
         def route_recognized?
           begin
-            @context.send(:assert_routing, 
+            @context.send(:assert_routing,
                           { :method => @method, :path => @path },
                           @params)
 

data/lib/shoulda/action_mailer/matchers/have_sent_email.rb

@@ -54,35 +54,11 @@ module Shoulda # :nodoc:
         end
 
         def failure_message
-          msg = "expected a sent email"
-          msg += " with subject #{@email_subject.inspect}" if @subject_failed
-          msg += " with body #{@body.inspect}" if @body_failed
-          msg += " from #{@sender.inspect}" if @sender_failed
-          msg += " to #{@recipient.inspect}" if @recipient_failed
-          if anything_failed?
-            msg += " but got"
-            msg += " the subject #{@mail.subject.inspect}" if @subject_failed
-            msg += " the body #{@mail.body.inspect}" if @body_failed
-            msg += " from #{@mail.from.inspect}" if @sender_failed
-            msg += " to #{@mail.to.inspect}" if @recipient_failed
-          end
-          msg
+          "Expected #{expectation}"
         end
 
         def negative_failure_message
-          msg = "expected no sent email"
-          msg += " with subject #{@email_subject.inspect}" if @subject_failed
-          msg += " with body #{@body.inspect}" if @body_failed
-          msg += " from #{@sender.inspect}" if @sender_failed
-          msg += " to #{@recipient.inspect}" if @recipient_failed
-          if anything_failed?
-            msg += " but got"
-            msg += " the subject #{@mail.subject.inspect}" if @subject_failed
-            msg += " the body #{@mail.body.inspect}" if @body_failed
-            msg += " from #{@mail.from.inspect}" if @sender_failed
-            msg += " to #{@mail.to.inspect}" if @recipient_failed
-          end
-          msg
+          "Did not expect #{expectation}"
         end
 
         def description
@@ -91,6 +67,21 @@ module Shoulda # :nodoc:
 
         private
 
+        def expectation
+          expectation = "sent email"
+          expectation << " with subject #{@email_subject.inspect}" if @subject_failed
+          expectation << " with body #{@body.inspect}" if @body_failed
+          expectation << " from #{@sender.inspect}" if @sender_failed
+          expectation << " to #{@recipient.inspect}" if @recipient_failed
+          expectation << "\nDeliveries:\n#{inspect_deliveries}"
+        end
+
+        def inspect_deliveries
+          ::ActionMailer::Base.deliveries.map do |delivery|
+            "#{delivery.subject.inspect} to #{delivery.to.inspect}"
+          end.join("\n")
+        end
+
         def anything_failed?
           @subject_failed || @body_failed || @sender_failed || @recipient_failed
         end

data/lib/shoulda/active_record/helpers.rb

@@ -2,8 +2,8 @@ module Shoulda # :nodoc:
   module ActiveRecord # :nodoc:
     module Helpers
       def pretty_error_messages(obj) # :nodoc:
-        obj.errors.map do |a, m| 
-          msg = "#{a} #{m}" 
+        obj.errors.map do |a, m|
+          msg = "#{a} #{m}"
           msg << " (#{obj.send(a).inspect})" unless a.to_sym == :base
         end
       end

data/lib/shoulda/active_record/macros.rb

@@ -377,7 +377,7 @@ module Shoulda # :nodoc:
       #
       # Ensure that the given columns are defined on the models backing SQL table.
       # Also aliased to should_have_db_column for readability.
-      # Takes the same options available in migrations: 
+      # Takes the same options available in migrations:
       # :type, :precision, :limit, :default, :null, and :scale
       #
       # Examples:
@@ -390,7 +390,7 @@ module Shoulda # :nodoc:
       #
       def should_have_db_columns(*columns)
         ::ActiveSupport::Deprecation.warn("use: should have_db_column")
-        column_type, precision, limit, default, null, scale, sql_type = 
+        column_type, precision, limit, default, null, scale, sql_type =
           get_options!(columns, :type, :precision, :limit,
                                 :default, :null, :scale, :sql_type)
         columns.each do |name|

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

@@ -20,9 +20,9 @@ module Shoulda # :nodoc:
       #   dependent option.
       #
       # Example:
-      #   it { should_have_many(:friends) }
-      #   it { should_have_many(:enemies).through(:friends) }
-      #   it { should_have_many(:enemies).dependent(:destroy) }
+      #   it { should have_many(:friends) }
+      #   it { should have_many(:enemies).through(:friends) }
+      #   it { should have_many(:enemies).dependent(:destroy) }
       #
       def have_many(name)
         AssociationMatcher.new(:has_many, name)
@@ -70,10 +70,10 @@ module Shoulda # :nodoc:
 
         def matches?(subject)
           @subject = subject
-          association_exists? && 
-            macro_correct? && 
-            foreign_key_exists? && 
-            through_association_valid? && 
+          association_exists? &&
+            macro_correct? &&
+            foreign_key_exists? &&
+            through_association_valid? &&
             dependent_correct? &&
             join_table_exists?
         end
@@ -160,7 +160,7 @@ module Shoulda # :nodoc:
         end
 
         def join_table_exists?
-          if @macro != :has_and_belongs_to_many || 
+          if @macro != :has_and_belongs_to_many ||
               ::ActiveRecord::Base.connection.tables.include?(join_table.to_s)
             true
           else

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

@@ -57,7 +57,7 @@ module Shoulda # :nodoc:
           @low_message  ||= :inclusion
           @high_message ||= :inclusion
 
-          disallows_lower_value && 
+          disallows_lower_value &&
             allows_minimum_value &&
             disallows_higher_value &&
             allows_maximum_value

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

@@ -84,7 +84,7 @@ module Shoulda # :nodoc:
         def matches?(subject)
           super(subject)
           translate_messages!
-          disallows_lower_length && 
+          disallows_lower_length &&
             allows_minimum_length &&
             ((@minimum == @maximum) ||
               (disallows_higher_length &&
@@ -106,7 +106,7 @@ module Shoulda # :nodoc:
         end
 
         def disallows_lower_length
-          @minimum == 0 || 
+          @minimum == 0 ||
             @minimum.nil? ||
             disallows_length_of(@minimum - 1, @short_message)
         end

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

@@ -24,12 +24,12 @@ module Shoulda # :nodoc:
           @macro  = macro
           @column = column
         end
-        
+
         def of_type(column_type)
           @column_type = column_type
           self
         end
-        
+
         def with_options(opts = {})
           @precision = opts[:precision]
           @limit     = opts[:limit]
@@ -41,8 +41,8 @@ module Shoulda # :nodoc:
 
         def matches?(subject)
           @subject = subject
-          column_exists? && 
-            correct_column_type? && 
+          column_exists? &&
+            correct_column_type? &&
             correct_precision? &&
             correct_limit? &&
             correct_default? &&
@@ -80,7 +80,7 @@ module Shoulda # :nodoc:
             false
           end
         end
-        
+
         def correct_column_type?
           return true if @column_type.nil?
           if matched_column.type.to_s == @column_type.to_s
@@ -91,7 +91,7 @@ module Shoulda # :nodoc:
             false
           end
         end
-        
+
         def correct_precision?
           return true if @precision.nil?
           if matched_column.precision.to_s == @precision.to_s
@@ -103,7 +103,7 @@ module Shoulda # :nodoc:
             false
           end
         end
-        
+
         def correct_limit?
           return true if @limit.nil?
           if matched_column.limit.to_s == @limit.to_s
@@ -115,7 +115,7 @@ module Shoulda # :nodoc:
             false
           end
         end
-        
+
         def correct_default?
           return true if @default.nil?
           if matched_column.default.to_s == @default.to_s
@@ -127,7 +127,7 @@ module Shoulda # :nodoc:
             false
           end
         end
-        
+
         def correct_null?
           return true if @null.nil?
           if matched_column.null.to_s == @null.to_s
@@ -139,7 +139,7 @@ module Shoulda # :nodoc:
             false
           end
         end
-                
+
         def correct_scale?
           return true if @scale.nil?
           if matched_column.scale.to_s == @scale.to_s
@@ -150,7 +150,7 @@ module Shoulda # :nodoc:
             false
           end
         end
-        
+
         def matched_column
           model_class.columns.detect { |each| each.name == @column.to_s }
         end

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

@@ -27,7 +27,7 @@ module Shoulda # :nodoc:
           @macro = macro
           @columns = normalize_columns_to_array(columns)
         end
-        
+
         def unique(unique)
           @unique = unique
           self
@@ -51,11 +51,11 @@ module Shoulda # :nodoc:
         end
 
         protected
-        
+
         def index_exists?
           ! matched_index.nil?
         end
-        
+
         def correct_unique?
           return true if @unique.nil?
           if matched_index.unique == @unique
@@ -66,7 +66,7 @@ module Shoulda # :nodoc:
             false
           end
         end
-        
+
         def matched_index
           indexes.detect { |each| each.columns == @columns }
         end
@@ -74,11 +74,11 @@ module Shoulda # :nodoc:
         def model_class
           @subject.class
         end
-        
+
         def table_name
           model_class.table_name
         end
-        
+
         def indexes
           ::ActiveRecord::Base.connection.indexes(table_name)
         end
@@ -86,7 +86,7 @@ module Shoulda # :nodoc:
         def expectation
           expected = "#{model_class.name} to #{description}"
         end
-        
+
         def index_type
           case @unique
           when nil
@@ -97,7 +97,7 @@ module Shoulda # :nodoc:
             'unique'
           end
         end
-        
+
         def normalize_columns_to_array(columns)
           if columns.class == Array
             columns.collect { |each| each.to_s }

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

@@ -25,7 +25,7 @@ module Shoulda # :nodoc:
       end
 
       class ValidateFormatOfMatcher < ValidationMatcher # :nodoc:
-        
+
         def initialize(attribute)
           super
         end
@@ -34,13 +34,12 @@ module Shoulda # :nodoc:
           @expected_message = message if message
           self
         end
-        
+
         def with(value)
           raise "You may not call both with and not_with" if @value_to_fail
           @value_to_pass = value
           self
         end
-        
 
         def not_with(value)
           raise "You may not call both with and not_with" if @value_to_pass
@@ -48,7 +47,6 @@ module Shoulda # :nodoc:
           self
         end
 
-
         def matches?(subject)
           super(subject)
           @expected_message ||= :blank

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

@@ -67,8 +67,8 @@ module Shoulda # :nodoc:
         def matches?(subject)
           @subject = subject.class.new
           @expected_message ||= :taken
-          find_existing && 
-            set_scoped_attributes && 
+          find_existing &&
+            set_scoped_attributes &&
             validate_attribute &&
             validate_after_scope_change
         end
@@ -121,7 +121,7 @@ module Shoulda # :nodoc:
               @subject.send("#{scope}=", next_value)
 
               if allows_value_of(existing_value, @expected_message)
-                @negative_failure_message << 
+                @negative_failure_message <<
                   " (with different value of #{scope})"
                 true
               else

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

@@ -18,7 +18,6 @@ module Shoulda # :nodoc:
           @subject = subject
           false
         end
-        
 
         private
 

data/lib/shoulda/assertions.rb

@@ -26,7 +26,7 @@ module Shoulda # :nodoc:
       case x
       when Regexp
         assert(collection.detect { |e| e =~ x }, msg)
-      else         
+      else
         assert(collection.include?(x), msg)
       end
     end
@@ -39,7 +39,7 @@ module Shoulda # :nodoc:
       case x
       when Regexp
         assert(!collection.detect { |e| e =~ x }, msg)
-      else         
+      else
         assert(!collection.include?(x), msg)
       end
     end

data/lib/shoulda/autoload_macros.rb

@@ -1,40 +1,40 @@
 module Shoulda # :nodoc:
-  # Call autoload_macros when you want to load test macros automatically in a non-Rails 
+  # Call autoload_macros when you want to load test macros automatically in a non-Rails
   # project (it's done automatically for Rails projects).
   # You don't need to specify ROOT/test/shoulda_macros explicitly. Your custom macros
   # are loaded automatically when you call autoload_macros.
   #
   # The first argument is the path to you application's root directory.
-  # All following arguments are directories relative to your root, which contain 
-  # shoulda_macros subdirectories. These directories support the same kinds of globs as the 
+  # All following arguments are directories relative to your root, which contain
+  # shoulda_macros subdirectories. These directories support the same kinds of globs as the
   # Dir class.
-  # 
+  #
   # Basic usage (from a test_helper):
   # Shoulda.autoload_macros(File.dirname(__FILE__) + '/..')
-  #	will load everything in 
-  #	- your_app/test/shoulda_macros
+  # will load everything in
+  # - your_app/test/shoulda_macros
   #
-  #	To load vendored macros as well:
+  # To load vendored macros as well:
   # Shoulda.autoload_macros(APP_ROOT, 'vendor/*')
-  #	will load everything in 
-  #	- APP_ROOT/vendor/*/shoulda_macros
-  #	- APP_ROOT/test/shoulda_macros
+  # will load everything in
+  # - APP_ROOT/vendor/*/shoulda_macros
+  # - APP_ROOT/test/shoulda_macros
   #
-  #	To load macros in an app with a vendor directory laid out like Rails':
+  # To load macros in an app with a vendor directory laid out like Rails':
   # Shoulda.autoload_macros(APP_ROOT, 'vendor/{plugins,gems}/*')
   # or
   # Shoulda.autoload_macros(APP_ROOT, 'vendor/plugins/*', 'vendor/gems/*')
-  #	will load everything in 
-  #	- APP_ROOT/vendor/plugins/*/shoulda_macros
-  #	- APP_ROOT/vendor/gems/*/shoulda_macros
-  #	- APP_ROOT/test/shoulda_macros
+  # will load everything in
+  # - APP_ROOT/vendor/plugins/*/shoulda_macros
+  # - APP_ROOT/vendor/gems/*/shoulda_macros
+  # - APP_ROOT/test/shoulda_macros
   #
-  #	If you prefer to stick testing dependencies away from your production dependencies:
+  # If you prefer to stick testing dependencies away from your production dependencies:
   # Shoulda.autoload_macros(APP_ROOT, 'vendor/*', 'test/vendor/*')
-  #	will load everything in 
-  #	- APP_ROOT/vendor/*/shoulda_macros
-  #	- APP_ROOT/test/vendor/*/shoulda_macros
-  #	- APP_ROOT/test/shoulda_macros
+  # will load everything in
+  # - APP_ROOT/vendor/*/shoulda_macros
+  # - APP_ROOT/test/vendor/*/shoulda_macros
+  # - APP_ROOT/test/shoulda_macros
   def self.autoload_macros(root, *dirs)
     dirs << File.join('test')
     complete_dirs = dirs.map{|d| File.join(root, d, 'shoulda_macros')}