email_spec 0.2.0 → 0.2.1

data/History.txt

@@ -3,6 +3,14 @@
  === New features
  === Bufixes
 
+ == 0.2.1 2009-5-29
+
+ === New Features
+  * BCC RSpec matcher. (Josh Nichols)
+
+ === Bugfixes
+  * Include BCCed and CCed messsages in the mailbox. (Jakub Kosiński)
+
 == 0.2.0 2009-6-08
 No changes. Bumping version for RubyForge release.
 
@@ -11,7 +19,7 @@ No changes. Bumping version for RubyForge release.
 
  === Bufixes
   * Require deliveries in the helpers so it doesn't blow up with RSpec. (Craig Webster)
- 
+
  == 0.1.3 2009-4-15
 
  === Bufixes

data/Rakefile

@@ -49,3 +49,10 @@ end
 
 task :default => [:features, :spec, 'example_app:spec']
 
+desc "Cleans the project of any tmp file that should not be included in the gemspec."
+task :clean do
+  %w[*.sqlite3 *.log].each do |pattern|
+    `find . -name "#{pattern}" -delete`
+  end
+end
+

data/lib/email_spec/deliveries.rb

@@ -3,7 +3,7 @@ module EmailSpec
     def all_emails
       ActionMailer::Base.deliveries
     end
-    
+
     def last_email_sent
       ActionMailer::Base.deliveries.last || raise("No email has been sent!")
     end
@@ -11,18 +11,18 @@ module EmailSpec
     def reset_mailer
       ActionMailer::Base.deliveries.clear
     end
-    
+
     def mailbox_for(address)
       address = AddressConverter.instance.convert(address)
-      ActionMailer::Base.deliveries.select { |m| m.to.include?(address) }
+      ActionMailer::Base.deliveries.select { |m| m.to.include?(address) || (m.bcc && m.bcc.include?(address)) || (m.cc && m.cc.include?(address)) }
     end
   end
-  
+
   module ARMailerDeliveries
     def all_emails
       Email.all.map{ |email| parse_to_tmail(email) }
     end
-    
+
     def last_email_sent
       if email = Email.last
         TMail::Mail.parse(email.mail)
@@ -34,22 +34,23 @@ module EmailSpec
     def reset_mailer
       Email.delete_all
     end
-    
+
     def mailbox_for(address)
       address = AddressConverter.instance.convert(address)
-      Email.all.select { |email| email.to.include?(address) }.map{ |email| parse_to_tmail(email) }
+      Email.all.select { |email| email.to.include?(address) || email.bcc.include?(address) || email.cc.include?(address) }.map{ |email| parse_to_tmail(email) }
     end
-    
+
     def parse_to_tmail(email)
       TMail::Mail.parse(email.mail)
-    end    
+    end
   end
-  
+
   module Deliveries
     if ActionMailer::Base.delivery_method == :activerecord
       include EmailSpec::ARMailerDeliveries
     else
       include EmailSpec::TestDeliveries
-    end    
+    end
   end
-end
+end
+

data/lib/email_spec/matchers.rb

@@ -37,6 +37,39 @@ module EmailSpec
 
     alias :be_delivered_to :deliver_to
 
+    class BccTo
+
+      def initialize(expected_email_addresses_or_objects_that_respond_to_email)
+        emails = expected_email_addresses_or_objects_that_respond_to_email.map do |email_or_object|
+          email_or_object.kind_of?(String) ? email_or_object : email_or_object.email
+        end
+
+        @expected_email_addresses = emails.sort
+      end
+
+      def description
+        "be bcc'd to #{@expected_email_addresses.inspect}"
+      end
+
+      def matches?(email)
+        @email = email
+        @actual_recipients = (email.bcc || []).sort
+        @actual_recipients == @expected_email_addresses
+      end
+
+      def failure_message
+        "expected #{@email.inspect} to bcc to #{@expected_email_addresses.inspect}, but it was bcc'd to #{@actual_recipients.inspect}"
+      end
+
+      def negative_failure_message
+        "expected #{@email.inspect} not to bcc to #{@expected_email_addresses.inspect}, but it did"
+      end
+    end
+
+    def bcc_to(*expected_email_addresses_or_objects_that_respond_to_email)
+      BccTo.new(expected_email_addresses_or_objects_that_respond_to_email.flatten)
+    end
+
     def have_subject(expected)
       simple_matcher do |given, matcher|
         given_subject = given.subject

data/spec/email_spec/matchers_spec.rb

@@ -74,6 +74,36 @@ describe EmailSpec::Matchers do
 
   end
 
+  describe "#bcc_to" do
+
+    it "should match when the email is set to deliver to the specidied address" do
+      email = mock_email(:bcc => "jimmy_bean@yahoo.com")
+
+      bcc_to("jimmy_bean@yahoo.com").should match(email)
+    end
+
+    it "should match when a list of emails is exact same as all of the email's recipients" do
+      email = mock_email(:bcc => ["james@yahoo.com", "karen@yahoo.com"])
+
+      bcc_to("karen@yahoo.com", "james@yahoo.com").should match(email)
+      bcc_to("karen@yahoo.com").should_not match(email)
+    end
+
+    it "should match when an array of emails is exact same as all of the email's recipients" do
+      addresses = ["james@yahoo.com", "karen@yahoo.com"]
+      email = mock_email(:bcc => addresses)
+      bcc_to(addresses).should match(email)
+    end
+
+    it "should use the passed in objects :email method if not a string" do
+      email = mock_email(:bcc => "jimmy_bean@yahoo.com")
+      user = mock("user", :email => "jimmy_bean@yahoo.com")
+
+      bcc_to(user).should match(email)
+    end
+
+  end
+
   describe "#have_subject" do
 
     describe "when regexps are used" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: email_spec
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Ben Mabey
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-08 00:00:00 -06:00
+date: 2009-07-18 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -60,8 +60,6 @@ files:
 - examples/rails_root/features/step_definitions/user_steps.rb
 - examples/rails_root/features/step_definitions/webrat_steps.rb
 - examples/rails_root/features/support/env.rb
-- examples/rails_root/log/development.log
-- examples/rails_root/log/test.log
 - examples/rails_root/public/404.html
 - examples/rails_root/public/422.html
 - examples/rails_root/public/500.html

data/examples/rails_root/log/development.log

@@ -1 +0,0 @@
-# Logfile created on Mon Jun 08 20:15:58 -0600 2009

data/examples/rails_root/log/test.log

@@ -1,224 +0,0 @@
-# Logfile created on Mon Jun 08 20:16:03 -0600 2009  SQL (0.3ms)    SELECT name
- FROM sqlite_master
- WHERE type = 'table' AND NOT name = 'sqlite_sequence'
-
-  SQL (0.2ms)   select sqlite_version(*)
-  SQL (2.7ms)   CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
-  SQL (43.5ms)   CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
-  SQL (0.3ms)    SELECT name
- FROM sqlite_master
- WHERE type = 'table' AND NOT name = 'sqlite_sequence'
-
-  SQL (0.1ms)   SELECT version FROM schema_migrations
-Migrating to CreateUsers (20090125013728)
-  SQL (32.4ms)   CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "email" varchar(255), "name" varchar(255)) 
-  SQL (5.7ms)   INSERT INTO schema_migrations (version) VALUES ('20090125013728')
-  SQL (0.4ms)    SELECT name
- FROM sqlite_master
- WHERE type = 'table' AND NOT name = 'sqlite_sequence'
-
-  SQL (0.2ms)   SELECT version FROM schema_migrations
-  SQL (0.2ms)    SELECT name
- FROM sqlite_master
- WHERE type = 'table' AND NOT name = 'sqlite_sequence'
-
-  SQL (0.1ms)   PRAGMA index_list("users")
-REQUESTING PAGE: GET / with {} and HTTP headers {}
-
-
-Processing WelcomeController#index (for 127.0.0.1 at 2009-06-08 20:16:10) [GET]
-Rendering welcome/index
-Completed in 3ms (View: 1, DB: 0) | 200 OK [http://www.example.com/]
-REQUESTING PAGE: POST /welcome/signup with {"Name"=>"", "commit"=>"Sign up", "Email"=>"quentin@example.com"} and HTTP headers {"HTTP_REFERER"=>"/"}
-
-
-Processing WelcomeController#signup (for 127.0.0.1 at 2009-06-08 20:16:10) [POST]
-  Parameters: {"Name"=>"", "commit"=>"Sign up", "Email"=>"quentin@example.com"}
-Sent mail to quentin@example.com
-
-Date: Mon, 8 Jun 2009 20:16:10 -0600
-From: admin@example.com
-To: quentin@example.com
-Subject: Account confirmation
-Mime-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-
-Hello !
-
-<a href="http:///confirm">Click here to confirm your account!</a>
-Rendering welcome/signup
-Completed in 5ms (View: 1, DB: 0) | 200 OK [http://www.example.com/welcome/signup]
-REQUESTING PAGE: GET / with {} and HTTP headers {}
-
-
-Processing WelcomeController#index (for 127.0.0.1 at 2009-06-08 20:16:10) [GET]
-Rendering welcome/index
-Completed in 1ms (View: 1, DB: 0) | 200 OK [http://www.example.com/]
-REQUESTING PAGE: POST /welcome/signup with {"Name"=>"", "commit"=>"Sign up", "Email"=>"quentin@example.com"} and HTTP headers {"HTTP_REFERER"=>"/"}
-
-
-Processing WelcomeController#signup (for 127.0.0.1 at 2009-06-08 20:16:10) [POST]
-  Parameters: {"Name"=>"", "commit"=>"Sign up", "Email"=>"quentin@example.com"}
-Sent mail to quentin@example.com
-
-Date: Mon, 8 Jun 2009 20:16:10 -0600
-From: admin@example.com
-To: quentin@example.com
-Subject: Account confirmation
-Mime-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-
-Hello !
-
-<a href="http:///confirm">Click here to confirm your account!</a>
-Rendering welcome/signup
-Completed in 4ms (View: 0, DB: 0) | 200 OK [http://www.example.com/welcome/signup]
-REQUESTING PAGE: GET / with {} and HTTP headers {}
-
-
-Processing WelcomeController#index (for 127.0.0.1 at 2009-06-08 20:16:10) [GET]
-Rendering welcome/index
-Completed in 1ms (View: 1, DB: 0) | 200 OK [http://www.example.com/]
-REQUESTING PAGE: POST /welcome/signup with {"Name"=>"", "commit"=>"Sign up", "Email"=>"quentin@example.com"} and HTTP headers {"HTTP_REFERER"=>"/"}
-
-
-Processing WelcomeController#signup (for 127.0.0.1 at 2009-06-08 20:16:10) [POST]
-  Parameters: {"Name"=>"", "commit"=>"Sign up", "Email"=>"quentin@example.com"}
-Sent mail to quentin@example.com
-
-Date: Mon, 8 Jun 2009 20:16:10 -0600
-From: admin@example.com
-To: quentin@example.com
-Subject: Account confirmation
-Mime-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-
-Hello !
-
-<a href="http:///confirm">Click here to confirm your account!</a>
-Rendering welcome/signup
-Completed in 4ms (View: 1, DB: 0) | 200 OK [http://www.example.com/welcome/signup]
-REQUESTING PAGE: GET / with {} and HTTP headers {}
-
-
-Processing WelcomeController#index (for 127.0.0.1 at 2009-06-08 20:16:10) [GET]
-Rendering welcome/index
-Completed in 1ms (View: 1, DB: 0) | 200 OK [http://www.example.com/]
-REQUESTING PAGE: POST /welcome/signup with {"Name"=>"", "commit"=>"Sign up", "Email"=>"quentin@example.com"} and HTTP headers {"HTTP_REFERER"=>"/"}
-
-
-Processing WelcomeController#signup (for 127.0.0.1 at 2009-06-08 20:16:10) [POST]
-  Parameters: {"Name"=>"", "commit"=>"Sign up", "Email"=>"quentin@example.com"}
-Sent mail to quentin@example.com
-
-Date: Mon, 8 Jun 2009 20:16:10 -0600
-From: admin@example.com
-To: quentin@example.com
-Subject: Account confirmation
-Mime-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-
-Hello !
-
-<a href="http:///confirm">Click here to confirm your account!</a>
-Rendering welcome/signup
-Completed in 5ms (View: 1, DB: 0) | 200 OK [http://www.example.com/welcome/signup]
-REQUESTING PAGE: GET / with {} and HTTP headers {}
-
-
-Processing WelcomeController#index (for 127.0.0.1 at 2009-06-08 20:16:10) [GET]
-Rendering welcome/index
-Completed in 1ms (View: 1, DB: 0) | 200 OK [http://www.example.com/]
-REQUESTING PAGE: POST /welcome/signup with {"Name"=>"Quentin Jones", "commit"=>"Sign up", "Email"=>"quentin@example.com"} and HTTP headers {"HTTP_REFERER"=>"/"}
-
-
-Processing WelcomeController#signup (for 127.0.0.1 at 2009-06-08 20:16:10) [POST]
-  Parameters: {"Name"=>"Quentin Jones", "commit"=>"Sign up", "Email"=>"quentin@example.com"}
-Sent mail to quentin@example.com
-
-Date: Mon, 8 Jun 2009 20:16:10 -0600
-From: admin@example.com
-To: quentin@example.com
-Subject: Account confirmation
-Mime-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-
-Hello Quentin Jones!
-
-<a href="http:///confirm">Click here to confirm your account!</a>
-Rendering welcome/signup
-Completed in 5ms (View: 1, DB: 0) | 200 OK [http://www.example.com/welcome/signup]
-REQUESTING PAGE: GET /confirm with {} and HTTP headers {"HTTP_REFERER"=>"/welcome/signup"}
-
-
-Processing WelcomeController#confirm (for 127.0.0.1 at 2009-06-08 20:16:10) [GET]
-Rendering welcome/confirm
-Completed in 1ms (View: 1, DB: 0) | 200 OK [http://www.example.com/confirm]
-REQUESTING PAGE: GET / with {} and HTTP headers {}
-
-
-Processing WelcomeController#index (for 127.0.0.1 at 2009-06-08 20:16:10) [GET]
-Rendering welcome/index
-Completed in 1ms (View: 1, DB: 0) | 200 OK [http://www.example.com/]
-REQUESTING PAGE: POST /welcome/signup with {"Name"=>"Quentin Jones", "commit"=>"Sign up", "Email"=>"quentin@example.com"} and HTTP headers {"HTTP_REFERER"=>"/"}
-
-
-Processing WelcomeController#signup (for 127.0.0.1 at 2009-06-08 20:16:10) [POST]
-  Parameters: {"Name"=>"Quentin Jones", "commit"=>"Sign up", "Email"=>"quentin@example.com"}
-Sent mail to quentin@example.com
-
-Date: Mon, 8 Jun 2009 20:16:10 -0600
-From: admin@example.com
-To: quentin@example.com
-Subject: Account confirmation
-Mime-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-
-Hello Quentin Jones!
-
-<a href="http:///confirm">Click here to confirm your account!</a>
-Rendering welcome/signup
-Completed in 4ms (View: 1, DB: 0) | 200 OK [http://www.example.com/welcome/signup]
-REQUESTING PAGE: GET /confirm with {} and HTTP headers {"HTTP_REFERER"=>"/welcome/signup"}
-
-
-Processing WelcomeController#confirm (for 127.0.0.1 at 2009-06-08 20:16:10) [GET]
-Rendering welcome/confirm
-Completed in 1ms (View: 1, DB: 0) | 200 OK [http://www.example.com/confirm]
-REQUESTING PAGE: GET / with {} and HTTP headers {}
-
-
-Processing WelcomeController#index (for 127.0.0.1 at 2009-06-08 20:16:10) [GET]
-Rendering welcome/index
-Completed in 1ms (View: 1, DB: 0) | 200 OK [http://www.example.com/]
-REQUESTING PAGE: POST /welcome/signup with {"Name"=>"Jojo Binks", "commit"=>"Sign up", "Email"=>"jojo@thebinks.com"} and HTTP headers {"HTTP_REFERER"=>"/"}
-
-
-Processing WelcomeController#signup (for 127.0.0.1 at 2009-06-08 20:16:11) [POST]
-  Parameters: {"Name"=>"Jojo Binks", "commit"=>"Sign up", "Email"=>"jojo@thebinks.com"}
-Sent mail to jojo@thebinks.com
-
-Date: Mon, 8 Jun 2009 20:16:11 -0600
-From: admin@example.com
-To: jojo@thebinks.com
-Subject: Account confirmation
-Mime-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-
-Hello Jojo Binks!
-
-<a href="http:///confirm">Click here to confirm your account!</a>
-Rendering welcome/signup
-Completed in 5ms (View: 0, DB: 0) | 200 OK [http://www.example.com/welcome/signup]
-REQUESTING PAGE: GET /confirm with {} and HTTP headers {"HTTP_REFERER"=>"/welcome/signup"}
-
-
-Processing WelcomeController#confirm (for 127.0.0.1 at 2009-06-08 20:16:11) [GET]
-Rendering welcome/confirm
-Completed in 1ms (View: 1, DB: 0) | 200 OK [http://www.example.com/confirm]
-
-
-Processing WelcomeController#signup (for 0.0.0.0 at 2009-06-08 20:16:17) [POST]
-  Parameters: {"Name"=>"Jimmy Bean", "Email"=>"email@example.com"}
-Rendering welcome/signup
-Completed in 3ms (View: 0, DB: 0) | 200 OK [http://test.host/welcome/signup?Email=email%40example.com&Name=Jimmy+Bean]