thoughtbot-shoulda 2.10.2 → 2.11.1

data/lib/shoulda/action_controller/matchers.rb

@@ -6,30 +6,32 @@ require 'shoulda/action_controller/matchers/respond_with_matcher'
 require 'shoulda/action_controller/matchers/respond_with_content_type_matcher'
 require 'shoulda/action_controller/matchers/set_session_matcher'
 require 'shoulda/action_controller/matchers/route_matcher'
+require 'shoulda/action_controller/matchers/redirect_to_matcher'
+require 'shoulda/action_controller/matchers/render_template_matcher'
 
 module Shoulda # :nodoc:
   module ActionController # :nodoc:
 
     # By using the macro helpers you can quickly and easily create concise and
     # easy to read test suites.
-    # 
+    #
     # This code segment:
-    # 
+    #
     #   describe UsersController, "on GET to show with a valid id" do
     #     before(:each) do
     #       get :show, :id => User.first.to_param
     #     end
-    # 
+    #
     #     it { should assign_to(:user) }
     #     it { should respond_with(:success) }
     #     it { should render_template(:show) }
     #     it { should not_set_the_flash) }
-    # 
+    #
     #     it "should do something else really cool" do
     #       assigns[:user].id.should == 1
     #     end
     #   end
-    # 
+    #
     # Would produce 5 tests for the show action
     module Matchers
     end

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

@@ -30,13 +30,15 @@ module Shoulda # :nodoc:
           self
         end
 
-        def with(expected_value)
+        def with(expected_value = nil, &block)
           @expected_value = expected_value
+          @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?
         end
 
@@ -48,6 +50,11 @@ module Shoulda # :nodoc:
           description
         end
 
+        def in_context(context)
+          @context = context
+          self
+        end
+
         private
 
         def assigned_value?
@@ -56,7 +63,7 @@ module Shoulda # :nodoc:
               "Expected action to assign a value for @#{@variable}"
             false
           else
-            @negative_failure_message = 
+            @negative_failure_message =
               "Didn't expect action to assign a value for @#{@variable}, " <<
               "but it was assigned to #{assigned_value.inspect}"
             true
@@ -95,11 +102,7 @@ module Shoulda # :nodoc:
         end
 
         def assigned_value
-          assigns[@variable]
-        end
-
-        def assigns
-          @controller.response.template.assigns 
+          @controller.instance_variable_get("@#{@variable}")
         end
 
       end

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

@@ -37,7 +37,8 @@ module Shoulda # :nodoc:
         private
 
         def filters_params?
-          @controller.respond_to?(:filter_parameters)
+          @controller.respond_to?(:filter_parameters) ||
+            request.respond_to?(:filtered_parameters)
         end
 
         def filters_key?
@@ -45,11 +46,27 @@ module Shoulda # :nodoc:
         end
 
         def filtered_value
+          if request.respond_to?(:filtered_parameters)
+            filtered_request_value
+          else
+            filtered_controller_value
+          end
+        end
+
+        def filtered_controller_value
           filtered = @controller.send(:filter_parameters,
                                       @key.to_s => @key.to_s)
           filtered[@key.to_s]
         end
 
+        def filtered_request_value
+          request.env['action_dispatch.request.parameters'] = { @key.to_s => 'value' }
+          request.filtered_parameters[@key.to_s]
+        end
+
+        def request
+          @request ||= ::ActionController::TestRequest.new
+        end
       end
 
     end

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

@@ -0,0 +1,62 @@
+module Shoulda # :nodoc:
+  module ActionController # :nodoc:
+    module Matchers
+
+      # Ensures a controller redirected to the given url.
+      #
+      # Example:
+      #
+      #   it { should redirect_to('http://somewhere.com')  }
+      #   it { should redirect_to(users_path)  }
+      def redirect_to(url_or_description, &block)
+        RedirectToMatcher.new(url_or_description, self, &block)
+      end
+
+      class RedirectToMatcher # :nodoc:
+
+        def initialize(url_or_description, context, &block)
+          if block
+            @url_block = block
+            @location = @url_or_description
+          else
+            @url = url_or_description
+            @location = @url
+          end
+          @context = context
+        end
+
+        def in_context(context)
+          @context = context
+          self
+        end
+
+        def matches?(controller)
+          @controller = controller
+          redirects_to_url?
+        end
+
+        attr_reader :failure_message, :negative_failure_message
+
+        def description
+          "redirect to #{@location}"
+        end
+
+        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}"
+            true
+          rescue Test::Unit::AssertionFailedError => error
+            @failure_message = error.message
+            false
+          end
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,54 @@
+module Shoulda # :nodoc:
+  module ActionController # :nodoc:
+    module Matchers
+
+      # Ensures a controller rendered the given template.
+      #
+      # Example:
+      #
+      #   it { should render_template(:show)  }
+      def render_template(template)
+        RenderTemplateMatcher.new(template, self)
+      end
+
+      class RenderTemplateMatcher # :nodoc:
+
+        def initialize(template, context)
+          @template = template.to_s
+          @context  = context
+        end
+
+        def matches?(controller)
+          @controller = controller
+          renders_template?
+        end
+
+        attr_reader :failure_message, :negative_failure_message
+
+        def description
+          "render template #{@template}"
+        end
+
+        def in_context(context)
+          @context = context
+          self
+        end
+
+        private
+
+        def renders_template?
+          begin
+            @context.send(:assert_template, @template)
+            @negative_failure_message = "Didn't expect to render #{@template}"
+            true
+          rescue Test::Unit::AssertionFailedError => error
+            @failure_message = error.message
+            false
+          end
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -9,14 +9,21 @@ module Shoulda # :nodoc:
       #   it { should render_with_layout }
       #   it { should render_with_layout(:special) }
       #   it { should_not render_with_layout }
-      def render_with_layout(layout = nil)
-        RenderWithLayout.new(layout)
+      def render_with_layout(expected_layout = nil)
+        RenderWithLayout.new(expected_layout)
       end
 
       class RenderWithLayout # :nodoc:
 
-        def initialize(layout)
-          @layout = layout.to_s unless layout.nil?
+        def initialize(expected_layout)
+          @expected_layout = expected_layout.to_s unless expected_layout.nil?
+        end
+
+        # Used to provide access to layouts recorded by
+        # ActionController::TemplateAssertions in Rails 3
+        def in_context(context)
+          @context = context
+          self
         end
 
         def matches?(controller)
@@ -34,10 +41,10 @@ module Shoulda # :nodoc:
 
         def description
           description = "render with "
-          if @layout.nil?
+          if @expected_layout.nil?
             description << "a layout"
           else
-            description << "the #{@layout.inspect} layout"
+            description << "the #{@expected_layout.inspect} layout"
           end
           description
         end
@@ -45,20 +52,30 @@ module Shoulda # :nodoc:
         private
 
         def rendered_with_layout?
-          !layout.blank?
+          !rendered_layouts.empty?
         end
 
         def rendered_with_expected_layout?
-          return true if @layout.nil?
-          layout == @layout
+          return true if @expected_layout.nil?
+          rendered_layouts.include?(@expected_layout)
         end
 
-        def layout
-          layout = @controller.response.layout
-          if layout.nil?
-            nil
+        def rendered_layouts
+          if recorded_layouts
+            recorded_layouts.keys.compact.map { |layout| layout.sub(%r{^layouts/}, '') }
           else
-            layout.split('/').last
+            layout = @controller.response.layout
+            if layout.nil?
+              []
+            else
+              [layout.split('/').last]
+            end
+          end
+        end
+
+        def recorded_layouts
+          if @context
+            @context.instance_variable_get('@layouts')
           end
         end
 
@@ -68,7 +85,8 @@ module Shoulda # :nodoc:
 
         def result
           if rendered_with_layout?
-            "rendered with the #{layout.inspect} layout"
+            "rendered with " <<
+              rendered_layouts.map { |layout| layout.inspect }.join(", ")
           else
             "rendered without a layout"
           end

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

@@ -34,7 +34,7 @@ module Shoulda # :nodoc:
         def description
           "respond with content type of #{@content_type}"
         end
-        
+
         def matches?(controller)
           @controller = controller
           if @content_type.is_a?(Regexp)
@@ -43,32 +43,32 @@ module Shoulda # :nodoc:
             response_content_type == @content_type
           end
         end
-        
+
         def failure_message
           "Expected #{expectation}"
         end
-        
+
         def negative_failure_message
           "Did not expect #{expectation}"
         end
-        
+
         protected
-        
+
         def response_content_type
-          @controller.response.content_type
+          @controller.response.content_type.to_s
         end
-        
+
         def lookup_by_extension(extension)
           Mime::Type.lookup_by_extension(extension.to_s).to_s
         end
-        
+
         def expectation
           "content type to be #{@content_type}, " <<
           "but was #{response_content_type}"
         end
-        
+
       end
-      
+
     end
   end
 end

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

@@ -24,16 +24,16 @@ module Shoulda # :nodoc:
         def initialize(status)
           @status = symbol_to_status_code(status)
         end
-        
+
         def matches?(controller)
           @controller = controller
           correct_status_code? || correct_status_code_range?
         end
-        
+
         def failure_message
           "Expected #{expectation}"
         end
-        
+
         def negative_failure_message
           "Did not expect #{expectation}"
         end
@@ -41,41 +41,45 @@ module Shoulda # :nodoc:
         def description
           "respond with #{@status}"
         end
-        
+
         protected
-        
+
         def correct_status_code?
           response_code == @status
         end
-        
+
         def correct_status_code_range?
           @status.is_a?(Range) &&
             @status.include?(response_code)
         end
-        
+
         def response_code
           @controller.response.response_code
         end
-        
+
         def symbol_to_status_code(potential_symbol)
           case potential_symbol
           when :success  then 200
           when :redirect then 300..399
           when :missing  then 404
           when :error    then 500..599
-          when Symbol 
-            ::ActionController::StatusCodes::SYMBOL_TO_STATUS_CODE[potential_symbol]
+          when Symbol
+            if defined?(::Rack::Utils::SYMBOL_TO_STATUS_CODE)
+              ::Rack::Utils::SYMBOL_TO_STATUS_CODE[potential_symbol]
+            else
+              ::ActionController::Base::SYMBOL_TO_STATUS_CODE[potential_symbol]
+            end
           else
             potential_symbol
           end
         end
-        
+
         def expectation
           "response to be a #{@status}, but was #{response_code}"
         end
-        
+
       end
-      
+
     end
   end
 end