email_spec 2.0.0 → 2.1.0

data/examples/rails4_root/spec/models/user_mailer_spec.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 # These two example groups are specifying the exact same behavior.  However, the documentation style is different
-# and the value that each one provides is different with various trade-offs.  Run these examples with the specdoc 
+# and the value that each one provides is different with various trade-offs.  Run these examples with the specdoc
 # formatter to get an idea of how they differ.
 # Example of documenting the behaviour explicitly and expressing the intent in the example's sentence.
 describe "Signup Email", :type => :model do
@@ -10,11 +10,11 @@ describe "Signup Email", :type => :model do
   include ::Rails.application.routes.url_helpers
 
   subject { UserMailer.signup("jojo@yahoo.com", "Jojo Binks") }
-  
+
   it "should be delivered to the email passed in" do
     is_expected.to deliver_to("jojo@yahoo.com")
   end
-  
+
   it "should contain the user's name in the mail body" do
     is_expected.to have_body_text(/Jojo Binks/)
   end
@@ -22,10 +22,8 @@ describe "Signup Email", :type => :model do
   it "should contain a link to the confirmation page" do
     is_expected.to have_body_text(/#{confirm_account_url(:host => 'example.com')}/)
   end
-  
+
   it { is_expected.to have_subject(/Account confirmation/) }
-  
-  
 end
 
 # In this example group more of the documentation is placed in the context trying to allow for more concise specs.
@@ -44,4 +42,12 @@ describe "Signup Email", :type => :model do
     it { is_expected.to deliver_to("jojo@yahoo.com") }
     it { is_expected.to have_body_text(/Jojo Binks/) }
   end
+  
+  describe "sent with email address of 'jermain@yahoo.com', and users name 'Jermain O'Keefe'" do
+    let(:user_name) { "Jermain O'Keefe" }
+    subject { UserMailer.signup("jermain@yahoo.com", user_name) }
+
+    it { is_expected.to deliver_to("jermain@yahoo.com") }
+    it { is_expected.to have_body_text(user_name) }
+  end
 end

data/examples/sinatra_root/features/step_definitions/email_steps.rb

@@ -105,20 +105,36 @@ Then /^(?:I|they) should see \/([^"]*?)\/ in the email subject$/ do |text|
   expect(current_email).to have_subject(Regexp.new(text))
 end
 
+Then /^(?:I|they) should not see "([^"]*?)" in the email subject$/ do |text|
+  expect(current_email).not_to have_subject(text)
+end
+
+Then /^(?:I|they) should not see \/([^"]*?)\/ in the email subject$/ do |text|
+  expect(current_email).not_to have_subject(Regexp.new(text))
+end
+
 Then /^(?:I|they) should see "([^"]*?)" in the email body$/ do |text|
   expect(current_email.default_part_body.to_s).to include(text)
 end
 
+Then /^(?:I|they) should not see "([^"]*?)" in the email body$/ do |text|
+  expect(current_email.default_part_body.to_s).not_to include(text)
+end
+
 Then /^(?:I|they) should see \/([^"]*?)\/ in the email body$/ do |text|
   expect(current_email.default_part_body.to_s).to match Regexp.new(text)
 end
 
+Then /^(?:I|they) should not see \/([^"]*?)\/ in the email body$/ do |text|
+  expect(current_email.default_part_body.to_s).not_to match Regexp.new(text)
+end
+
 Then /^(?:I|they) should see the email delivered from "([^"]*?)"$/ do |text|
   expect(current_email).to be_delivered_from(text)
 end
 
 Then /^(?:I|they) should see the email reply to "([^"]*?)"$/ do |text|
-  current_email.should have_reply_to(text)
+  expect(current_email).to have_reply_to(text)
 end
 
 Then /^(?:I|they) should see "([^\"]*)" in the email "([^"]*?)" header$/ do |text, name|

data/features/rails4_app.feature

@@ -22,7 +22,7 @@ I want to verify that the example rails 4 app runs all of it's features as expec
    When I run "bundle exec rake spec RAILS_ENV=test" in the rails4 app
    Then I should see the following summary report:
    """
-   9 examples, 0 failures
+   11 examples, 0 failures
    """
 
    When I run "bundle exec rake test RAILS_ENV=test" in the rails4 app

data/lib/email_spec/helpers.rb

@@ -6,6 +6,9 @@ module EmailSpec
   module Helpers
     include Deliveries
 
+    A_TAG_BEGIN_REGEX = %r{<a[^>]*href=['"]?([^'"]*)['"]?[^>]*>(?:(?!</a>).)*?}
+    A_TAG_END_REGEX = %r{(?:(?!</a>).)*?</a>}
+
     def visit_in_email(link_text, address = '')
       if address.nil? || address.empty?
         email = current_email
@@ -97,7 +100,7 @@ module EmailSpec
       if current_email_address.nil?
         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?}"
+        error = "#{opts.keys.first.to_s.gsub("_", " ").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}"
        end
       email
@@ -142,7 +145,7 @@ module EmailSpec
 
     # e.g. Click here in  <a href="http://confirm">Click here</a>
     def parse_email_for_anchor_text_link(email, link_text)
-      if textify_images(email.default_part_body) =~ %r{<a[^>]*href=['"]?([^'"]*)['"]?[^>]*?>[^<]*?(.*?)#{link_text}(.*?)[^<]*?</a>}
+      if textify_images(email.default_part_body) =~ %r{#{A_TAG_BEGIN_REGEX}#{link_text}#{A_TAG_END_REGEX}}
         URI.split($1)[5..-1].compact!.join("?").gsub("&amp;", "&")
         # sub correct ampersand after rails switches it (http://dev.rubyonrails.org/ticket/4002)
       else

data/lib/email_spec/mail_ext.rb

@@ -4,7 +4,11 @@ module EmailSpec::MailExt
   end
 
   def default_part_body
-    default_part.body
+    HTMLEntities.new.decode(default_part.body)
+  end
+
+  def html
+    html_part ? html_part.body.raw_source : nil
   end
 end
 

data/lib/email_spec/rspec.rb

@@ -0,0 +1,8 @@
+RSpec.configure do |config|
+  config.include(EmailSpec::Helpers)
+  config.include(EmailSpec::Matchers)
+
+  config.before(:each) do |group|
+    reset_mailer
+  end
+end

data/lib/email_spec/version.rb

@@ -1,3 +1,3 @@
 module EmailSpec
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end

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

@@ -105,14 +105,30 @@ Then /^(?:I|they) should see \/([^"]*?)\/ in the email subject$/ do |text|
   expect(current_email).to have_subject(Regexp.new(text))
 end
 
+Then /^(?:I|they) should not see "([^"]*?)" in the email subject$/ do |text|
+  expect(current_email).not_to have_subject(text)
+end
+
+Then /^(?:I|they) should not see \/([^"]*?)\/ in the email subject$/ do |text|
+  expect(current_email).not_to have_subject(Regexp.new(text))
+end
+
 Then /^(?:I|they) should see "([^"]*?)" in the email body$/ do |text|
   expect(current_email.default_part_body.to_s).to include(text)
 end
 
+Then /^(?:I|they) should not see "([^"]*?)" in the email body$/ do |text|
+  expect(current_email.default_part_body.to_s).not_to include(text)
+end
+
 Then /^(?:I|they) should see \/([^"]*?)\/ in the email body$/ do |text|
   expect(current_email.default_part_body.to_s).to match Regexp.new(text)
 end
 
+Then /^(?:I|they) should not see \/([^"]*?)\/ in the email body$/ do |text|
+  expect(current_email.default_part_body.to_s).not_to match Regexp.new(text)
+end
+
 Then /^(?:I|they) should see the email delivered from "([^"]*?)"$/ do |text|
   expect(current_email).to be_delivered_from(text)
 end

data/spec/email_spec/helpers_spec.rb

@@ -31,7 +31,9 @@ describe EmailSpec::Helpers do
     end
 
     it "properly finds links with text surrounded by tags" do
-      email = Mail.new(:body =>  %(<a href="/path/to/page"><strong>Click Here</strong></a>))
+      email = Mail.new(:body =>  %(
+        <a href="/path/to/app">Welcome</a><a href="/path/to/page"><strong>Click Here</strong></a>))
+
       expect(parse_email_for_link(email, "Click Here")).to eq("/path/to/page")
     end
 

data/spec/email_spec/mail_ext_spec.rb

@@ -31,4 +31,27 @@ describe EmailSpec::MailExt do
       expect(email.default_part.body).to eq(email.default_part_body)
     end
   end
+
+  describe "#html" do
+    it "returns the html part body" do
+      email = Mail.new do
+        html_part { body "This is html" }
+      end
+
+      expect(email.html).to eq("This is html")
+    end
+
+    it "returns a String" do
+      email = Mail.new do
+        html_part { body "This is html" }
+      end
+
+      expect(email.html).to be_a(String)
+    end
+
+    it "returns nil for mail with no html part" do
+      email = Mail.new
+      expect(email.html).to be_nil
+    end
+  end
 end

data/spec/email_spec/matchers_spec.rb

@@ -402,6 +402,13 @@ describe EmailSpec::Matchers do
     end
 
     describe "when strings are used" do
+      it "should match when the body includes text with symbols" do
+        full_name = "Jermain O'Keefe"
+        email = Mail::Message.new(body: full_name)
+
+        expect(have_body_text(full_name)).to match(email)
+      end
+
       it "should match when the body includes the text" do
         email = Mail::Message.new(:body => 'foo bar baz')
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: email_spec
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Ben Mabey
@@ -10,174 +10,160 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-15 00:00:00.000000000 Z
+date: 2016-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.3.3
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.6.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.17
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.17
 - !ruby/object:Gem::Dependency
-  name: cucumber-rails
+  name: actionmailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.2
-- !ruby/object:Gem::Dependency
-  name: cucumber-sinatra
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Easily test email in RSpec, Cucumber, and MiniTest
@@ -188,7 +174,7 @@ extra_rdoc_files:
 - README.md
 - MIT-LICENSE.txt
 files:
-- History.txt
+- Changelog.md
 - MIT-LICENSE.txt
 - README.md
 - Rakefile
@@ -302,6 +288,7 @@ files:
 - lib/email_spec/helpers.rb
 - lib/email_spec/mail_ext.rb
 - lib/email_spec/matchers.rb
+- lib/email_spec/rspec.rb
 - lib/email_spec/test_observer.rb
 - lib/email_spec/version.rb
 - lib/generators/email_spec/steps/steps_generator.rb
@@ -311,7 +298,7 @@ files:
 - spec/email_spec/mail_ext_spec.rb
 - spec/email_spec/matchers_spec.rb
 - spec/spec_helper.rb
-homepage: http://github.com/bmabey/email-spec/
+homepage: http://github.com/email-spec/email-spec/
 licenses:
 - MIT
 metadata: {}
@@ -321,18 +308,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: email-spec
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: Easily test email in rspec and cucumber and minitest
+summary: Easily test email in RSpec, Cucumber or Minitest
 test_files: []