shoulda-matchers 1.0.0 → 1.1.0

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

@@ -20,6 +20,7 @@ module Shoulda # :nodoc:
       end
 
       class AssignToMatcher # :nodoc:
+        attr_reader :failure_message, :negative_failure_message
 
         def initialize(variable)
           @variable    = variable.to_s
@@ -44,8 +45,6 @@ module Shoulda # :nodoc:
           assigned_value? && kind_of_expected_class? && equal_to_expected_value?
         end
 
-        attr_reader :failure_message, :negative_failure_message
-
         def description
           description = "assign @#{@variable}"
           description << " with a kind of #{@expected_class}" if @expected_class
@@ -60,15 +59,15 @@ module Shoulda # :nodoc:
         private
 
         def assigned_value?
-          if !@controller.instance_variables.map(&:to_s).include?("@#{@variable}")
-            @failure_message =
-              "Expected action to assign a value for @#{@variable}"
-            false
-          else
+          if @controller.instance_variables.map(&:to_s).include?("@#{@variable}")
             @negative_failure_message =
               "Didn't expect action to assign a value for @#{@variable}, " <<
               "but it was assigned to #{assigned_value.inspect}"
             true
+          else
+            @failure_message =
+              "Expected action to assign a value for @#{@variable}"
+            false
           end
         end
 
@@ -106,9 +105,7 @@ module Shoulda # :nodoc:
         def assigned_value
           @controller.instance_variable_get("@#{@variable}")
         end
-
       end
-
     end
   end
 end

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

@@ -12,7 +12,6 @@ module Shoulda # :nodoc:
       end
 
       class FilterParamMatcher # :nodoc:
-
         def initialize(key)
           @key = key.to_s
         end
@@ -41,10 +40,9 @@ module Shoulda # :nodoc:
         end
 
         def filtered_keys
-          Rails.application.config.filter_parameters.map { |filter| filter.to_s }
+          Rails.application.config.filter_parameters.map(&:to_s)
         end
       end
-
     end
   end
 end

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

@@ -13,6 +13,7 @@ module Shoulda # :nodoc:
       end
 
       class RedirectToMatcher # :nodoc:
+        attr_reader :failure_message, :negative_failure_message
 
         def initialize(url_or_description, context, &block)
           if block
@@ -35,8 +36,6 @@ module Shoulda # :nodoc:
           redirects_to_url?
         end
 
-        attr_reader :failure_message, :negative_failure_message
-
         def description
           "redirect to #{@location}"
         end
@@ -44,10 +43,9 @@ module Shoulda # :nodoc:
         private
 
         def redirects_to_url?
-          @url = @context.instance_eval(&@url_block) if @url_block
           begin
-            @context.send(:assert_redirected_to, @url)
-            @negative_failure_message = "Didn't expect to redirect to #{@url}"
+            @context.send(:assert_redirected_to, url)
+            @negative_failure_message = "Didn't expect to redirect to #{url}"
             true
           rescue Shoulda::Matchers::AssertionError => error
             @failure_message = error.message
@@ -55,8 +53,14 @@ module Shoulda # :nodoc:
           end
         end
 
+        def url
+          if @url_block
+            @context.instance_eval(&@url_block)
+          else
+            @url
+          end
+        end
       end
-
     end
   end
 end

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

@@ -21,6 +21,7 @@ module Shoulda # :nodoc:
       end
 
       class RenderTemplateMatcher # :nodoc:
+        attr_reader :failure_message, :negative_failure_message
 
         def initialize(options, message, context)
           @options = options
@@ -34,8 +35,6 @@ module Shoulda # :nodoc:
           renders_template?
         end
 
-        attr_reader :failure_message, :negative_failure_message
-
         def description
           "render template #{@template}"
         end
@@ -57,9 +56,7 @@ module Shoulda # :nodoc:
             false
           end
         end
-
       end
-
     end
   end
 end

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

@@ -56,8 +56,11 @@ module Shoulda # :nodoc:
         end
 
         def rendered_with_expected_layout?
-          return true if @expected_layout.nil?
-          rendered_layouts.include?(@expected_layout)
+          if @expected_layout.nil?
+            true
+          else
+            rendered_layouts.include?(@expected_layout)
+          end
         end
 
         def rendered_layouts
@@ -85,15 +88,12 @@ module Shoulda # :nodoc:
 
         def result
           if rendered_with_layout?
-            "rendered with " <<
-              rendered_layouts.map { |layout| layout.inspect }.join(", ")
+            "rendered with " + rendered_layouts.map(&:inspect).join(", ")
           else
             "rendered without a layout"
           end
         end
-
       end
-
     end
   end
 end

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

@@ -22,13 +22,8 @@ module Shoulda # :nodoc:
       end
 
       class RespondWithContentTypeMatcher # :nodoc:
-
         def initialize(content_type)
-          @content_type = if content_type.is_a?(Symbol)
-            lookup_by_extension(content_type)
-          else
-            content_type
-          end
+          @content_type = look_up_content_type(content_type)
         end
 
         def description
@@ -58,17 +53,23 @@ module Shoulda # :nodoc:
           @controller.response.content_type.to_s
         end
 
-        def lookup_by_extension(extension)
+        def look_up_by_extension(extension)
           Mime::Type.lookup_by_extension(extension.to_s).to_s
         end
 
+        def look_up_content_type(content_type)
+          if content_type.is_a?(Symbol)
+            look_up_by_extension(content_type)
+          else
+            content_type
+          end
+        end
+
         def expectation
           "content type to be #{@content_type}, " <<
-          "but was #{response_content_type}"
+            "but was #{response_content_type}"
         end
-
       end
-
     end
   end
 end

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

@@ -77,9 +77,7 @@ module Shoulda # :nodoc:
         def expectation
           "response to be a #{@status}, but was #{response_code}"
         end
-
       end
-
     end
   end
 end

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

@@ -27,16 +27,16 @@ module Shoulda # :nodoc:
       end
 
       class RouteMatcher # :nodoc:
-
         def initialize(method, path, context)
           @method  = method
           @path    = path
           @context = context
         end
 
+        attr_reader :failure_message, :negative_failure_message
+
         def to(params)
-          @params = params
-          stringify_params!
+          @params = stringify_params(params)
           self
         end
 
@@ -46,26 +46,31 @@ module Shoulda # :nodoc:
         end
 
         def matches?(controller)
-          @controller = controller
-          guess_controller!
+          guess_controller!(controller)
           route_recognized?
         end
 
-        attr_reader :failure_message, :negative_failure_message
-
         def description
           "route #{@method.to_s.upcase} #{@path} to/from #{@params.inspect}"
         end
 
         private
 
-        def guess_controller!
-          @params[:controller] ||= @controller.controller_path
+        def guess_controller!(controller)
+          @params[:controller] ||= controller.controller_path
         end
 
-        def stringify_params!
-          @params.each do |key, value|
-            @params[key] = value.is_a?(Array) ? value.collect {|v| v.to_param } : value.to_param
+        def stringify_params(params)
+          params.each do |key, value|
+            params[key] = stringify(value)
+          end
+        end
+
+        def stringify(value)
+          if value.is_a?(Array)
+            value.map(&:to_param)
+          else
+            value.to_param
           end
         end
 
@@ -85,9 +90,7 @@ module Shoulda # :nodoc:
             false
           end
         end
-
       end
-
     end
   end
 end

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

@@ -14,7 +14,6 @@ module Shoulda # :nodoc:
       end
 
       class SetSessionMatcher # :nodoc:
-
         def initialize(key)
           @key = key.to_s
         end
@@ -27,8 +26,10 @@ module Shoulda # :nodoc:
 
         def matches?(controller)
           @controller = controller
-          @value = @context.instance_eval(&@value_block) if @value_block
-          (assigned_value? && assigned_correct_value?) || cleared_value?
+          if @value_block
+            @value = @context.instance_eval(&@value_block)
+          end
+          assigned_correct_value? || cleared_value?
         end
 
         def failure_message
@@ -41,7 +42,9 @@ module Shoulda # :nodoc:
 
         def description
           description = "set session variable #{@key.inspect}"
-          description << " to #{@value.inspect}" if defined?(@value)
+          if @value
+            description << " to #{@value.inspect}"
+          end
           description
         end
 
@@ -61,25 +64,24 @@ module Shoulda # :nodoc:
         end
 
         def assigned_correct_value?
-          return true if @value.nil?
-          assigned_value == @value
+          if assigned_value?
+            if @value.nil?
+              true
+            else
+              assigned_value == @value
+            end
+          end
         end
 
         def assigned_value
           session[@key]
         end
 
-        def session
-          if @controller.request.respond_to?(:session)
-            @controller.request.session.to_hash
-          else
-            @controller.response.session.data
-          end
-        end
-
         def expectation
           expectation = "session variable #{@key} to be set"
-          expectation << " to #{@value.inspect}" if @value
+          if @value
+            expectation << " to #{@value.inspect}"
+          end
           expectation
         end
 
@@ -91,8 +93,14 @@ module Shoulda # :nodoc:
           end
         end
 
+        def session
+          if @controller.request.respond_to?(:session)
+            @controller.request.session.to_hash
+          else
+            @controller.response.session.data
+          end
+        end
       end
-
     end
   end
 end

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

@@ -10,6 +10,7 @@ module Shoulda # :nodoc:
       #   it { should set_the_flash }
       #   it { should set_the_flash.to("Thank you for placing this order.") }
       #   it { should set_the_flash.to(/created/i) }
+      #   it { should set_the_flash[:alert].to("Password doesn't match") }
       #   it { should set_the_flash.to(/logged in/i).now }
       #   it { should_not set_the_flash }
       def set_the_flash
@@ -17,6 +18,7 @@ module Shoulda # :nodoc:
       end
 
       class SetTheFlashMatcher # :nodoc:
+        attr_reader :failure_message, :negative_failure_message
 
         def to(value)
           @value = value
@@ -28,15 +30,18 @@ module Shoulda # :nodoc:
           self
         end
 
+        def [](key)
+          @key = key
+          self
+        end
+
         def matches?(controller)
           @controller = controller
           sets_the_flash? && string_value_matches? && regexp_value_matches?
         end
 
-        attr_reader :failure_message, :negative_failure_message
-
         def description
-          description = "set the flash"
+          description = "set the #{expected_flash_invocation}"
           description << " to #{@value.inspect}" unless @value.nil?
           description
         end
@@ -52,29 +57,48 @@ module Shoulda # :nodoc:
         private
 
         def sets_the_flash?
-          !flash.blank?
+          flash_values.any?
         end
 
         def string_value_matches?
-          return true unless String === @value
-          flash.to_hash.values.any? {|value| value == @value }
+          if @value.is_a?(String)
+            flash_values.any? {|value| value == @value }
+          else
+            true
+          end
         end
 
         def regexp_value_matches?
-          return true unless Regexp === @value
-          flash.to_hash.values.any? {|value| value =~ @value }
+          if @value.is_a?(Regexp)
+            flash_values.any? {|value| value =~ @value }
+          else
+            true
+          end
+        end
+
+        def flash_values
+          if @key
+            [flash.to_hash[@key]]
+          else
+            flash.to_hash.values
+          end
         end
 
         def flash
-          return @flash if @flash
-          @flash = @controller.flash.dup
-          @flash.instance_variable_set(:@used, @controller.flash.instance_variable_get(:@used).dup)
-          @flash.sweep unless @now
-          @flash
+          if @flash
+            @flash
+          else
+            @flash = @controller.flash.dup
+            @flash.instance_variable_set(:@used, @controller.flash.instance_variable_get(:@used).dup)
+            if ! @now
+              @flash.sweep
+            end
+            @flash
+          end
         end
 
         def expectation
-          expectation = "the flash#{".now" if @now} to be set"
+          expectation = "the #{expected_flash_invocation} to be set"
           expectation << " to #{@value.inspect}" unless @value.nil?
           expectation << ", but #{flash_description}"
           expectation
@@ -88,8 +112,21 @@ module Shoulda # :nodoc:
           end
         end
 
-      end
+        def expected_flash_invocation
+          now = ""
+          key = ""
 
+          if @now
+            now = ".now"
+          end
+
+          if @key
+            key = "[:#{@key}]"
+          end
+
+          "flash#{now}#{key}"
+        end
+      end
     end
   end
 end