email_spec 1.0.1 → 1.1.1

data/History.txt

@@ -1,4 +1,16 @@
-== 1.x (git)
+== 1.2 (git)
+
+== 1.1.1 2010-12-29
+  * Require "action_mailer" to avoid deprecation warnings. (Ryan Bigg)
+  * Relaxes pessimistic version dependency on RSpec. (GH-41 Dan Pickett)
+
+== 1.1.0 2010-12-20
+
+ === Bugfixes
+  * anchor tags are no longer ignored when clicking links in emails (Anders Törnqist and Nicklas Ramhöj)
+  * set_current_email handles cases where To to blank but may contain CC, or BCC recipients (Murray Steele)
+  * Doc fixes (Florent Guilleux)
+
 
 == 1.0 2010-07-31 Rails 3.0 Release
   This release makes email-spec compatible with Rails 3 and RSpec 2.x.
@@ -39,7 +51,7 @@
  === Changes
   * Deprecated steps were removed. (Kieran Pilkington)
 
- === Bufixes
+ === Bugfixes
 
 == 0.5.0 2010-02-22
 
@@ -52,10 +64,10 @@
     * "save and open all html emails"
     * "save and open all raw emails"
 
- === Bufixes
+ === Bugfixes
   * Gracefully handle cases where emails do not have a 'to' value. (Kieran Pilkington)
 
- === Bufixes
+ === Bugfixes
 
 == 0.4.0 2010-01-07
 
@@ -63,12 +75,12 @@
     * Added support for action_mailer_cache_delivery plugin. (Dan Dofter)
       You must use the fork at: http://github.com/liangzan/action_mailer_cache_delivery
 
- === Bufixes
+ === Bugfixes
     * be_delivered_from matcher now compares both sender name and email address. (Dan Dofter)
 
 == 0.3.8 2009-12-23
 
- === Bufixes
+ === Bugfixes
     * Guard against cc and bcc fields being nil for ActionMailer. (Piotr Sarnacki)
 
 == 0.3.7 2009-12-17
@@ -128,7 +140,7 @@ Big shoutout to Kieran Pilkington who did the majority of work for this release.
     * Then /^I should not receive any emails?$/
     * When %r{^"([^"]*?)" opens? the email$} do |address|
 
- === Bufixes
+ === Bugfixes
 
  == 0.2.1 2009-5-29
 
@@ -144,19 +156,19 @@ No changes. Bumping version for RubyForge release.
 
  == 0.1.4 2009-5-29
 
- === Bufixes
+ === Bugfixes
   * Require deliveries in the helpers so it doesn't blow up with RSpec. (Craig Webster)
 
  == 0.1.3 2009-4-15
 
- === Bufixes
+ === Bugfixes
   * Fixed regular expressions in genertaed steps. (Ben Mabey)
   * World semantics changed in cucumber (0.2.3.2), email_spec now uses the new API. (Hector Morales)
 
  == 0.1.2 2009-4-05
 
  === New features
- === Bufixes
+ === Bugfixes
   * Actually added the renamed generators to the gem so people could use it! D'oh! (Ben Mabey)
     * You can either use "./script generate email_spec" or "rubigen rails email_spec"
   * Removed Rake tasks from example application to prevent conflicts when used as a plugin. (Ben Mabey)
@@ -165,7 +177,7 @@ No changes. Bumping version for RubyForge release.
  === New features
   * Switched dir structure over to support rubigen. (Dr. Nic)
 
- === Bufixes
+ === Bugfixes
 
  == 0.1.0 2009-3-25
  === New features
@@ -187,7 +199,7 @@ No changes. Bumping version for RubyForge release.
        end
       end
 
-=== Bufixes
+=== Bugfixes
  * Revert parse_email_for_link helper method to allow for text links as well as explicit link finding. (Mischa Fierer)
  * Isolated variances between using email-spec with an ARMailer project. (Luke Melia)
 

data/README.rdoc

@@ -32,6 +32,7 @@ you generally don't want to include those projects unless you need them in produ
 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' # add this line if you use spork
   require 'email_spec/cucumber'
 
 This will load all the helpers that the steps rely on.
@@ -75,7 +76,7 @@ Otherwise, you will need to include them in the example groups you wish to use t
       And I press "Sign up"
       And I should receive an email
       When I open the email
-      Then I should see "confirm" in the email
+      Then I should see "confirm" in the email body
       When I follow "confirm" in the email
       Then I should see "Confirm your new account"
 
@@ -113,11 +114,11 @@ Examples for the #signup method in UserMailer:
     end
 
     it "should contain the user's message in the mail body" do
-      @email.should have_text(/Jojo Binks/)
+      @email.should have_body_text(/Jojo Binks/)
     end
 
     it "should contain a link to the confirmation link" do
-      @email.should have_text(/#{confirm_account_url}/)
+      @email.should have_body_text(/#{confirm_account_url}/)
     end
 
     it "should have the correct subject" do

data/Rakefile

@@ -22,7 +22,7 @@ begin
     s.has_rdoc         = true
     s.extra_rdoc_files = %w(README.rdoc MIT-LICENSE.txt)
     s.rubyforge_project = 'email-spec'
-    s.add_runtime_dependency 'rspec', '~> 2.0.0'
+    s.add_runtime_dependency "rspec", "~> 2.0"
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
@@ -52,8 +52,11 @@ 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
   #remove stuff from example rails apps
+  FileUtils.rm_rf("examples/rails_root")
+  FileUtils.rm_rf("examples/sinatra")
   %w[ rails3 sinatra ].each do |ver|
     FileUtils.rm_f("examples/#{ver}_root/features/step_definitions/email_steps.rb")
+    FileUtils.rm_f("examples/#{ver}_root/rerun.txt")
     FileUtils.rm_rf("examples/#{ver}_root/log")
     FileUtils.rm_rf("examples/#{ver}_root/vendor")
   end

data/examples/rails3_root/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
-  remote: /Users/bmabey/Programming/ruby/email-spec
+  remote: ../../
   specs:
-    email_spec (0.6.2)
+    email_spec (1.0.0)
+      rspec (~> 2.0.0)
 
 GEM
   remote: http://gemcutter.org/

data/lib/email_spec/deliveries.rb

@@ -9,7 +9,11 @@ module EmailSpec
     end
 
     def reset_mailer
-      deliveries.clear
+      if ActionMailer::Base.delivery_method == :cache
+        mailer.clear_cache
+      else
+        deliveries.clear
+      end
     end
 
     def mailbox_for(address)

data/lib/email_spec/helpers.rb

@@ -13,14 +13,12 @@ module EmailSpec
     def click_email_link_matching(regex, email = current_email)
       url = links_in_email(email).detect { |link| link =~ regex }
       raise "No link found matching #{regex.inspect} in #{email.default_part_body}" unless url
-      request_uri = URI::parse(url).request_uri
-      visit request_uri
+      visit request_uri(url)
     end
 
     def click_first_link_in_email(email = current_email)
       link = links_in_email(email).first
-      request_uri = URI::parse(link).request_uri
-      visit request_uri
+      visit request_uri(link)
     end
 
     def open_email(address, opts={})
@@ -88,7 +86,7 @@ module EmailSpec
 
     def set_current_email(email)
       return unless email
-      email.to.each do |to|
+      [email.to, email.cc, email.bcc].compact.flatten.each do |to|
         read_emails_for(to) << email
         email_spec_hash[:current_emails][to] = email
       end
@@ -105,11 +103,17 @@ module EmailSpec
       url
     end
 
+    def request_uri(link)
+      return unless link
+      url = URI::parse(link)
+      url.fragment ? (url.request_uri + "#" + url.fragment) : url.request_uri
+    end
+
     # e.g. confirm in http://confirm
     def parse_email_for_explicit_link(email, regex)
       regex = /#{Regexp.escape(regex)}/ unless regex.is_a?(Regexp)
       url = links_in_email(email).detect { |link| link =~ regex }
-      URI::parse(url).request_uri if url
+      request_uri(url)
     end
 
     # e.g. Click here in  <a href="http://confirm">Click here</a>

data/lib/email_spec.rb

@@ -1,6 +1,6 @@
 unless defined?(Pony) or defined?(ActionMailer)
   Kernel.warn("Neither Pony nor ActionMailer appear to be loaded so email-spec is requiring ActionMailer.")
-  require 'actionmailer'
+  require 'action_mailer'
 end
 
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__))) unless $LOAD_PATH.include?(File.expand_path(File.dirname(__FILE__)))

data/rails_generators/email_spec/templates/email_steps.rb

@@ -57,7 +57,7 @@ Then /^(?:I|they|"([^"]*?)") should have (an|no|\d+) emails?$/ do |address, amou
 end
 
 Then /^(?:I|they|"([^"]*?)") should receive (an|no|\d+) emails? with subject "([^"]*?)"$/ do |address, amount, subject|
-  unread_emails_for(address).select { |m| m.subject =~ Regexp.new(subject) }.size.should == parse_email_count(amount)
+  unread_emails_for(address).select { |m| m.subject =~ Regexp.new(Regexp.escape(subject)) }.size.should == parse_email_count(amount)
 end
 
 Then /^(?:I|they|"([^"]*?)") should receive an email with the following body:$/ do |address, expected_body|

data/spec/email_spec/helpers_spec.rb

@@ -18,4 +18,119 @@ describe EmailSpec::Helpers do
       lambda { parse_email_for_link(email, "non-existent text") }.should raise_error(  RSpec::Expectations::ExpectationNotMetError)
     end
   end
+
+  describe "#set_current_email" do
+    it "should cope with a nil email" do
+      lambda do
+        out = set_current_email(nil)
+        out.should be_nil
+        email_spec_hash[:current_email].should be_nil
+      end.should_not raise_error
+    end
+
+    it "should cope with a real email" do
+      email = Mail.new
+      lambda do
+        out = set_current_email(email)
+        out.should == email
+        email_spec_hash[:current_email].should == email
+      end.should_not raise_error
+    end
+
+    shared_examples_for 'something that sets the current email for recipients' do
+      before do
+        @email = Mail.new(@recipient_type => 'dave@example.com')
+      end
+
+      it "should record that the email has been read for that recipient" do
+        set_current_email(@email)
+        email_spec_hash[:read_emails]['dave@example.com'].should include(@email)
+      end
+
+      it "should record that the email has been read for all the recipient of that type" do
+        @email.send(@recipient_type) << 'dave_2@example.com'
+        set_current_email(@email)
+        email_spec_hash[:read_emails]['dave@example.com'].should include(@email)
+        email_spec_hash[:read_emails]['dave_2@example.com'].should include(@email)
+      end
+
+      it "should record that the email is the current email for the recipient" do
+        set_current_email(@email)
+        email_spec_hash[:current_emails]['dave@example.com'].should == @email
+      end
+
+      it "should record that the email is the current email for all the recipients of that type" do
+        @email.send(@recipient_type) << 'dave_2@example.com'
+        set_current_email(@email)
+        email_spec_hash[:current_emails]['dave@example.com'].should == @email
+        email_spec_hash[:current_emails]['dave_2@example.com'].should == @email
+      end
+
+      it "should overwrite current email for the recipient with this one" do
+        other_mail = Mail.new
+        email_spec_hash[:current_emails]['dave@example.com'] = other_mail
+        set_current_email(@email)
+        email_spec_hash[:current_emails]['dave@example.com'].should == @email
+      end
+
+      it "should overwrite the current email for all the recipients of that type" do
+        other_mail = Mail.new
+        email_spec_hash[:current_emails]['dave@example.com'] = other_mail
+        email_spec_hash[:current_emails]['dave_2@example.com'] = other_mail
+        @email.send(@recipient_type) << 'dave_2@example.com'
+        set_current_email(@email)
+        email_spec_hash[:current_emails]['dave@example.com'].should == @email
+        email_spec_hash[:current_emails]['dave_2@example.com'].should == @email
+      end
+
+      it "should not complain when the email has recipients of that type" do
+        @email.send(:"#{@recipient_type}=", nil)
+        lambda { set_current_email(@email) }.should_not raise_error
+      end
+    end
+
+    describe "#request_uri(link)" do
+      context "without query and anchor" do
+        it "returns the path" do
+          request_uri('http://www.path.se/to/page').should == '/to/page'
+        end
+      end
+
+      context "with query and anchor" do
+        it "returns the path and query and the anchor" do
+          request_uri('http://www.path.se/to/page?q=adam#task').should == '/to/page?q=adam#task'
+        end
+      end
+
+      context "with anchor" do
+        it "returns the path and query and the anchor" do
+          request_uri('http://www.path.se/to/page#task').should == '/to/page#task'
+        end
+      end
+    end
+
+    describe 'for mails with recipients in the to address' do
+      before do
+        @recipient_type = :to
+      end
+
+      it_should_behave_like 'something that sets the current email for recipients'
+    end
+
+    describe 'for mails with recipients in the cc address' do
+      before do
+        @recipient_type = :cc
+      end
+
+      it_should_behave_like 'something that sets the current email for recipients'
+    end
+
+    describe 'for mails with recipients in the bcc address' do
+      before do
+        @recipient_type = :bcc
+      end
+
+      it_should_behave_like 'something that sets the current email for recipients'
+    end
+  end
 end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: email_spec
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.0.1
+  hash: 17
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Ben Mabey
@@ -12,7 +17,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-13 00:00:00 Z
+date: 2010-12-29 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -22,7 +28,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.0.0
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
   type: :runtime
   version_requirements: *id001
 description: Easily test email in rspec and cucumber
@@ -140,6 +150,7 @@ files:
 - examples/sinatra_root/features/support/env.rb
 - examples/sinatra_root/features/support/paths.rb
 - examples/sinatra_root/lib/example_sinatra_app.rb
+has_rdoc: true
 homepage: http://github.com/bmabey/email-spec/
 licenses: []
 
@@ -153,17 +164,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: email-spec
-rubygems_version: 1.8.10
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Easily test email in rspec and cucumber