bmabey-email_spec 0.1.2 → 0.1.3

data/History.txt

@@ -3,6 +3,12 @@
  === New features
  === Bufixes
 
+ == 0.1.3 2009-4-15
+
+ === Bufixes
+  * 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

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

@@ -18,7 +18,7 @@ module EmailHelpers
     "quentin@example.com" # Replace with your a way to find your current_email. e.g current_user.email
   end
 end
-World {|world| world.extend EmailHelpers }
+World(EmailHelpers)
 
 # Use this step to reset the e-mail queue within a scenario.
 # This is done automatically before each scenario.
@@ -31,7 +31,7 @@ When /^I open the email$/ do
   open_email(current_email_address)
 end
 
-When /^I follow "(.*)" in the email$/ do |link|
+When %r{^I follow "([^"]*?)" in the email$} do |link|
   visit_in_email(link)
 end
 
@@ -40,31 +40,31 @@ Then /^I should receive (an|\d+) emails?$/ do |amount|
   unread_emails_for(current_email_address).size.should == amount.to_i
 end
 
-Then /^"([^']*?)" should receive (\d+) emails?$/ do |address, n|
+Then %r{^"([^"]*?)" should receive (\d+) emails?$} do |address, n|
   unread_emails_for(address).size.should == n.to_i 
 end
 
-Then /^"([^']*?)" should have (\d+) emails?$/ do |address, n|
+Then %r{^"([^"]*?)" should have (\d+) emails?$} do |address, n|
   mailbox_for(address).size.should == n.to_i
 end
 
-Then /^"([^']*?)" should not receive an email$/ do |address|
+Then %r{^"([^"]*?)" should not receive an email$} do |address|
   find_email(address).should be_nil
 end
 
-Then /^I should see "(.*)" in the subject$/ do |text|
+Then %r{^I should see "([^"]*?)" in the subject$} do |text|
   current_email.should have_subject(Regexp.new(text))
 end
 
-Then /^I should see "(.*)" in the email$/ do |text|
+Then %r{^I should see "([^"]*?)" in the email$} do |text|
   current_email.body.should =~ Regexp.new(text)
 end
 
-When %r{^"([^']*?)" opens? the email with subject "([^']*?)"$} do |address, subject|
+When %r{^"([^"]*?)" opens? the email with subject "([^"]*?)"$} do |address, subject|
   open_email(address, :with_subject => subject)
 end
 
-When %r{^"([^']*?)" opens? the email with text "([^']*?)"$} do |address, text|
+When %r{^"([^"]*?)" opens? the email with text "([^"]*?)"$} do |address, text|
   open_email(address, :with_text => text)
 end
 

data/examples/rails_root/features/support/env.rb

@@ -18,6 +18,4 @@ require File.expand_path(File.dirname(__FILE__) + '../../../../../lib/email_spec
 require 'email_spec/cucumber'
 
 require File.expand_path(File.dirname(__FILE__) +'/../../spec/model_factory.rb')
-World { |world| world.extend(Fixjour) }
-
-
+World(Fixjour)

data/examples/rails_root/vendor/plugins/email_spec/rails_generators/email_spec/templates/email_steps.rb

@@ -18,7 +18,7 @@ module EmailHelpers
     "quentin@example.com" # Replace with your a way to find your current_email. e.g current_user.email
   end
 end
-World {|world| world.extend EmailHelpers }
+World(EmailHelpers)
 
 # Use this step to reset the e-mail queue within a scenario.
 # This is done automatically before each scenario.
@@ -31,7 +31,7 @@ When /^I open the email$/ do
   open_email(current_email_address)
 end
 
-When /^I follow "(.*)" in the email$/ do |link|
+When %r{^I follow "([^"]*?)" in the email$} do |link|
   visit_in_email(link)
 end
 
@@ -40,31 +40,31 @@ Then /^I should receive (an|\d+) emails?$/ do |amount|
   unread_emails_for(current_email_address).size.should == amount.to_i
 end
 
-Then /^"([^']*?)" should receive (\d+) emails?$/ do |address, n|
+Then %r{^"([^"]*?)" should receive (\d+) emails?$} do |address, n|
   unread_emails_for(address).size.should == n.to_i 
 end
 
-Then /^"([^']*?)" should have (\d+) emails?$/ do |address, n|
+Then %r{^"([^"]*?)" should have (\d+) emails?$} do |address, n|
   mailbox_for(address).size.should == n.to_i
 end
 
-Then /^"([^']*?)" should not receive an email$/ do |address|
+Then %r{^"([^"]*?)" should not receive an email$} do |address|
   find_email(address).should be_nil
 end
 
-Then /^I should see "(.*)" in the subject$/ do |text|
+Then %r{^I should see "([^"]*?)" in the subject$} do |text|
   current_email.should have_subject(Regexp.new(text))
 end
 
-Then /^I should see "(.*)" in the email$/ do |text|
+Then %r{^I should see "([^"]*?)" in the email$} do |text|
   current_email.body.should =~ Regexp.new(text)
 end
 
-When %r{^"([^']*?)" opens? the email with subject "([^']*?)"$} do |address, subject|
+When %r{^"([^"]*?)" opens? the email with subject "([^"]*?)"$} do |address, subject|
   open_email(address, :with_subject => subject)
 end
 
-When %r{^"([^']*?)" opens? the email with text "([^']*?)"$} do |address, text|
+When %r{^"([^"]*?)" opens? the email with text "([^"]*?)"$} do |address, text|
   open_email(address, :with_text => text)
 end
 

data/lib/email_spec/cucumber.rb

@@ -15,7 +15,5 @@ After do
   EmailSpec::EmailViewer.save_and_open_all_text_emails if ENV['SHOW_TEXT_EMAILS']
 end
 
-World do |world|
-  world.extend EmailSpec::Helpers
-  world.extend EmailSpec::Matchers
-end
+World(EmailSpec::Helpers)
+World(EmailSpec::Matchers)

data/rails_generators/email_spec/templates/email_steps.rb

@@ -18,7 +18,7 @@ module EmailHelpers
     "quentin@example.com" # Replace with your a way to find your current_email. e.g current_user.email
   end
 end
-World {|world| world.extend EmailHelpers }
+World(EmailHelpers)
 
 # Use this step to reset the e-mail queue within a scenario.
 # This is done automatically before each scenario.
@@ -31,7 +31,7 @@ When /^I open the email$/ do
   open_email(current_email_address)
 end
 
-When /^I follow "(.*)" in the email$/ do |link|
+When %r{^I follow "([^"]*?)" in the email$} do |link|
   visit_in_email(link)
 end
 
@@ -40,31 +40,31 @@ Then /^I should receive (an|\d+) emails?$/ do |amount|
   unread_emails_for(current_email_address).size.should == amount.to_i
 end
 
-Then /^"([^']*?)" should receive (\d+) emails?$/ do |address, n|
+Then %r{^"([^"]*?)" should receive (\d+) emails?$} do |address, n|
   unread_emails_for(address).size.should == n.to_i 
 end
 
-Then /^"([^']*?)" should have (\d+) emails?$/ do |address, n|
+Then %r{^"([^"]*?)" should have (\d+) emails?$} do |address, n|
   mailbox_for(address).size.should == n.to_i
 end
 
-Then /^"([^']*?)" should not receive an email$/ do |address|
+Then %r{^"([^"]*?)" should not receive an email$} do |address|
   find_email(address).should be_nil
 end
 
-Then /^I should see "(.*)" in the subject$/ do |text|
+Then %r{^I should see "([^"]*?)" in the subject$} do |text|
   current_email.should have_subject(Regexp.new(text))
 end
 
-Then /^I should see "(.*)" in the email$/ do |text|
+Then %r{^I should see "([^"]*?)" in the email$} do |text|
   current_email.body.should =~ Regexp.new(text)
 end
 
-When %r{^"([^']*?)" opens? the email with subject "([^']*?)"$} do |address, subject|
+When %r{^"([^"]*?)" opens? the email with subject "([^"]*?)"$} do |address, subject|
   open_email(address, :with_subject => subject)
 end
 
-When %r{^"([^']*?)" opens? the email with text "([^']*?)"$} do |address, text|
+When %r{^"([^"]*?)" opens? the email with text "([^"]*?)"$} do |address, text|
   open_email(address, :with_text => text)
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bmabey-email_spec
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Ben Mabey
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-05 00:00:00 -07:00
+date: 2009-04-16 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -79,11 +79,9 @@ files:
 - examples/rails_root/config/routes.rb
 - examples/rails_root/cucumber.yml
 - examples/rails_root/db
-- examples/rails_root/db/development.sqlite3
 - examples/rails_root/db/migrate
 - examples/rails_root/db/migrate/20090125013728_create_users.rb
 - examples/rails_root/db/schema.rb
-- examples/rails_root/db/test.sqlite3
 - examples/rails_root/doc
 - examples/rails_root/doc/README_FOR_APP
 - examples/rails_root/features
@@ -95,10 +93,6 @@ files:
 - examples/rails_root/features/step_definitions/webrat_steps.rb
 - examples/rails_root/features/support
 - examples/rails_root/features/support/env.rb
-- examples/rails_root/lib
-- examples/rails_root/log
-- examples/rails_root/log/development.log
-- examples/rails_root/log/test.log
 - examples/rails_root/public
 - examples/rails_root/public/404.html
 - examples/rails_root/public/422.html
@@ -181,7 +175,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Easily test email in rspec and cucumber
 test_files: []