email_spec 1.4.0 → 1.5.0

data/History.txt

@@ -1,3 +1,15 @@
+== 1.5.0 2012-07-22
+
+  * Upgraded use of Capybara to avoid deprecation warnings.
+  * Upgraded use of RSpec to deal with new expect API (Thomas Drake-Brockman)
+
+ === New features
+  * visit_in_email now works for emails that are not the current_email (Ernesto Tagwerker)
+  * emails can be found based on :from field (John Cant)
+
+ === Bug fixes
+  * Emails that are not found when clicking a link now raise an exception. (Adam Berlin & Alex Kramer)
+
 == 1.4.0 2012-10-30
 
   * removed jeweler in favor of just using bundler for all gem management.

data/README.md

@@ -3,7 +3,7 @@
 
 ## Email Spec
 
-A collection of RSpec matchers and Cucumber steps to make testing emails go smoothly.
+A collection of matchers for RSpec/MiniTest and Cucumber steps to make testing emails go smoothly.
 
 This library works with ActionMailer and Pony.  When using it with ActionMailer it works with
 DelayedJob, ActiveRecord Mailer, and action_mailer_cache_delivery.

data/lib/email_spec/helpers.rb

@@ -1,4 +1,4 @@
-require 'uri'
+  require 'uri'
 require 'email_spec/deliveries'
 
 module EmailSpec
@@ -6,8 +6,13 @@ module EmailSpec
   module Helpers
     include Deliveries
 
-    def visit_in_email(link_text)
-      visit(parse_email_for_link(current_email, link_text))
+    def visit_in_email(link_text, address = '')
+      if address.nil? || address.empty?
+        email = current_email
+      else
+        email = find_email!(address)
+      end
+      visit(parse_email_for_link(email, link_text))
     end
 
     def click_email_link_matching(regex, email = current_email)
@@ -63,6 +68,8 @@ module EmailSpec
       elsif opts[:with_text]
         expected_text = (opts[:with_text].is_a?(String) ? Regexp.escape(opts[:with_text]) : opts[:with_text])
         mailbox_for(address).find { |m| m.default_part_body =~ Regexp.new(expected_text) }
+      elsif opts[:from]
+        mailbox_for(address).find { |m| m.from.include? opts[:from] }
       else
         mailbox_for(address).first
       end
@@ -81,7 +88,7 @@ module EmailSpec
     def find_email!(address, opts={})
       email = find_email(address, opts)
       if current_email_address.nil?
-        raise EmailSpec::NoEmailAddressProvided, "No email address has been provided. Make sure current_email_address is returning something."  
+        raise EmailSpec::NoEmailAddressProvided, "No email address has been provided. Make sure current_email_address is returning something."
       elsif email.nil?
         error = "#{opts.keys.first.to_s.humanize.downcase unless opts.empty?} #{('"' + opts.values.first.to_s + '"') unless opts.empty?}"
         raise EmailSpec::CouldNotFindEmailError, "Could not find email #{error} in the mailbox for #{current_email_address}. \n Found the following emails:\n\n #{all_emails.to_s}"
@@ -99,7 +106,8 @@ module EmailSpec
     end
 
     def parse_email_for_link(email, text_or_regex)
-      email.should have_body_text(text_or_regex)
+      matcher = EmailSpec::Matchers::HaveBodyText.new(text_or_regex)
+      RSpec::Expectations::PositiveExpectationHandler.handle_matcher(email, matcher)
 
       url = parse_email_for_explicit_link(email, text_or_regex)
       url ||= parse_email_for_anchor_text_link(email, text_or_regex)

data/lib/generators/email_spec/steps/templates/email_steps.rb

@@ -175,8 +175,8 @@ end
 # Interact with Email Contents
 #
 
-When /^(?:I|they) follow "([^"]*?)" in the email$/ do |link|
-  visit_in_email(link)
+When /^(?:I|they|"([^"]*?)") follows? "([^"]*?)" in the email$/ do |address, link|
+  visit_in_email(link, address)
 end
 
 When /^(?:I|they) click the first link in the email$/ do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: email_spec
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-08 00:00:00.000000000 Z
+date: 2012-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy
@@ -116,7 +116,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -124,7 +124,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: delayed_job
   requirement: !ruby/object:Gem::Requirement
@@ -285,7 +285,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Easily test email in rspec and cucumber
+description: Easily test email in RSpec, Cucumber, and MiniTest
 email: ben@benmabey.com
 executables: []
 extensions: []
@@ -337,6 +337,6 @@ rubyforge_project: email-spec
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Easily test email in rspec and cucumber
+summary: Easily test email in rspec and cucumber and minitest
 test_files: []
 has_rdoc: