Assign context to supporting matchers

lib/shoulda/assertions.rb

@@ -46,6 +46,10 @@ def assert_does_not_contain(collection, x, extra_msg = "")
 
     # Asserts that the given matcher returns true when +target+ is passed to #matches?
     def assert_accepts(matcher, target, options = {})
+      if matcher.respond_to?(:in_context)
+        matcher.in_context(self)
+      end
+
       if matcher.matches?(target)
         assert_block { true }
         if options[:message]
@@ -58,6 +62,10 @@ def assert_accepts(matcher, target, options = {})
 
     # Asserts that the given matcher returns false when +target+ is passed to #matches?
     def assert_rejects(matcher, target, options = {})
+      if matcher.respond_to?(:in_context)
+        matcher.in_context(self)
+      end
+
       unless matcher.matches?(target)
         assert_block { true }
         if options[:message]

test/other/helpers_test.rb

@@ -239,6 +239,18 @@ class HelpersTest < ActiveSupport::TestCase # :nodoc:
     end
   end
 
+  should "assign context to a support matching on assert_accepts" do
+    matcher = stub('matcher', :matches? => true)
+    matcher.expects(:in_context).with(self)
+    assert_accepts matcher, nil
+  end
+
+  should "assign context to a support matching on assert_rejects" do
+    matcher = stub('matcher', :matches? => false)
+    matcher.expects(:in_context).with(self)
+    assert_rejects matcher, nil
+  end
+
   context "given one treat exists and one post exists" do
     setup do
       Treat.create!