shoulda-matchers 1.4.2 → 1.5.0

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

@@ -1,7 +1,6 @@
 module Shoulda # :nodoc:
   module Matchers
     module ActionController # :nodoc:
-
       # Ensures a controller redirected to the given url.
       #
       # Example:
@@ -13,7 +12,7 @@ module Shoulda # :nodoc:
       end
 
       class RedirectToMatcher # :nodoc:
-        attr_reader :failure_message, :negative_failure_message
+        attr_reader :failure_message_for_should, :failure_message_for_should_not
 
         def initialize(url_or_description, context, &block)
           if block
@@ -45,10 +44,10 @@ module Shoulda # :nodoc:
         def redirects_to_url?
           begin
             @context.send(:assert_redirected_to, url)
-            @negative_failure_message = "Didn't expect to redirect to #{url}"
+            @failure_message_for_should_not = "Didn't expect to redirect to #{url}"
             true
           rescue Shoulda::Matchers::AssertionError => error
-            @failure_message = error.message
+            @failure_message_for_should = error.message
             false
           end
         end

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

@@ -1,7 +1,6 @@
 module Shoulda # :nodoc:
   module Matchers
     module ActionController # :nodoc:
-
       # Ensures a controller rendered the given template.
       #
       # Example:
@@ -21,7 +20,7 @@ module Shoulda # :nodoc:
       end
 
       class RenderTemplateMatcher # :nodoc:
-        attr_reader :failure_message, :negative_failure_message
+        attr_reader :failure_message_for_should, :failure_message_for_should_not
 
         def initialize(options, message, context)
           @options = options
@@ -49,10 +48,10 @@ module Shoulda # :nodoc:
         def renders_template?
           begin
             @context.send(:assert_template, @options, @message)
-            @negative_failure_message = "Didn't expect to render #{@template}"
+            @failure_message_for_should_not = "Didn't expect to render #{@template}"
             true
           rescue Shoulda::Matchers::AssertionError => error
-            @failure_message = error.message
+            @failure_message_for_should = error.message
             false
           end
         end

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

@@ -33,18 +33,18 @@ module Shoulda # :nodoc:
           rendered_with_layout? && rendered_with_expected_layout?
         end
 
-        def failure_message
+        def failure_message_for_should
           "Expected #{expectation}, but #{result}"
         end
 
-        def negative_failure_message
+        def failure_message_for_should_not
           "Did not expect #{expectation}, but #{result}"
         end
 
         def description
-          description = "render with "
+          description = 'render with '
           if @expected_layout.nil?
-            description << "a layout"
+            description << 'a layout'
           else
             description << "the #{@expected_layout.inspect} layout"
           end
@@ -83,9 +83,9 @@ module Shoulda # :nodoc:
 
         def result
           if rendered_with_layout?
-            "rendered with " + rendered_layouts.map(&:inspect).join(", ")
+            'rendered with ' + rendered_layouts.map(&:inspect).join(', ')
           else
-            "rendered without a layout"
+            'rendered without a layout'
           end
         end
       end

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

@@ -1,3 +1,5 @@
+require 'active_support/deprecation'
+
 module Shoulda # :nodoc:
   module Matchers
     module ActionController # :nodoc:
@@ -23,6 +25,7 @@ module Shoulda # :nodoc:
 
       class RespondWithContentTypeMatcher # :nodoc:
         def initialize(content_type)
+          ActiveSupport::Deprecation.warn 'The respond_with_content_type matcher is deprecated and will be removed in 2.0'
           @content_type = look_up_content_type(content_type)
         end
 
@@ -35,11 +38,11 @@ module Shoulda # :nodoc:
           content_type_matches_regexp? || content_type_matches_string?
         end
 
-        def failure_message
+        def failure_message_for_should
           "Expected #{expectation}"
         end
 
-        def negative_failure_message
+        def failure_message_for_should_not
           "Did not expect #{expectation}"
         end
 

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

@@ -30,11 +30,11 @@ module Shoulda # :nodoc:
           correct_status_code? || correct_status_code_range?
         end
 
-        def failure_message
+        def failure_message_for_should
           "Expected #{expectation}"
         end
 
-        def negative_failure_message
+        def failure_message_for_should_not
           "Did not expect #{expectation}"
         end
 

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

@@ -11,16 +11,16 @@ module Shoulda # :nodoc:
       #
       # Examples:
       #
-      #   it { should route(:get, "/posts").
+      #   it { should route(:get, '/posts').
       #                 to(:controller => :posts, :action => :index) }
-      #   it { should route(:get, "/posts/new").to(:action => :new) }
-      #   it { should route(:post, "/posts").to(:action => :create) }
-      #   it { should route(:get, "/posts/1").to(:action => :show, :id => 1) }
-      #   it { should route(:get, "/posts/1/edit").to(:action => :edit, :id => 1) }
-      #   it { should route(:put, "/posts/1").to(:action => :update, :id => 1) }
-      #   it { should route(:delete, "/posts/1").
+      #   it { should route(:get, '/posts/new').to(:action => :new) }
+      #   it { should route(:post, '/posts').to(:action => :create) }
+      #   it { should route(:get, '/posts/1').to(:action => :show, :id => 1) }
+      #   it { should route(:get, '/posts/1/edit').to(:action => :edit, :id => 1) }
+      #   it { should route(:put, '/posts/1').to(:action => :update, :id => 1) }
+      #   it { should route(:delete, '/posts/1').
       #                 to(:action => :destroy, :id => 1) }
-      #   it { should route(:get, "/users/1/posts/1").
+      #   it { should route(:get, '/users/1/posts/1').
       #                 to(:action => :show, :id => 1, :user_id => 1) }
       def route(method, path)
         RouteMatcher.new(method, path, self)
@@ -33,7 +33,7 @@ module Shoulda # :nodoc:
           @context = context
         end
 
-        attr_reader :failure_message, :negative_failure_message
+        attr_reader :failure_message_for_should, :failure_message_for_should_not
 
         def to(params)
           @params = stringify_params(params)
@@ -80,13 +80,13 @@ module Shoulda # :nodoc:
                           { :method => @method, :path => @path },
                           @params)
 
-            @negative_failure_message = "Didn't expect to #{description}"
+            @failure_message_for_should_not = "Didn't expect to #{description}"
             true
           rescue ::ActionController::RoutingError => error
-            @failure_message = error.message
+            @failure_message_for_should = error.message
             false
           rescue Shoulda::Matchers::AssertionError => error
-            @failure_message = error.message
+            @failure_message_for_should = error.message
             false
           end
         end

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

@@ -32,11 +32,11 @@ module Shoulda # :nodoc:
           assigned_correct_value? || cleared_value?
         end
 
-        def failure_message
+        def failure_message_for_should
           "Expected #{expectation}, but #{result}"
         end
 
-        def negative_failure_message
+        def failure_message_for_should_not
           "Didn't expect #{expectation}, but #{result}"
         end
 
@@ -82,12 +82,11 @@ module Shoulda # :nodoc:
           if @value
             expectation << " to #{@value.inspect}"
           end
-          expectation
         end
 
         def result
           if session.empty?
-            "no session variables were set"
+            'no session variables were set'
           else
             "the session was #{session.inspect}"
           end

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

@@ -8,9 +8,9 @@ module Shoulda # :nodoc:
       # Example:
       #
       #   it { should set_the_flash }
-      #   it { should set_the_flash.to("Thank you for placing this order.") }
+      #   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[:alert].to('Password does not match') }
       #   it { should set_the_flash.to(/logged in/i).now }
       #   it { should_not set_the_flash }
       def set_the_flash
@@ -22,8 +22,6 @@ module Shoulda # :nodoc:
           @options = {}
         end
 
-        attr_reader :failure_message, :negative_failure_message
-
         def to(value)
           if !value.is_a?(String) && !value.is_a?(Regexp)
             raise "cannot match against #{value.inspect}"
@@ -53,11 +51,11 @@ module Shoulda # :nodoc:
           description
         end
 
-        def failure_message
+        def failure_message_for_should
           "Expected #{expectation}"
         end
 
-        def negative_failure_message
+        def failure_message_for_should_not
           "Did not expect #{expectation}"
         end
 
@@ -96,7 +94,8 @@ module Shoulda # :nodoc:
             @flash
           else
             @flash = @controller.flash.dup
-            @flash.instance_variable_set(:@used, @controller.flash.instance_variable_get(:@used).dup)
+            used = @controller.flash.instance_variable_get(:@used).dup
+            @flash.instance_variable_set(:@used, used)
             sweep_flash_if_necessary
             @flash
           end
@@ -117,7 +116,7 @@ module Shoulda # :nodoc:
 
         def flash_description
           if flash.blank?
-            "no flash was set"
+            'no flash was set'
           else
             "was #{flash.inspect}"
           end
@@ -129,9 +128,9 @@ module Shoulda # :nodoc:
 
         def pretty_now
           if @options[:now]
-            ".now"
+            '.now'
           else
-            ""
+            ''
           end
         end
 
@@ -139,7 +138,7 @@ module Shoulda # :nodoc:
           if @options[:key]
             "[:#{@options[:key]}]"
           else
-            ""
+            ''
           end
         end
       end

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

@@ -0,0 +1,121 @@
+require 'bourne'
+require 'active_support/deprecation'
+begin
+  require 'strong_parameters'
+rescue LoadError
+end
+
+module Shoulda
+  module Matchers
+    module ActionController
+      def permit(*attributes)
+        attributes_and_context = attributes + [self]
+        StrongParametersMatcher.new(*attributes_and_context)
+      end
+
+      class StrongParametersMatcher
+        def initialize(*attributes_and_context)
+          ActiveSupport::Deprecation.warn 'The strong_parameters matcher is deprecated and will be removed in 2.0'
+          @attributes = attributes_and_context[0...-1]
+          @context = attributes_and_context.last
+          @permitted_params = []
+        end
+
+        def for(action, options = {})
+          @action = action
+          @verb = options[:verb] || verb_for_action
+          self
+        end
+
+        def in_context(context)
+          @context = context
+          self
+        end
+
+        def matches?(controller = nil)
+          simulate_controller_action && parameters_difference.empty?
+        end
+
+        def does_not_match?(controller = nil)
+          simulate_controller_action && parameters_difference.present?
+        end
+
+        def failure_message
+          "Expected controller to permit #{parameters_difference.to_sentence}, but it did not."
+        end
+
+        def negative_failure_message
+          "Expected controller not to permit #{parameters_difference.to_sentence}, but it did."
+        end
+
+        private
+        attr_reader :verb, :action, :attributes, :context
+        attr_accessor :permitted_params
+
+        def simulate_controller_action
+          ensure_action_and_verb_present!
+          model_attrs = stubbed_model_attributes
+
+          context.send(verb, action)
+
+          verify_permit_call(model_attrs)
+        end
+
+        def verify_permit_call(model_attrs)
+          matcher = Mocha::API::HaveReceived.new(:permit).with do |*params|
+            self.permitted_params = params
+          end
+
+          matcher.matches?(model_attrs)
+        rescue Mocha::ExpectationError
+          false
+        end
+
+        def parameters_difference
+          attributes - permitted_params
+        end
+
+        def stubbed_model_attributes
+          extend Mocha::API
+
+          model_attrs = ::ActionController::Parameters.new(arbitrary_attributes)
+          model_attrs.stubs(:permit)
+          ::ActionController::Parameters.any_instance.stubs(:[]).returns(model_attrs)
+
+          model_attrs
+        end
+
+        def ensure_action_and_verb_present!
+          if action.blank?
+            raise ActionNotDefinedError
+          end
+          if verb.blank?
+            raise VerbNotDefinedError
+          end
+        end
+
+        def arbitrary_attributes
+          {:any_key => 'any_value'}
+        end
+
+        def verb_for_action
+          verb_lookup = { :create => :post, :update => :put }
+          verb_lookup[action]
+        end
+      end
+
+      class StrongParametersMatcher::ActionNotDefinedError < StandardError
+        def message
+          'You must specify the controller action using the #for method.'
+        end
+      end
+
+      class StrongParametersMatcher::VerbNotDefinedError < StandardError
+        def message
+          'You must specify an HTTP verb when using a non-RESTful action.' +
+          ' e.g. for(:authorize, :verb => :post)'
+        end
+      end
+    end
+  end
+end

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

@@ -1,3 +1,5 @@
+require 'active_support/deprecation'
+
 module Shoulda # :nodoc:
   module Matchers
     module ActionMailer # :nodoc:
@@ -24,6 +26,7 @@ module Shoulda # :nodoc:
       class HaveSentEmailMatcher # :nodoc:
 
         def initialize(context)
+          ActiveSupport::Deprecation.warn 'The have_sent_email matcher is deprecated and will be removed in 2.0'
           @context = context
         end
 
@@ -106,16 +109,16 @@ module Shoulda # :nodoc:
           end
         end
 
-        def failure_message
+        def failure_message_for_should
           "Expected #{expectation}"
         end
 
-        def negative_failure_message
+        def failure_message_for_should_not
           "Did not expect #{expectation}"
         end
 
         def description
-          description  = "send an email"
+          description  = 'send an email'
           description << " with a subject of #{@email_subject.inspect}" if @email_subject
           description << " containing #{@body.inspect}" if @body
           if @parts
@@ -136,7 +139,7 @@ module Shoulda # :nodoc:
         private
 
         def expectation
-          expectation = "sent email"
+          expectation = 'sent email'
           expectation << " with subject #{@email_subject.inspect}" if @subject_failed
           expectation << " with body #{@body.inspect}" if @body_failed
           @parts.each do |_, body, content_type|