bmabey-email_spec 0.3.3 → 0.3.4

data/History.txt

@@ -3,6 +3,11 @@
  === New features
  === Bufixes
 
+== 0.3.4 2009-09-26
+
+=== Bugfixes
+ * Typo and logic fixes for DeliverFrom matcher. (Yury Kotlyarov)
+
  == 0.3.3 2009-09-18
 
  === New features

data/README.rdoc

@@ -8,12 +8,12 @@ A collection of RSpec matchers and Cucumber steps to make testing emails go smoo
   script/plugin install git://github.com/bmabey/email-spec.git
 
 === Gem Setup
-  
+
   gem install bmabey-email_spec
 
   # config/environments/test.rb
   config.gem 'bmabey-email_spec', :lib => 'email_spec'
-  
+
 === Cucumber
 
 To use the steps in features put the following in your env.rb:
@@ -21,7 +21,7 @@ To use the steps in features put the following in your env.rb:
   # Make sure this require is after you require cucumber/rails/world.
   require 'email_spec/cucumber'
 
-This will load all the helpers that the steps rely on. 
+This will load all the helpers that the steps rely on.
 It will also add a Before hook for Cucumber so that emails are cleared at the start of each scenario.
 
 Then:
@@ -32,7 +32,7 @@ This will give you a bunch of steps to get started with in step_definitions/emai
 
 === RSpec
 
-	First you need to require the helpers and matchers in your spec_helper.rb like so:
+  First you need to require the helpers and matchers in your spec_helper.rb like so:
 
   require "email_spec/helpers"
   require "email_spec/matchers"
@@ -95,11 +95,11 @@ For more examples, check out examples/rails_root in the source for a small examp
       before(:all) do
         @email = UserMailer.create_signup("jojo@yahoo.com", "Jojo Binks")
       end
-      
+
       it "should be set to be delivered to the email passed in" do
         @email.should deliver_to("jojo@yahoo.com")
       end
-      
+
       it "should contain the user's message in the mail body" do
         @email.should have_text(/Jojo Binks/)
       end
@@ -107,14 +107,14 @@ For more examples, check out examples/rails_root in the source for a small examp
       it "should contain a link to the confirmation link" do
         @email.should have_text(/#{confirm_account_url}/)
       end
-      
+
       it "should have the correct subject" do
         @email.should have_subject(/Account confirmation/)
       end
-      
+
     end
-     
-    ==== Using the helpers when not testing in isolation ==== 
+
+    ==== Using the helpers when not testing in isolation ====
 
       Don't. :)  Seriously, if you do just take a look at the helpers and use them as you wish.
 

data/lib/email_spec/matchers.rb

@@ -23,7 +23,7 @@ module EmailSpec
       end
 
       def failure_message
-        "expected #{@email.inspect} to deliver to #{@expected_email_addresses.inspect}, but it delievered to #{@actual_recipients.inspect}"
+        "expected #{@email.inspect} to deliver to #{@expected_email_addresses.inspect}, but it delivered to #{@actual_recipients.inspect}"
       end
 
       def negative_failure_message
@@ -54,7 +54,7 @@ module EmailSpec
       end
 
       def failure_message
-        "expected #{@email.inspect} to deliver from #{@expected_email_addresses.inspect}, but it delievered from #{@actual_recipients.inspect}"
+        "expected #{@email.inspect} to deliver from #{@expected_email_addresses.inspect}, but it delivered from #{@actual_sender.inspect}"
       end
 
       def negative_failure_message

data/spec/email_spec/matchers_spec.rb

@@ -71,6 +71,12 @@ describe EmailSpec::Matchers do
       deliver_to(user).should match(email)
     end
 
+    it "should give correct failure message when the email is not set to deliver to the specified address" do
+      matcher = deliver_to("jimmy_bean@yahoo.com")
+      matcher.matches?(mock_email(:inspect => 'email', :to => 'freddy_noe@yahoo.com'))
+      matcher.failure_message.should == %{expected email to deliver to ["jimmy_bean@yahoo.com"], but it delivered to ["freddy_noe@yahoo.com"]}
+    end
+
   end
 
   describe "#deliver_from" do
@@ -83,6 +89,13 @@ describe EmailSpec::Matchers do
       email = mock_email(:from => nil)
       deliver_from("jimmy_bean@yahoo.com").should_not match(email)
     end
+
+    it "should give correct failure message when the email is not set to deliver from the specified address" do
+      matcher = deliver_from("jimmy_bean@yahoo.com")
+      matcher.matches?(mock_email(:inspect => 'email', :from => ['freddy_noe@yahoo.com']))
+      matcher.failure_message.should == %{expected email to deliver from "jimmy_bean@yahoo.com", but it delivered from "freddy_noe@yahoo.com"}
+    end
+
   end
 
   describe "#bcc_to" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bmabey-email_spec
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - Ben Mabey
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-18 00:00:00 -07:00
+date: 2009-09-26 00:00:00 -07:00
 default_executable: 
 dependencies: []