spreewald 0.5.14 → 0.5.15

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spreewald (0.5.13)
+    spreewald (0.5.15)
       capybara
       cucumber
       cucumber-rails

data/lib/spreewald/email_steps.rb

@@ -20,36 +20,40 @@ end
 #         Body: ...
 #         Attachments: ...
 #         """
-# 
+#
 # You can skip lines, of course.
 Then /^(an|no) e?mail should have been sent with:$/ do |mode, raw_data|
-  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
+  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
       end
     end
+    @mail = MailFinder.find(conditions)
+    expectation = mode == 'no' ? 'should_not' : 'should'
+    @mail.send(expectation, be_present)
   end
-  @mail = MailFinder.find(conditions)
-  expectation = mode == 'no' ? 'should_not' : 'should'
-  @mail.send(expectation, be_present)
 end
 
 # nodoc
 Then /^(an|no) e?mail should have been sent((?: |and|with|from "[^"]+"|bcc "[^"]+"|to "[^"]+"|the subject "[^"]+"|the body "[^"]+"|the attachments "[^"]+")+)$/ do |mode, query|
-  conditions = {}
-  conditions[:to] = $1 if query =~ /to "([^"]+)"/
-  conditions[:cc] = $1 if query =~ / cc "([^"]+)"/
-  conditions[:bcc] = $1 if query =~ /bcc "([^"]+)"/
-  conditions[:from] = $1 if query =~ /from "([^"]+)"/
-  conditions[:subject] = $1 if query =~ /the subject "([^"]+)"/
-  conditions[:body] = $1 if query =~ /the body "([^"]+)"/
-  conditions[:attachments] = $1 if query =~ /the attachments "([^"]+)"/
-  @mail = MailFinder.find(conditions)
-  expectation = mode == 'no' ? 'should_not' : 'should'
-  @mail.send(expectation, be_present)
+  patiently do
+    conditions = {}
+    conditions[:to] = $1 if query =~ /to "([^"]+)"/
+    conditions[:cc] = $1 if query =~ / cc "([^"]+)"/
+    conditions[:bcc] = $1 if query =~ /bcc "([^"]+)"/
+    conditions[:from] = $1 if query =~ /from "([^"]+)"/
+    conditions[:subject] = $1 if query =~ /the subject "([^"]+)"/
+    conditions[:body] = $1 if query =~ /the body "([^"]+)"/
+    conditions[:attachments] = $1 if query =~ /the attachments "([^"]+)"/
+    @mail = MailFinder.find(conditions)
+    expectation = mode == 'no' ? 'should_not' : 'should'
+    @mail.send(expectation, be_present)
+  end
 end
 
 # Only works after you have retrieved the mail using "Then an email should have been sent with:"
@@ -88,9 +92,11 @@ end
 #         All of these lines
 #         need to be present
 #         """
-Then /^that e?mail should have the following lines in the body:$/ do |body|
+Then /^that e?mail should( not)? have the following lines in the body:$/ do |expectation, body|
+  expectation = negate ? 'should_not' : 'should'
+
   body.to_s.strip.split(/\n/).each do |line|
-    @mail.body.should include(line.strip)
+    @mail.body.send(expectation, include(line.strip))
   end
 end
 

data/lib/spreewald_support/version.rb

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

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

@@ -3,5 +3,4 @@ cucumber:
   adapter: mysql2
   host: localhost
   username: root
-  password: junior
-
+  password: secret

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

@@ -3,5 +3,4 @@ cucumber:
   adapter: mysql2
   host: localhost
   username: root
-  password: junior
-
+  password: secret

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spreewald
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 5
-  - 14
-  version: 0.5.14
+  - 15
+  version: 0.5.15
 platform: ruby
 authors: 
 - Tobias Kraze
@@ -15,13 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-05 00:00:00 +02:00
-default_executable: 
+date: 2013-06-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: cucumber-rails
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: cucumber-rails
+  type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -30,12 +30,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: cucumber
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: cucumber
+  type: :runtime
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -44,12 +44,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id002
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: capybara
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  name: capybara
+  type: :runtime
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -58,8 +58,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id003
+  requirement: *id003
 description: A collection of cucumber steps we use in our projects, including steps to check HTML, tables, emails and some utility methods.
 email: 
 - tobias@kraze.eu
@@ -140,7 +139,6 @@ files:
 - tests/shared/features/shared/step_definitions/test_steps.rb
 - tests/shared/features/shared/tables.feature
 - tests/shared/features/support/paths.rb
-has_rdoc: true
 homepage: https://github.com/makandra/spreewald
 licenses: []
 
@@ -170,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.9.5
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Collection of useful cucumber steps.