shoulda 2.10.3 → 2.11.0

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

@@ -55,7 +55,7 @@ module Shoulda # :nodoc:
         protected
         
         def response_content_type
-          @controller.response.content_type
+          @controller.response.content_type.to_s
         end
         
         def lookup_by_extension(extension)

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

@@ -64,7 +64,11 @@ module Shoulda # :nodoc:
           when :missing  then 404
           when :error    then 500..599
           when Symbol 
-            ::ActionController::StatusCodes::SYMBOL_TO_STATUS_CODE[potential_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

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

@@ -36,6 +36,7 @@ module Shoulda # :nodoc:
 
         def to(params)
           @params = params
+          stringify_params!
           self
         end
 
@@ -47,7 +48,6 @@ module Shoulda # :nodoc:
         def matches?(controller)
           @controller = controller
           guess_controller!
-          stringify_params!
           route_recognized?
         end
 

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

@@ -19,13 +19,15 @@ module Shoulda # :nodoc:
           @key = key.to_s
         end
 
-        def to(value)
+        def to(value = nil, &block)
           @value = value
+          @value_block = block
           self
         end
 
         def matches?(controller)
           @controller = controller
+          @value = @context.instance_eval(&@value_block) if @value_block
           (assigned_value? && assigned_correct_value?) || cleared_value?
         end
 
@@ -43,6 +45,11 @@ module Shoulda # :nodoc:
           description
         end
 
+        def in_context(context)
+          @context = context
+          self
+        end
+
         private
 
         def assigned_value?
@@ -63,7 +70,11 @@ module Shoulda # :nodoc:
         end
 
         def session
-          @controller.response.session.data
+          if @controller.request.respond_to?(:session)
+            @controller.request.session.to_hash
+          else
+            @controller.response.session.data
+          end
         end
 
         def expectation

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

@@ -60,7 +60,7 @@ module Shoulda # :nodoc:
         end
 
         def flash
-          @controller.response.session['flash']
+          @controller.send(:flash)
         end
 
         def expectation

data/lib/shoulda/action_mailer.rb

@@ -1,10 +1,13 @@
 require 'shoulda'
 require 'shoulda/action_mailer/assertions'
+require 'shoulda/action_mailer/matchers'
 
 module Test # :nodoc: all
   module Unit
     class TestCase
       include Shoulda::ActionMailer::Assertions
+      include Shoulda::ActionMailer::Matchers
+      extend Shoulda::ActionMailer::Matchers
     end
   end
 end

data/lib/shoulda/action_mailer/assertions.rb

@@ -16,6 +16,7 @@ module Shoulda # :nodoc:
       # 'none@none.com' as one of the recipients.
       #
       def assert_sent_email
+      ::ActiveSupport::Deprecation.warn("use: should have_sent_email")
         emails = ::ActionMailer::Base.deliveries
         assert !emails.empty?, "No emails were sent"
         if block_given?
@@ -24,10 +25,13 @@ module Shoulda # :nodoc:
         end
       end
 
+      # should have_sent_email.with_subject(/hi there/).to('none@none.com').from('noreply@example.com').with_body(/reach out/)
+
       # Asserts that no ActionMailer mails were delivered
       #
       #  assert_did_not_send_email
       def assert_did_not_send_email
+        ::ActiveSupport::Deprecation.warn("use: should_not have_sent_email")
         msg = "Sent #{::ActionMailer::Base.deliveries.size} emails.\n"
         ::ActionMailer::Base.deliveries.each { |m| msg << "  '#{m.subject}' sent to #{m.to.to_sentence}\n" }
         assert ::ActionMailer::Base.deliveries.empty?, msg

data/lib/shoulda/action_mailer/matchers.rb

@@ -0,0 +1,22 @@
+require 'shoulda/action_mailer/matchers/have_sent_email'
+
+module Shoulda # :nodoc:
+  module ActionMailer # :nodoc:
+    # = Matchers for your mailers
+    #
+    # This matcher will test that email is sent properly
+    #
+    #   describe User do
+    #     it { should have_sent_email.with_subject(/is spam$/) }
+    #     it { should have_sent_email.from('do-not-reply@example.com') }
+    #     it { should have_sent_email.with_body(/is spam\./) }
+    #     it { should have_sent_email.to('myself@me.com') }
+    #     it { should have_sent_email.with_subject(/spam/).
+    #                                 from('do-not-reply@example.com').
+    #                                 with_body(/spam/).
+    #                                 to('myself@me.com') }
+    #   end
+    module Matchers
+    end
+  end
+end

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

@@ -0,0 +1,119 @@
+module Shoulda # :nodoc:
+  module ActionMailer # :nodoc:
+    module Matchers
+
+      # The right email is sent.
+      #
+      #   it { should have_sent_email.with_subject(/is spam$/) }
+      #   it { should have_sent_email.from('do-not-reply@example.com') }
+      #   it { should have_sent_email.with_body(/is spam\./) }
+      #   it { should have_sent_email.to('myself@me.com') }
+      #   it { should have_sent_email.with_subject(/spam/).
+      #                               from('do-not-reply@example.com').
+      #                               with_body(/spam/).
+      #                               to('myself@me.com') }
+      def have_sent_email
+        HaveSentEmailMatcher.new
+      end
+
+      class HaveSentEmailMatcher # :nodoc:
+
+        def initialize
+        end
+
+        def with_subject(email_subject)
+          @email_subject = email_subject
+          self
+        end
+
+        def from(sender)
+          @sender = sender
+          self
+        end
+
+        def with_body(body)
+          @body = body
+          self
+        end
+
+        def to(recipient)
+          @recipient = recipient
+          self
+        end
+
+        def matches?(subject)
+          ::ActionMailer::Base.deliveries.each do |mail|
+            @subject_failed = !regexp_or_string_match(mail.subject, @email_subject) if @email_subject
+            @body_failed = !regexp_or_string_match(mail.body, @body) if @body
+            @sender_failed = !regexp_or_string_match_in_array(mail.from, @sender) if @sender
+            @recipient_failed = !regexp_or_string_match_in_array(mail.to, @recipient) if @recipient
+            return true unless anything_failed?
+          end
+
+          false
+        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
+        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
+        end
+
+        def description
+          "send an email"
+        end
+
+        private
+
+        def anything_failed?
+          @subject_failed || @body_failed || @sender_failed || @recipient_failed
+        end
+
+        def regexp_or_string_match(a_string, a_regexp_or_string)
+          case a_regexp_or_string
+          when Regexp
+            a_string =~ a_regexp_or_string
+          when String
+            a_string == a_regexp_or_string
+          end
+        end
+
+        def regexp_or_string_match_in_array(an_array, a_regexp_or_string)
+          case a_regexp_or_string
+          when Regexp
+            an_array.detect{|e| e =~ a_regexp_or_string}.any?
+          when String
+            an_array.include?(a_regexp_or_string)
+          end
+        end
+      end
+    end
+  end
+end
+

data/lib/shoulda/active_record/helpers.rb

@@ -17,7 +17,12 @@ module Shoulda # :nodoc:
       #   default_error_message(:too_long, :count => 60)
       def default_error_message(key, values = {})
         if Object.const_defined?(:I18n) # Rails >= 2.2
-          I18n.translate("activerecord.errors.messages.#{key}", values)
+          result = I18n.translate("activerecord.errors.messages.#{key}", values)
+          if result =~ /^translation missing/
+            I18n.translate("errors.messages.#{key}", values)
+          else
+            result
+          end
         else # Rails <= 2.1.x
           ::ActiveRecord::Errors.default_error_messages[key] % values[:count]
         end

data/lib/shoulda/active_record/macros.rb

@@ -23,6 +23,8 @@ module Shoulda # :nodoc:
       include Helpers
       include Matchers
 
+      # Deprecated: use ActiveRecord::Matchers#validate_presence_of instead.
+      #
       # Ensures that the model cannot be saved if one of the attributes listed is not present.
       #
       # Options:
@@ -33,21 +35,20 @@ module Shoulda # :nodoc:
       #   should_validate_presence_of :name, :phone_number
       #
       def should_validate_presence_of(*attributes)
+        ::ActiveSupport::Deprecation.warn("use: should validate_presence_of")
         message = get_options!(attributes, :message)
 
         attributes.each do |attribute|
-          matcher = validate_presence_of(attribute).with_message(message)
-          should matcher.description do
-            assert_accepts(matcher, subject)
-          end
+          should validate_presence_of(attribute).with_message(message)
         end
       end
-      
+
+      # Deprecated: use ActiveRecord::Matchers#validate_uniqueness_of instead.
+      #
       # Ensures that the model cannot be saved if one of the attributes listed is not unique.
       # Requires an existing record
       #
       # Options:
-
       # * <tt>:message</tt> - value the test expects to find in <tt>errors.on(:attribute)</tt>.
       #   Regexp or string.  Default = <tt>I18n.translate('activerecord.errors.messages.taken')</tt>
       # * <tt>:scoped_to</tt> - field(s) to scope the uniqueness to.
@@ -62,6 +63,7 @@ module Shoulda # :nodoc:
       #   should_validate_uniqueness_of :email, :case_sensitive => false
       #
       def should_validate_uniqueness_of(*attributes)
+        ::ActiveSupport::Deprecation.warn("use: should validate_uniqueness_of")
         message, scope, case_sensitive = get_options!(attributes, :message, :scoped_to, :case_sensitive)
         scope = [*scope].compact
         case_sensitive = true if case_sensitive.nil?
@@ -70,57 +72,57 @@ module Shoulda # :nodoc:
           matcher = validate_uniqueness_of(attribute).
             with_message(message).scoped_to(scope)
           matcher = matcher.case_insensitive unless case_sensitive
-          should matcher.description do
-            assert_accepts(matcher, subject)
-          end
+          should matcher
         end
       end
 
+      # Deprecated: use ActiveRecord::Matchers#allow_mass_assignment_of instead.
+      #
       # Ensures that the attribute can be set on mass update.
       #
       #   should_allow_mass_assignment_of :first_name, :last_name
       #
       def should_allow_mass_assignment_of(*attributes)
+        ::ActiveSupport::Deprecation.warn("use: should allow_mass_assignment_of")
         get_options!(attributes)
 
         attributes.each do |attribute|
-          matcher = allow_mass_assignment_of(attribute)
-          should matcher.description do
-            assert_accepts matcher, subject
-          end
+          should allow_mass_assignment_of(attribute)
         end
       end
 
+      # Deprecated: use ActiveRecord::Matchers#allow_mass_assignment_of instead.
+      #
       # Ensures that the attribute cannot be set on mass update.
       #
       #   should_not_allow_mass_assignment_of :password, :admin_flag
       #
       def should_not_allow_mass_assignment_of(*attributes)
+        ::ActiveSupport::Deprecation.warn("use: should_not allow_mass_assignment_of")
         get_options!(attributes)
 
         attributes.each do |attribute|
-          matcher = allow_mass_assignment_of(attribute)
-          should "not #{matcher.description}" do
-            assert_rejects matcher, subject
-          end
+          should_not allow_mass_assignment_of(attribute)
         end
       end
 
+      # Deprecated: use ActiveRecord::Matchers#have_readonly_attribute instead.
+      #
       # Ensures that the attribute cannot be changed once the record has been created.
       #
       #   should_have_readonly_attributes :password, :admin_flag
       #
       def should_have_readonly_attributes(*attributes)
+        ::ActiveSupport::Deprecation.warn("use: should have_readonly_attribute")
         get_options!(attributes)
 
         attributes.each do |attribute|
-          matcher = have_readonly_attribute(attribute)
-          should matcher.description do
-            assert_accepts matcher, subject
-          end
+          should have_readonly_attribute(attribute)
         end
       end
 
+      # Deprecated: use ActiveRecord::Matchers#allow_value instead.
+      #
       # Ensures that the attribute cannot be set to the given values
       #
       # Options:
@@ -132,30 +134,30 @@ module Shoulda # :nodoc:
       #   should_not_allow_values_for :isbn, "bad 1", "bad 2"
       #
       def should_not_allow_values_for(attribute, *bad_values)
+        ::ActiveSupport::Deprecation.warn("use: should_not allow_value")
         message = get_options!(bad_values, :message)
         bad_values.each do |value|
-          matcher = allow_value(value).for(attribute).with_message(message)
-          should "not #{matcher.description}" do
-            assert_rejects matcher, subject
-          end
+          should_not allow_value(value).for(attribute).with_message(message)
         end
       end
 
+      # Deprecated: use ActiveRecord::Matchers#allow_value instead.
+      #
       # Ensures that the attribute can be set to the given values.
       #
       # Example:
       #   should_allow_values_for :isbn, "isbn 1 2345 6789 0", "ISBN 1-2345-6789-0"
       #
       def should_allow_values_for(attribute, *good_values)
+        ::ActiveSupport::Deprecation.warn("use: should allow_value")
         get_options!(good_values)
         good_values.each do |value|
-          matcher = allow_value(value).for(attribute)
-          should matcher.description do
-            assert_accepts matcher, subject
-          end
+          should allow_value(value).for(attribute)
         end
       end
 
+      # Deprecated: use ActiveRecord::Matchers#ensure_length_of instead.
+      #
       # Ensures that the length of the attribute is in the given range
       #
       # Options:
@@ -168,20 +170,19 @@ module Shoulda # :nodoc:
       #   should_ensure_length_in_range :password, (6..20)
       #
       def should_ensure_length_in_range(attribute, range, opts = {})
-        short_message, long_message = get_options!([opts], 
+        ::ActiveSupport::Deprecation.warn("use: should ensure_length_of.is_at_least.is_at_most")
+        short_message, long_message = get_options!([opts],
                                                    :short_message,
                                                    :long_message)
-        matcher = ensure_length_of(attribute).
+        should ensure_length_of(attribute).
           is_at_least(range.first).
           with_short_message(short_message).
           is_at_most(range.last).
           with_long_message(long_message)
-
-        should matcher.description do
-          assert_accepts matcher, subject
-        end
       end
 
+      # Deprecated: use ActiveRecord::Matchers#ensure_length_of instead.
+      #
       # Ensures that the length of the attribute is at least a certain length
       #
       # Options:
@@ -192,17 +193,16 @@ module Shoulda # :nodoc:
       #   should_ensure_length_at_least :name, 3
       #
       def should_ensure_length_at_least(attribute, min_length, opts = {})
+        ::ActiveSupport::Deprecation.warn("use: should ensure_length_of.is_at_least")
         short_message = get_options!([opts], :short_message)
 
-        matcher = ensure_length_of(attribute).
+        should ensure_length_of(attribute).
           is_at_least(min_length).
           with_short_message(short_message)
-
-        should matcher.description do
-          assert_accepts matcher, subject
-        end
       end
 
+      # Deprecated: use ActiveRecord::Matchers#ensure_length_of instead.
+      #
       # Ensures that the length of the attribute is exactly a certain length
       #
       # Options:
@@ -213,16 +213,15 @@ module Shoulda # :nodoc:
       #   should_ensure_length_is :ssn, 9
       #
       def should_ensure_length_is(attribute, length, opts = {})
+        ::ActiveSupport::Deprecation.warn("use: should ensure_length_of.is_equal_to")
         message = get_options!([opts], :message)
-        matcher = ensure_length_of(attribute).
+        should ensure_length_of(attribute).
           is_equal_to(length).
           with_message(message)
-
-        should matcher.description do
-          assert_accepts matcher, subject
-        end
       end
 
+      # Deprecated: use ActiveRecord::Matchers#ensure_inclusion_of instead.
+      #
       # Ensure that the attribute is in the range specified
       #
       # Options:
@@ -235,20 +234,20 @@ module Shoulda # :nodoc:
       #   should_ensure_value_in_range :age, (0..100)
       #
       def should_ensure_value_in_range(attribute, range, opts = {})
+        ::ActiveSupport::Deprecation.warn("use: should ensure_inclusion_of.in_range")
         message, low_message, high_message = get_options!([opts],
                                                           :message,
                                                           :low_message,
                                                           :high_message)
-        matcher = ensure_inclusion_of(attribute).
+        should ensure_inclusion_of(attribute).
           in_range(range).
           with_message(message).
           with_low_message(low_message).
           with_high_message(high_message)
-        should matcher.description do
-          assert_accepts matcher, subject
-        end
       end
 
+      # Deprecated: use ActiveRecord::Matchers#validate_numericality_of instead.
+      #
       # Ensure that the attribute is numeric
       #
       # Options:
@@ -259,16 +258,16 @@ module Shoulda # :nodoc:
       #   should_validate_numericality_of :age
       #
       def should_validate_numericality_of(*attributes)
+        ::ActiveSupport::Deprecation.warn("use: should validate_numericality_of")
         message = get_options!(attributes, :message)
         attributes.each do |attribute|
-          matcher = validate_numericality_of(attribute).
+          should validate_numericality_of(attribute).
             with_message(message)
-          should matcher.description do
-            assert_accepts matcher, subject
-          end
         end
       end
 
+      # Deprecated: use ActiveRecord::Matchers#have_many instead.
+      #
       # Ensures that the has_many relationship exists.  Will also test that the
       # associated table has the required columns.  Works with polymorphic
       # associations.
@@ -283,15 +282,15 @@ module Shoulda # :nodoc:
       #   should_have_many :enemies, :dependent => :destroy
       #
       def should_have_many(*associations)
+        ::ActiveSupport::Deprecation.warn("use: should have_many")
         through, dependent = get_options!(associations, :through, :dependent)
         associations.each do |association|
-          matcher = have_many(association).through(through).dependent(dependent)
-          should matcher.description do
-            assert_accepts(matcher, subject)
-          end
+          should have_many(association).through(through).dependent(dependent)
         end
       end
 
+      # Deprecated: use ActiveRecord::Matchers#have_one instead.
+      #
       # Ensure that the has_one relationship exists.  Will also test that the
       # associated table has the required columns.  Works with polymorphic
       # associations.
@@ -303,50 +302,51 @@ module Shoulda # :nodoc:
       #   should_have_one :god # unless hindu
       #
       def should_have_one(*associations)
+        ::ActiveSupport::Deprecation.warn("use: should have_one")
         dependent, through = get_options!(associations, :dependent, :through)
         associations.each do |association|
-          matcher = have_one(association).dependent(dependent).through(through)
-          should matcher.description do
-            assert_accepts(matcher, subject)
-          end
+          should have_one(association).dependent(dependent).through(through)
         end
       end
 
+      # Deprecated: use ActiveRecord::Matchers#have_and_belong_to_many instead.
+      #
       # Ensures that the has_and_belongs_to_many relationship exists, and that the join
       # table is in place.
       #
       #   should_have_and_belong_to_many :posts, :cars
       #
       def should_have_and_belong_to_many(*associations)
+        ::ActiveSupport::Deprecation.warn("use: should have_and_belong_to_many")
         get_options!(associations)
 
         associations.each do |association|
-          matcher = have_and_belong_to_many(association)
-          should matcher.description do
-            assert_accepts(matcher, subject)
-          end
+          should have_and_belong_to_many(association)
         end
       end
 
+      # Deprecated: use ActiveRecord::Matchers#belong_to instead.
+      #
       # Ensure that the belongs_to relationship exists.
       #
       #   should_belong_to :parent
       #
       def should_belong_to(*associations)
+        ::ActiveSupport::Deprecation.warn("use: should belong_to")
         dependent = get_options!(associations, :dependent)
         associations.each do |association|
-          matcher = belong_to(association).dependent(dependent)
-          should matcher.description do
-            assert_accepts(matcher, subject)
-          end
+          should belong_to(association).dependent(dependent)
         end
       end
 
+      # Deprecated.
+      #
       # Ensure that the given class methods are defined on the model.
       #
       #   should_have_class_methods :find, :destroy
       #
       def should_have_class_methods(*methods)
+        ::ActiveSupport::Deprecation.warn
         get_options!(methods)
         klass = described_type
         methods.each do |method|
@@ -356,11 +356,14 @@ module Shoulda # :nodoc:
         end
       end
 
+      # Deprecated.
+      #
       # Ensure that the given instance methods are defined on the model.
       #
       #   should_have_instance_methods :email, :name, :name=
       #
       def should_have_instance_methods(*methods)
+        ::ActiveSupport::Deprecation.warn
         get_options!(methods)
         klass = described_type
         methods.each do |method|
@@ -370,6 +373,8 @@ module Shoulda # :nodoc:
         end
       end
 
+      # Deprecated: use ActiveRecord::Matchers#have_db_column instead.
+      #
       # 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: 
@@ -384,23 +389,23 @@ module Shoulda # :nodoc:
       #   should_have_db_column :admin,  :default => false, :null => false
       #
       def should_have_db_columns(*columns)
+        ::ActiveSupport::Deprecation.warn("use: should have_db_column")
         column_type, precision, limit, default, null, scale, sql_type = 
           get_options!(columns, :type, :precision, :limit,
                                 :default, :null, :scale, :sql_type)
         columns.each do |name|
-          matcher = have_db_column(name).
+          should have_db_column(name).
                       of_type(column_type).
                       with_options(:precision => precision, :limit    => limit,
                                    :default   => default,   :null     => null,
                                    :scale     => scale,     :sql_type => sql_type)
-          should matcher.description do
-            assert_accepts(matcher, subject)
-          end
         end
       end
-      
+
       alias_method :should_have_db_column, :should_have_db_columns
 
+      # Deprecated: use ActiveRecord::Matchers#have_db_index instead.
+      #
       # Ensures that there are DB indices on the given columns or tuples of columns.
       # Also aliased to should_have_db_index for readability
       #
@@ -418,32 +423,18 @@ module Shoulda # :nodoc:
       #   should_have_db_index :ssn, :unique => true
       #
       def should_have_db_indices(*columns)
+        ::ActiveSupport::Deprecation.warn("use: should have_db_index")
         unique = get_options!(columns, :unique)
-        
+
         columns.each do |column|
-          matcher = have_db_index(column).unique(unique)
-          should matcher.description do
-            assert_accepts(matcher, subject)
-          end
+          should have_db_index(column).unique(unique)
         end
       end
 
       alias_method :should_have_db_index, :should_have_db_indices
 
-      # Deprecated. See should_have_db_index
-      def should_have_index(*args)
-        warn "[DEPRECATION] should_have_index is deprecated. " <<
-             "Use should_have_db_index instead."
-        should_have_db_index(*args)
-      end
-
-      # Deprecated. See should_have_db_indices
-      def should_have_indices(*args)
-        warn "[DEPRECATION] should_have_indices is deprecated. " <<
-             "Use should_have_db_indices instead."
-        should_have_db_indices(*args)
-      end
-
+      # Deprecated: use ActiveRecord::Matchers#validate_acceptance_of instead.
+      #
       # Ensures that the model cannot be saved if one of the attributes listed is not accepted.
       #
       # Options:
@@ -454,57 +445,11 @@ module Shoulda # :nodoc:
       #   should_validate_acceptance_of :eula
       #
       def should_validate_acceptance_of(*attributes)
+        ::ActiveSupport::Deprecation.warn("use: should validate_acceptance_of")
         message = get_options!(attributes, :message)
 
         attributes.each do |attribute|
-          matcher = validate_acceptance_of(attribute).with_message(message)
-          should matcher.description do
-            assert_accepts matcher, subject
-          end
-        end
-      end
-
-      # Deprecated.
-      #
-      # Ensures that the model has a method named scope_name that returns a NamedScope object with the
-      # proxy options set to the options you supply.  scope_name can be either a symbol, or a method
-      # call which will be evaled against the model.  The eval'd method call has access to all the same
-      # instance variables that a should statement would.
-      #
-      # Options: Any of the options that the named scope would pass on to find.
-      #
-      # Example:
-      #
-      #   should_have_named_scope :visible, :conditions => {:visible => true}
-      #
-      # Passes for
-      #
-      #   named_scope :visible, :conditions => {:visible => true}
-      #
-      # Or for
-      #
-      #   def self.visible
-      #     scoped(:conditions => {:visible => true})
-      #   end
-      #
-      # You can test lambdas or methods that return ActiveRecord#scoped calls:
-      #
-      #   should_have_named_scope 'recent(5)', :limit => 5
-      #   should_have_named_scope 'recent(1)', :limit => 1
-      #
-      # Passes for
-      #   named_scope :recent, lambda {|c| {:limit => c}}
-      #
-      # Or for
-      #
-      #   def self.recent(c)
-      #     scoped(:limit => c)
-      #   end
-      #
-      def should_have_named_scope(scope_call, find_options = nil)
-        matcher = have_named_scope(scope_call).finding(find_options)
-        should matcher.description do
-          assert_accepts matcher.in_context(self), subject
+          should validate_acceptance_of(attribute).with_message(message)
         end
       end
     end