0
@@ -88,11 +88,36 @@ module ThoughtBot # :nodoc:
0
         assert(num == ActionMailer::Base.deliveries.size, msg)
0
       end
0
 
0
-      # Asserts that the block does not send emails thorough ActionMailer
0
+      # Asserts that an email was delivered.  Can take a blog that can further
0
+      # narrow down the types of emails you're expecting. 
0
       #
0
-      #  assert_does_not_send_email { # do nothing }
0
-      def assert_does_not_send_email(&blk)
0
-        assert_sends_email 0, &blk
0
+      #  assert_sent_email 
0
+      #
0
+      # passes if ActionMailer::Base.deliveries has an email
0
+      #  
0
+      #  assert_sent_email do |email|
0
+      #    email.subject =~ /hi there/ && email.to == 'none@none.com'
0
+      #  end
0
+      #  
0
+      # passes if there is an email with subject containing 'hi there' and
0
+      # recipient equal to 'none@none.com'
0
+      #    
0
+      def assert_sent_email
0
+        emails = ActionMailer::Base.deliveries
0
+        assert !emails.empty?, "No emails were sent"
0
+        if block_given?
0
+          matching_emails = emails.select {|e| yield e }
0
+          assert !matching_emails.empty?, "None of the emails matched."
0
+        end
0
+      end
0
+
0
+      # Asserts that no ActionMailer mails were delivered
0
+      #
0
+      #  assert_did_not_send_email
0
+      def assert_did_not_send_email
0
+        msg = "Sent #{ActionMailer::Base.deliveries.size} emails.\n"
0
+        ActionMailer::Base.deliveries.each { |m| msg << "  '#{m.subject}' sent to #{m.to.to_sentence}\n" }
0
+        assert ActionMailer::Base.deliveries.empty?, msg
0
       end
0
 
0
       def pretty_error_messages(obj)

0
@@ -1,13 +1,53 @@
0
 require File.join(File.dirname(__FILE__), '..', 'test_helper')
0
-
0
-class Val
0
-  @@val = 0
0
-  def self.val; @@val; end
0
-  def self.inc(i=1); @@val += i; end
0
-end
0
+require 'action_mailer'
0
+require 'mocha'
0
 
0
 class HelpersTest < Test::Unit::TestCase # :nodoc:
0
 
0
+  context "given delivered emails" do
0
+    setup do
0
+      email1 = stub(:subject => "one", :to => ["none1@email.com"])
0
+      email2 = stub(:subject => "two", :to => ["none2@email.com"])
0
+      ActionMailer::Base.stubs(:deliveries).returns([email1, email2])
0
+    end
0
+
0
+    should "have sent an email" do
0
+      assert_sent_email
0
+
0
+      assert_raises(Test::Unit::AssertionFailedError) do 
0
+        assert_did_not_send_email
0
+      end
0
+    end
0
+
0
+    should "find email one" do
0
+      assert_sent_email do |e|
0
+        e.subject =~ /one/
0
+      end
0
+    end
0
+
0
+    should "not find an email that doesn't exist" do
0
+      assert_raises(Test::Unit::AssertionFailedError) do 
0
+        assert_sent_email do |e|
0
+          e.subject =~ /whatever/
0
+        end
0
+      end
0
+    end
0
+  end
0
+
0
+  context "when there are no emails" do
0
+    setup do
0
+      ActionMailer::Base.stubs(:deliveries).returns([])
0
+    end
0
+
0
+    should "not have sent an email" do
0
+      assert_did_not_send_email
0
+
0
+      assert_raises(Test::Unit::AssertionFailedError) do 
0
+        assert_sent_email
0
+      end
0
+    end
0
+  end
0
+
0
   context "an array of values" do
0
     setup do
0
       @a = ['abc', 'def', 3]