spreewald 0.6.7 → 0.7.0

data/Rakefile

@@ -22,8 +22,8 @@ namespace :tests do
     success = true
     for_each_directory_of('tests/**/Rakefile') do |directory|
       Bundler.with_clean_env do
-        env = "SPEC=../../#{ENV['SPEC']} " if ENV['SPEC']
-        success &= system("cd #{directory} && #{env} bundle exec rake features")
+        env = "FEATURE=../../#{ENV['FEATURE']}" if ENV['FEATURE']
+        success &= system("cd #{directory} && bundle exec rake features #{env}")
       end
     end
     fail "Tests failed" unless success

data/lib/spreewald/email_steps.rb

@@ -15,24 +15,27 @@ end
 #       Then an email should have been sent with:
 #         """
 #         From: max.mustermann@example.com
+#         Reply-To: mmuster@gmail.com
 #         To: john.doe@example.com
 #         Subject: Unter anderem der Betreff kann auch "Anführungszeichen" enthalten
-#         Body: ...
 #         Attachments: ...
+#
+#         Message body goes here.
 #         """
 #
 # You can skip lines, of course.
 Then /^(an|no) e?mail should have been sent with:$/ do |mode, raw_data|
   patiently do
     raw_data.strip!
-    conditions = {}.tap do |hash|
-      raw_data.split("\n").each do |row|
-        if row.match(/^[a-z]+: /i)
-          key, value = row.split(": ", 2)
-          hash[key.downcase.to_sym] = value
-        end
+    header, body = raw_data.split(/\n\n/)
+    conditions = {}
+    header.split("\n").each do |row|
+      if row.match(/^[a-z\-]+: /i)
+        key, value = row.split(": ", 2)
+        conditions[key.underscore.to_sym] = value
       end
     end
+    conditions[:body] = body if body
     @mail = MailFinder.find(conditions)
     expectation = mode == 'no' ? 'should_not' : 'should'
     @mail.send(expectation, be_present)

data/lib/spreewald_support/mail_finder.rb

@@ -13,6 +13,7 @@ class MailFinder
           conditions[:cc].nil? || mail.cc.andand.include?(resolve_email conditions[:cc]),
           conditions[:bcc].nil? || mail.bcc.andand.include?(resolve_email conditions[:bcc]),
           conditions[:from].nil? || mail.from.include?(resolve_email conditions[:from]),
+          conditions[:reply_to].nil? || mail.reply_to.include?(resolve_email conditions[:reply_to]),
           conditions[:subject].nil? || mail.subject.include?(conditions[:subject]),
           conditions[:body].nil? || mail_body.include?(conditions[:body]),
           conditions[:attachments].nil? || conditions[:attachments].split(/\s*,\s*/).sort == Array(mail.attachments).collect(&:"#{filename_method}").sort

data/lib/spreewald_support/version.rb

@@ -1,5 +1,5 @@
 # coding: UTF-8
 
 module Spreewald
-  VERSION = "0.6.7"
+  VERSION = "0.7.0"
 end

data/tests/rails-2.3/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    spreewald (0.6.0)
+    spreewald (0.6.7)
       capybara
       cucumber
       cucumber-rails

data/tests/rails-2.3/Rakefile

@@ -7,5 +7,6 @@ task :default => :features
 desc 'Run all specs for rails 2.3'
 Cucumber::Rake::Task.new(:features) do |t|
   # tell cucumber where it finds it files (subdirectories and symlinks are confusing it)
-  t.cucumber_opts = "--require features --require features/shared features/shared/"
+  feature = ENV['FEATURE'] || "features/shared"
+  t.cucumber_opts = "--require features --require features/shared #{feature}"
 end

data/tests/rails-2.3/config/database.yml

@@ -4,3 +4,4 @@ cucumber:
   host: localhost
   username: root
   password: junior
+

data/tests/rails-2.3/config/environments/cucumber.rb

@@ -1,6 +1,3 @@
-EMAIL_RECIPIENT = "to@example.com"
-EMAIL_SENDER = "from@example.com"
-
 RSPEC_EXPECTATION_NOT_MET_ERROR = Spec::Expectations::ExpectationNotMetError
 
 config.action_mailer.delivery_method = :test

data/tests/rails-3.2/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    spreewald (0.6.0)
+    spreewald (0.6.7)
       capybara
       cucumber
       cucumber-rails

data/tests/rails-3.2/Rakefile

@@ -7,6 +7,7 @@ task :default => :features
 desc 'Run all specs for rails 3.2'
 Cucumber::Rake::Task.new(:features) do |t|
   # tell cucumber where it finds it files (subdirectories and symlinks are confusing it)
-  t.cucumber_opts = "--require features --require features/shared features/shared/"
+  feature = ENV['FEATURE'] || "features/shared"
+  t.cucumber_opts = "--require features --require features/shared #{feature}"
 end
 

data/tests/rails-3.2/config/database.yml

@@ -4,3 +4,4 @@ cucumber:
   host: localhost
   username: root
   password: junior
+

data/tests/shared/app/controllers/emails_controller.rb

@@ -5,12 +5,10 @@ class EmailsController < ApplicationController
   end
   
   def send_email
-    text = params[:id].to_s
-    
     if Rails.version >= "3"
-      Mailer.email(text).deliver
+      Mailer.email.deliver
     else
-      Mailer.deliver_email(text)
+      Mailer.deliver_email
     end
 
     render :nothing => true

data/tests/shared/app/models/mailer.rb

@@ -1,23 +1,32 @@
 class Mailer < ActionMailer::Base
 
-  if Rails.version >= "3"
+  REPLY_TO = "reply-to@example.com"
+  TO = "to@example.com"
+  FROM = "from@example.com"
+  SUBJECT = "SUBJECT"
+  BODY = "BODY"
 
-    default :from => "from@example.com",
-            :to => "to@example.com"
+  if Rails.version >= "3"
 
-    def email(body = "body")
-      mail(:subject => "email") do |format|
-        format.text { render :text => body }
+    def email
+      mail(
+        :from => FROM,
+        :reply_to => REPLY_TO,
+        :to => TO,
+        :subject => SUBJECT
+      ) do |format|
+        format.text { render :text => BODY }
       end
     end
 
   else
 
-    def email(body_text = "body")
-      recipients EMAIL_RECIPIENT
-      from EMAIL_SENDER
-      subject "email"
-      body body_text
+    def email
+      recipients TO
+      reply_to REPLY_TO
+      from FROM
+      subject SUBJECT
+      body BODY
     end
 
   end

data/tests/shared/features/shared/email_steps.feature

@@ -9,8 +9,107 @@ Feature: Test Spreewald's email steps
     Then the following step should fail:
       | no email should have been sent |
 
-
   Scenario: /^I should see "([^\"]*)" in the e?mail$/
-    When I go to "/emails/send_email/message_body"
+    When I go to "/emails/send_email"
     Then the following step should succeed:
-      | I should see "message_body" in the email |
+      | I should see "BODY" in the email |
+    But the following step should fail:
+      | I should see "XYZ" in the email |
+
+  Scenario: /^(an|no) e?mail should have been sent with:$/
+    When I go to "/emails/send_email"
+
+    # Test without body
+    Then the following multiline step should succeed:
+    """
+      Then an email should have been sent with:
+        '''
+        From: from@example.com
+        Reply-To: reply-to@example.com
+        To: to@example.com
+        Subject: SUBJECT
+        '''
+      """
+
+    # Test with body
+    Then the following multiline step should succeed:
+      """
+      Then an email should have been sent with:
+        '''
+        From: from@example.com
+        Reply-To: reply-to@example.com
+        To: to@example.com
+        Subject: SUBJECT
+
+        BODY
+        '''
+      """
+
+    # Test with incorrect From header
+    Then the following multiline step should fail:
+      """
+      Then an email should have been sent with:
+        '''
+        From: other-from@example.com
+        Reply-To: reply-to@example.com
+        To: to@example.com
+        Subject: SUBJECT
+
+        BODY
+        '''
+      """
+
+    # Test with incorrect Reply-To header
+    Then the following multiline step should fail:
+      """
+      Then an email should have been sent with:
+        '''
+        From: from@example.com
+        Reply-To: other-reply-to@example.com
+        To: to@example.com
+        Subject: SUBJECT
+
+        BODY
+        '''
+      """
+    # Test with incorrect To header
+    Then the following multiline step should fail:
+    """
+      Then an email should have been sent with:
+        '''
+        From: from@example.com
+        Reply-To: reply-to@example.com
+        To: other-to@example.com
+        Subject: SUBJECT
+
+        BODY
+        '''
+      """
+
+    # Test with incorrect Subject header
+    Then the following multiline step should fail:
+    """
+      Then an email should have been sent with:
+        '''
+        From: from@example.com
+        Reply-To: reply-to@example.com
+        To: to@example.com
+        Subject: OTHER-SUBJECT
+
+        BODY
+        '''
+      """
+
+    # Test with incorrect body
+    Then the following multiline step should fail:
+      """
+      Then an email should have been sent with:
+        '''
+        From: from@example.com
+        Reply-To: reply-to@example.com
+        To: to@example.com
+        Subject: SUBJECT
+
+        OTHER-BODY
+        '''
+      """

data/tests/shared/features/shared/step_definitions/test_steps.rb

@@ -21,7 +21,7 @@ When /^I run the following steps?:$/ do |steps_table|
 end
 
 Then /^the following multiline step should (fail|succeed):$/ do |expectation, multiline_step|
-
+  multiline_step = multiline_step.gsub(%{'''}, %{"""})
   if expectation == 'fail'
     expect { steps(multiline_step) }.to raise_error(RSPEC_EXPECTATION_NOT_MET_ERROR)
   else # succeed

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spreewald
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 3
   prerelease: 
   segments: 
   - 0
-  - 6
   - 7
-  version: 0.6.7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Tobias Kraze
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-10-16 00:00:00 +02:00
+date: 2013-10-30 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency