mischa-email_spec 0.0.2 → 0.0.3

data/Rakefile

@@ -41,7 +41,15 @@ task :install_gem => [:clean, :package] do
 end
 
 # Testing
-task :features do
+
+desc "Run the generator on the tests"
+task :generate do
+  system "mkdir -p spec/rails_root/vendor/plugins/email_spec"
+  system "cp -R generators spec/rails_root/vendor/plugins/email_spec"
+  system "cd spec/rails_root; ./script/generate email_spec"
+end
+
+task :features => [:generate] do
   system("cd spec/rails_root; rake features; cd ../..")
 end
 

data/generators/email_spec/email_spec_generator.rb

@@ -1,7 +1,5 @@
 # This generator adds email steps to the step definitions directory 
 class EmailSpecGenerator < Rails::Generator::Base
-  #DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
-   #                           Config::CONFIG['ruby_install_name'])
   def manifest
     record do |m|
       m.directory 'features/step_definitions'

data/generators/email_spec/templates/email_steps.rb

@@ -1,29 +1,26 @@
+#Commonly used email steps
+
+# Use this step to reset the e-mail queue within a scenario.
+# This is done automatically before each scenario.
 Given /^(?:a clear email queue|no emails have been sent)$/ do
   reset_mailer
 end
 
-# Action
-#
+# Use this step to open the most recently sent e-mail. 
 When /^I open the email$/ do
-  open_last_email.should_not be_nil
+  open_last_email
 end
 
-When /^I follow "(.*)" in the email$/ do |link_text|
-  current_email.should_not be_nil
-  link = parse_email_for_link(current_email, link_text)
-  visit(link)
+When /^I follow "(.*)" in the email$/ do |link|
+  visit_in_email(link)
 end
 
-When /^I click "(.*)" in the email$/ do |link_text|
-  current_email.should_not be_nil
-  link = parse_email_for_link(current_email, link_text)
-  visit(link)
+Then /^"([^']*?)" should receive (\d+) emails?$/ do |email, n|
+  unread_emails_for(email).size.should == n.to_i 
 end
 
-
-# Verification
-Then /^"([^']*?)" should receive (\d+) emails?$/ do |email, n|
-  unread_emails_for(email).size.should == n.to_i
+Then /^I should receive (\d+) emails?$/ do |n|
+  unread_emails_for(current_email).size.should == n.to_i
 end
 
 Then /^"([^']*?)" should have (\d+) emails?$/ do |email, n|
@@ -35,13 +32,13 @@ Then /^"([^']*?)" should not receive an email$/ do |email|
 end
 
 Then /^I should see "(.*)" in the subject$/ do |text|
-  raise ArgumentError, "To check the subject, you must first open an e-mail" if current_email.nil?
-  current_email.should_not be_nil
+#  raise ArgumentError, "To check the subject, you must first open an e-mail" if current_email.nil?
+#  current_email.should_not be_nil
   current_email.subject.should =~ Regexp.new(text)
 end
 
 Then /^I should see "(.*)" in the email$/ do |text|
-  current_email.should_not be_nil
+#  current_email.should_not be_nil
   current_email.body.should =~ Regexp.new(text)
 end
 

data/lib/email_spec/email_spec_helpers.rb

@@ -17,6 +17,10 @@ module EmailSpec
     def reset_mailer
       ActionMailer::Base.deliveries.clear
     end
+
+    def visit_in_email(link_text)
+      visit(parse_email_for_link(current_email, link_text))
+    end
     
     def open_email(email_address, opts={})
       if opts[:with_subject]
@@ -34,6 +38,7 @@ module EmailSpec
 
     def open_last_email
       email = ActionMailer::Base.deliveries.last
+      raise "Last email was nil" unless email #TODO: fix
       read_emails_for(email.to) << email if email
       @email_spec_hash[:current_emails][email.to] = email
       @email_spec_hash[:current_email] = email
@@ -62,7 +67,9 @@ module EmailSpec
           link_text
         elsif mail.body =~ %r{<a[^>]*href=['"]?([^'"]*)['"]?[^>]*?>[^<]*?#{link_text}[^<]*?</a>}
           # if it's an anchor tag
-          URI.split($~[1])[5..-1].compact!.join("?")
+          URI.split($~[1])[5..-1].compact!.join("?").gsub("&amp;", "&")
+	  # sub correct ampersand after rails switches it (http://dev.rubyonrails.org/ticket/4002) 
+	  # TODO: outsource this kind of parsing to webrat or someone else
         end
       end
     end

data/lib/email_spec.rb

@@ -1,3 +1,3 @@
 module EmailSpec
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mischa-email_spec
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Ben Mabrey