shoulda-matchers 1.1.0 → 1.2.0

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

@@ -24,30 +24,35 @@ module Shoulda # :nodoc:
 
         def initialize(variable)
           @variable    = variable.to_s
-          @check_value = false
+          @options = {}
+          @options[:check_value] = false
         end
 
         def with_kind_of(expected_class)
-          @expected_class = expected_class
+          @options[:expected_class] = expected_class
           self
         end
 
         def with(expected_value = nil, &block)
-          @check_value       = true
-          @expected_value    = expected_value
-          @expectation_block = block
+          @options[:check_value] = true
+          @options[:expected_value] = expected_value
+          @options[:expectation_block] = block
           self
         end
 
         def matches?(controller)
           @controller = controller
-          @expected_value = @context.instance_eval(&@expectation_block) if @expectation_block
-          assigned_value? && kind_of_expected_class? && equal_to_expected_value?
+          normalize_expected_value!
+          assigned_value? &&
+            kind_of_expected_class? &&
+            equal_to_expected_value?
         end
 
         def description
           description = "assign @#{@variable}"
-          description << " with a kind of #{@expected_class}" if @expected_class
+          if @options.key?(:expected_class)
+            description << " with a kind of #{@options[:expected_class]}"
+          end
           description
         end
 
@@ -72,33 +77,45 @@ module Shoulda # :nodoc:
         end
 
         def kind_of_expected_class?
-          return true unless @expected_class
-          if assigned_value.kind_of?(@expected_class)
-            @negative_failure_message =
-              "Didn't expect action to assign a kind of #{@expected_class} " <<
-              "for #{@variable}, but got one anyway"
-            true
+          if @options.key?(:expected_class)
+            if assigned_value.kind_of?(@options[:expected_class])
+              @negative_failure_message =
+                "Didn't expect action to assign a kind of #{@options[:expected_class]} " <<
+                "for #{@variable}, but got one anyway"
+              true
+            else
+              @failure_message =
+                "Expected action to assign a kind of #{@options[:expected_class]} " <<
+                "for #{@variable}, but got #{assigned_value.inspect} " <<
+                "(#{assigned_value.class.name})"
+              false
+            end
           else
-            @failure_message =
-              "Expected action to assign a kind of #{@expected_class} " <<
-              "for #{@variable}, but got #{assigned_value.inspect} " <<
-              "(#{assigned_value.class.name})"
-            false
+            true
           end
         end
 
         def equal_to_expected_value?
-          return true unless @check_value
-          if @expected_value == assigned_value
-            @negative_failure_message =
-              "Didn't expect action to assign #{@expected_value.inspect} " <<
-              "for #{@variable}, but got it anyway"
-            true
+          if @options[:check_value]
+            if @options[:expected_value] == assigned_value
+              @negative_failure_message =
+                "Didn't expect action to assign #{@options[:expected_value].inspect} " <<
+                "for #{@variable}, but got it anyway"
+              true
+            else
+              @failure_message =
+                "Expected action to assign #{@options[:expected_value].inspect} " <<
+                "for #{@variable}, but got #{assigned_value.inspect}"
+              false
+            end
           else
-            @failure_message =
-              "Expected action to assign #{@expected_value.inspect} " <<
-              "for #{@variable}, but got #{assigned_value.inspect}"
-            false
+            true
+          end
+        end
+
+        def normalize_expected_value!
+          if @options[:expectation_block]
+            @options[:expected_value] = @context.instance_eval(&@options[:expectation_block])
           end
         end
 

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

@@ -16,7 +16,9 @@ module Shoulda # :nodoc:
       class RenderWithLayoutMatcher # :nodoc:
 
         def initialize(expected_layout)
-          @expected_layout = expected_layout.to_s unless expected_layout.nil?
+          unless expected_layout.nil?
+            @expected_layout = expected_layout.to_s
+          end
         end
 
         # Used to provide access to layouts recorded by
@@ -64,7 +66,7 @@ module Shoulda # :nodoc:
         end
 
         def rendered_layouts
-          if recorded_layouts
+          if recorded_layouts.size > 0
             recorded_layouts.keys.compact.map { |layout| layout.sub(%r{^layouts/}, '') }
           else
             layout = @controller.response.layout
@@ -79,6 +81,8 @@ module Shoulda # :nodoc:
         def recorded_layouts
           if @context
             @context.instance_variable_get('@layouts')
+          else
+            {}
           end
         end
 

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

@@ -32,11 +32,7 @@ module Shoulda # :nodoc:
 
         def matches?(controller)
           @controller = controller
-          if @content_type.is_a?(Regexp)
-            response_content_type =~ @content_type
-          else
-            response_content_type == @content_type
-          end
+          content_type_matches_regexp? || content_type_matches_string?
         end
 
         def failure_message
@@ -49,6 +45,16 @@ module Shoulda # :nodoc:
 
         protected
 
+        def content_type_matches_regexp?
+          if @content_type.is_a?(Regexp)
+            response_content_type =~ @content_type
+          end
+        end
+
+        def content_type_matches_string?
+          response_content_type == @content_type
+        end
+
         def response_content_type
           @controller.response.content_type.to_s
         end
@@ -66,8 +72,7 @@ module Shoulda # :nodoc:
         end
 
         def expectation
-          "content type to be #{@content_type}, " <<
-            "but was #{response_content_type}"
+          "content type to be #{@content_type}, but was #{response_content_type}"
         end
       end
     end

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

@@ -18,6 +18,10 @@ module Shoulda # :nodoc:
       end
 
       class SetTheFlashMatcher # :nodoc:
+        def initialize
+          @options = {}
+        end
+
         attr_reader :failure_message, :negative_failure_message
 
         def to(value)
@@ -26,12 +30,12 @@ module Shoulda # :nodoc:
         end
 
         def now
-          @now = true
+          @options[:now] = true
           self
         end
 
         def [](key)
-          @key = key
+          @options[:key] = key
           self
         end
 
@@ -77,8 +81,8 @@ module Shoulda # :nodoc:
         end
 
         def flash_values
-          if @key
-            [flash.to_hash[@key]]
+          if @options.key?(:key)
+            [flash.to_hash[@options[:key]]]
           else
             flash.to_hash.values
           end
@@ -90,13 +94,17 @@ module Shoulda # :nodoc:
           else
             @flash = @controller.flash.dup
             @flash.instance_variable_set(:@used, @controller.flash.instance_variable_get(:@used).dup)
-            if ! @now
-              @flash.sweep
-            end
+            sweep_flash_if_necessary
             @flash
           end
         end
 
+        def sweep_flash_if_necessary
+          unless @options[:now]
+            @flash.sweep
+          end
+        end
+
         def expectation
           expectation = "the #{expected_flash_invocation} to be set"
           expectation << " to #{@value.inspect}" unless @value.nil?
@@ -113,18 +121,23 @@ module Shoulda # :nodoc:
         end
 
         def expected_flash_invocation
-          now = ""
-          key = ""
+          "flash#{pretty_now}#{pretty_key}"
+        end
 
-          if @now
-            now = ".now"
+        def pretty_now
+          if @options[:now]
+            ".now"
+          else
+            ""
           end
+        end
 
-          if @key
-            key = "[:#{@key}]"
+        def pretty_key
+          if @options[:key]
+            "[:#{@key}]"
+          else
+            ""
           end
-
-          "flash#{now}#{key}"
         end
       end
     end

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

@@ -101,7 +101,7 @@ module Shoulda # :nodoc:
 
         def matches?(subject)
           normalize_blocks
-          ::ActionMailer::Base.deliveries.all? do |mail|
+          ::ActionMailer::Base.deliveries.any? do |mail|
             mail_matches?(mail)
           end
         end

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

@@ -20,19 +20,19 @@ module Shoulda # :nodoc:
 
         def initialize(attribute)
           @attribute = attribute.to_s
+          @options = {}
         end
 
         def as(role)
-          unless at_least_rails_3_1?
-            raise "You can specify role only in Rails 3.1 or greater" 
+          if active_model_less_than_3_1?
+            raise "You can specify role only in Rails 3.1 or greater"
           end
-          @role = role
+          @options[:role] = role
           self
         end
 
         def matches?(subject)
           @subject = subject
-          @role ||= :default
           if attr_mass_assignable?
             if whitelisting?
               @negative_failure_message = "#{@attribute} was made accessible"
@@ -62,6 +62,10 @@ module Shoulda # :nodoc:
 
         private
 
+        def role
+          @options[:role] || :default
+        end
+
         def protected_attributes
           @protected_attributes ||= (@subject.class.protected_attributes || [])
         end
@@ -79,10 +83,10 @@ module Shoulda # :nodoc:
         end
 
         def authorizer
-          if at_least_rails_3_1?
-            @subject.class.active_authorizer[@role]
-          else
+          if active_model_less_than_3_1?
             @subject.class.active_authorizer
+          else
+            @subject.class.active_authorizer[role]
           end
         end
 
@@ -90,8 +94,8 @@ module Shoulda # :nodoc:
           @subject.class.name
         end
 
-        def at_least_rails_3_1?
-          ::ActiveModel::VERSION::MAJOR == 3 && ::ActiveModel::VERSION::MINOR >= 1
+        def active_model_less_than_3_1?
+          ::ActiveModel::VERSION::STRING.to_f < 3.1
         end
       end
     end

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

@@ -29,6 +29,7 @@ module Shoulda # :nodoc:
 
         def initialize(*values)
           @values_to_match = values
+          @options = {}
         end
 
         def for(attribute)
@@ -37,7 +38,7 @@ module Shoulda # :nodoc:
         end
 
         def with_message(message)
-          @expected_message = message
+          @options[:expected_message] = message
           self
         end
 
@@ -69,7 +70,7 @@ module Shoulda # :nodoc:
             false
           else
             if expected_message
-              errors_match_regexp? || errors_match_string?
+              @matched_error = errors_match_regexp? || errors_match_string?
             else
               errors_for_attribute.compact.any?
             end
@@ -87,13 +88,13 @@ module Shoulda # :nodoc:
 
         def errors_match_regexp?
           if Regexp === expected_message
-            @matched_error = errors_for_attribute.detect { |e| e =~ expected_message }
+            errors_for_attribute.detect { |e| e =~ expected_message }
           end
         end
 
         def errors_match_string?
           if errors_for_attribute.include?(expected_message)
-            @matched_error = expected_message
+            expected_message
           end
         end
 
@@ -119,11 +120,11 @@ module Shoulda # :nodoc:
         end
 
         def expected_message
-          if @expected_message
-            if Symbol === @expected_message
-              default_error_message(@expected_message, :model_name => model_name, :attribute => @attribute)
+          if @options.key?(:expected_message)
+            if Symbol === @options[:expected_message]
+              default_error_message(@options[:expected_message], :model_name => model_name, :attribute => @attribute)
             else
-              @expected_message
+              @options[:expected_message]
             end
           end
         end

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

@@ -38,8 +38,6 @@ module Shoulda # :nodoc:
         def matches?(subject)
           super(subject)
 
-          @expected_message ||= :exclusion
-
           allows_lower_value &&
             disallows_minimum_value &&
             allows_higher_value &&
@@ -49,19 +47,23 @@ module Shoulda # :nodoc:
         private
 
         def allows_lower_value
-          @minimum == 0 || allows_value_of(@minimum - 1, @expected_message)
+          @minimum == 0 || allows_value_of(@minimum - 1, expected_message)
         end
 
         def allows_higher_value
-          allows_value_of(@maximum + 1, @expected_message)
+          allows_value_of(@maximum + 1, expected_message)
         end
 
         def disallows_minimum_value
-          disallows_value_of(@minimum, @expected_message)
+          disallows_value_of(@minimum, expected_message)
         end
 
         def disallows_maximum_value
-          disallows_value_of(@maximum, @expected_message)
+          disallows_value_of(@maximum, expected_message)
+        end
+
+        def expected_message
+          @expected_message || :exclusion
         end
       end
 

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

@@ -5,6 +5,7 @@ module Shoulda # :nodoc:
       # Ensure that the attribute's value is in the range specified
       #
       # Options:
+      # * <tt>in_array</tt> - the range of allowed values for this attribute
       # * <tt>in_range</tt> - the range of allowed values for this attribute
       # * <tt>with_low_message</tt> - value the test expects to find in
       #   <tt>errors.on(:attribute)</tt>. Regexp or string. Defaults to the
@@ -21,6 +22,15 @@ module Shoulda # :nodoc:
       end
 
       class EnsureInclusionOfMatcher < ValidationMatcher # :nodoc:
+        def initialize(attribute)
+          super(attribute)
+          @options = {}
+        end
+
+        def in_array(array)
+          @array = array
+          self
+        end
 
         def in_range(range)
           @range = range
@@ -29,6 +39,16 @@ module Shoulda # :nodoc:
           self
         end
 
+        def allow_blank(allow_blank = true)
+          @options[:allow_blank] = allow_blank
+          self
+        end
+
+        def allow_nil(allow_nil = true)
+          @options[:allow_nil] = allow_nil
+          self
+        end
+
         def with_message(message)
           if message
             @low_message = message
@@ -48,23 +68,58 @@ module Shoulda # :nodoc:
         end
 
         def description
-          "ensure inclusion of #{@attribute} in #{@range.inspect}"
+          "ensure inclusion of #{@attribute} in #{inspect_message}"
         end
 
         def matches?(subject)
           super(subject)
 
-          @low_message  ||= :inclusion
-          @high_message ||= :inclusion
-
-          disallows_lower_value &&
-            allows_minimum_value &&
-            disallows_higher_value &&
-            allows_maximum_value
+          if @range
+            @low_message  ||= :inclusion
+            @high_message ||= :inclusion
+
+            disallows_lower_value &&
+              allows_minimum_value &&
+              disallows_higher_value &&
+              allows_maximum_value
+          elsif @array
+            if allows_all_values_in_array? && allows_blank_value? && allows_nil_value?
+              true
+            else
+              @failure_message = "#{@array} doesn't match array in validation"
+              false
+            end
+          end
         end
 
         private
 
+        def allows_blank_value?
+          if @options.key?(:allow_blank)
+            @options[:allow_blank] == allows_value_of('')
+          else
+            true
+          end
+        end
+
+        def allows_nil_value?
+          if @options.key?(:allow_nil)
+            @options[:allow_nil] == allows_value_of(nil)
+          else
+            true
+          end
+        end
+
+        def inspect_message
+          @range.nil? ? @array.inspect : @range.inspect
+        end
+
+        def allows_all_values_in_array?
+          @array.all? do |value|
+            allows_value_of(value, @low_message)
+          end
+        end
+
         def disallows_lower_value
           @minimum == 0 || disallows_value_of(@minimum - 1, @low_message)
         end