spreewald 1.12.6 → 2.0.0

data/lib/spreewald_support/mail_finder.rb

@@ -44,7 +44,7 @@ class MailFinder
     end
 
     def email_text_body(mail)
-      if mail.parts.any?
+      body = if mail.parts.any?
         mail_bodies = mail.parts.map { |part|
           if part.header.to_s.include?('Quoted-printable')
             if Rails.version.starts_with?('2.3')
@@ -69,6 +69,7 @@ class MailFinder
       else
         mail.body
       end
+      body.gsub("\r\n", "\n") # The mail gem (>= 2.7.1) switched from \n to \r\n line breaks (LF to CRLF) in plain text mails.
     end
 
   end

data/lib/spreewald_support/version.rb

@@ -1,3 +1,3 @@
 module Spreewald
-  VERSION = '1.12.6'
+  VERSION = '2.0.0'
 end

data/lib/spreewald_support/web_steps_helpers.rb

@@ -72,9 +72,9 @@ module WebStepsHelpers
       end
 
       if options[:expectation] == :visible
-        visible.should eq(true)
+        expect(visible).to eq(true)
       else
-        visible.should eq(false)
+        expect(visible).to eq(false)
       end
     end
   end
@@ -86,23 +86,23 @@ module WebStepsHelpers
 
       if options.has_key?(:selector)
         selector = options[:selector].strip
-        page.should have_css options[:selector]
+        expect(page).to have_css options[:selector]
 
         have_hidden_tag = have_css %(.hidden #{selector}, .invisible #{selector}, [style~="display: none"] #{selector})
 
         if options[:expectation] == :hidden
-          page.should have_hidden_tag
+          expect(page).to have_hidden_tag
         else
-          page.should_not have_hidden_tag
+          expect(page).not_to have_hidden_tag
         end
 
       else
-        page.should have_css('*', :text => options[:text])
+        expect(page).to have_css('*', :text => options[:text])
         have_hidden_text = have_css('.hidden, .invisible, [style~="display: none"]', :text => options[:text])
         if options[:expectation] == :hidden
-          page.should have_hidden_text
+          expect(page).to have_hidden_text
         else
-          page.should_not have_hidden_text
+          expect(page).not_to have_hidden_text
         end
       end
     ensure

data/spreewald.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency('cucumber')
   gem.add_dependency('cucumber_priority', '>=0.3.0')
+  gem.add_dependency('rspec')
 
   # Development
   gem.add_development_dependency 'bundler', '~> 1.11'
@@ -27,6 +28,5 @@ Gem::Specification.new do |gem|
 
   # Testing
   gem.add_development_dependency 'aruba', '~> 0.10.2'
-  gem.add_development_dependency 'rspec', '~> 3.4.0'
   gem.add_development_dependency 'geordi'
 end

data/tests/rails-3_capybara-1/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: ../..
   specs:
-    spreewald (1.12.6)
+    spreewald (2.0.0)
       cucumber
       cucumber_priority (>= 0.3.0)
+      rspec
 
 GEM
   remote: https://rubygems.org/
@@ -110,6 +111,10 @@ GEM
     rake (10.0.4)
     rdoc (3.12.2)
       json (~> 1.4)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
     rspec-core (2.13.1)
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)

data/tests/rails-3_capybara-2/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: ../..
   specs:
-    spreewald (1.12.6)
+    spreewald (2.0.0)
       cucumber
       cucumber_priority (>= 0.3.0)
+      rspec
 
 GEM
   remote: https://rubygems.org/
@@ -118,6 +119,10 @@ GEM
     rbx-require-relative (0.0.9)
     rdoc (3.12.2)
       json (~> 1.4)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
     rspec-core (2.13.1)
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)

data/tests/rails-4_capybara-3/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: ../..
   specs:
-    spreewald (1.12.6)
+    spreewald (2.0.0)
       cucumber
       cucumber_priority (>= 0.3.0)
+      rspec
 
 GEM
   remote: https://rubygems.org/
@@ -153,6 +154,10 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rake (12.3.2)
     regexp_parser (1.3.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
     rspec-core (3.8.0)
       rspec-support (~> 3.8.0)
     rspec-expectations (3.8.2)

data/tests/rails-4_capybara-3/features/email_steps.feature

@@ -13,7 +13,7 @@ Feature: Test Spreewald's email steps
   Scenario: /^I should see "([^\"]*)" in the e?mail$/
     When I go to "/emails/send_email"
     Then the following step should succeed:
-      | I should see "BODY" in the email |
+      | I should see "Body" in the email |
     But the following step should fail:
       | I should see "XYZ" in the email |
 
@@ -23,7 +23,7 @@ Feature: Test Spreewald's email steps
 
     # Test without body
     Then the following multiline step should succeed:
-    """
+      """
       Then an email should have been sent with:
         '''
         From: from@example.com
@@ -43,7 +43,10 @@ Feature: Test Spreewald's email steps
         To: to@example.com
         Subject: SUBJECT
 
-        BODY
+        Body
+        with
+        line
+        breaks
         '''
       """
 
@@ -57,7 +60,10 @@ Feature: Test Spreewald's email steps
         To: to@example.com
         Subject: SUBJECT
 
-        BODY
+        Body
+        with
+        line
+        breaks
         '''
       """
 
@@ -71,12 +77,15 @@ Feature: Test Spreewald's email steps
         To: to@example.com
         Subject: SUBJECT
 
-        BODY
+        Body
+        with
+        line
+        breaks
         '''
       """
     # Test with incorrect To header
     Then the following multiline step should fail:
-    """
+      """
       Then an email should have been sent with:
         '''
         From: from@example.com
@@ -84,13 +93,16 @@ Feature: Test Spreewald's email steps
         To: other-to@example.com
         Subject: SUBJECT
 
-        BODY
+        Body
+        with
+        line
+        breaks
         '''
       """
 
     # Test with incorrect Subject header
     Then the following multiline step should fail:
-    """
+      """
       Then an email should have been sent with:
         '''
         From: from@example.com
@@ -98,7 +110,10 @@ Feature: Test Spreewald's email steps
         To: to@example.com
         Subject: OTHER-SUBJECT
 
-        BODY
+        Body
+        with
+        line
+        breaks
         '''
       """
 
@@ -112,7 +127,10 @@ Feature: Test Spreewald's email steps
         To: to@example.com
         Subject: SUBJECT
 
-        OTHER-BODY
+        Other body
+        with
+        line
+        breaks
         '''
       """
 
@@ -126,8 +144,81 @@ Feature: Test Spreewald's email steps
         To: to@example.com
         Subject: SUBJECT
 
-        BODY
+        Body
+        with
+        line
+        breaks
         
         MORE-BODY
         '''
       """
+
+  Scenario: /^(an|no) e?mail should have been sent((?: |and|with|from "[^"]+"|bcc "[^"]+"|cc "[^"]+"|to "[^"]+"|the subject "[^"]+"|the body "[^"]+"|the attachments "[^"]+")+)$/
+    When I go to "/emails/send_email"
+
+    # Test with correct conditions
+    Then the following multiline step should succeed:
+      """
+      Then an email should have been sent from "from@example.com" to "to@example.com" cc "cc@example.com" bcc "bcc@example.com" and the subject "SUBJECT" and the attachments "attached_file.pdf"
+      """
+
+     # Test with wrong conditions
+    Then the following multiline step should fail:
+      """
+      Then an email should have been sent from "from@example.com" to "to@example.com" cc "cc@example.com" bcc "wrong_bcc@example.com" and the subject "SUBJECT" and the attachments "attached_file.pdf"
+      """
+
+  Scenario: /^that e?mail should have the following lines in the body:$/
+    When I go to "/emails/send_email"
+    Then an email should have been sent with:
+      """
+      From: from@example.com
+      """
+
+    # Test with correct body lines
+    Then the following multiline step should succeed:
+      """
+      Then that email should have the following lines in the body:
+        '''
+        with
+        line
+        '''
+      """
+
+     # Test with wrong body lines
+    Then the following multiline step should fail:
+      """
+      Then that email should have the following lines in the body:
+        '''
+        wrong
+        line
+        '''
+      """
+
+
+  Scenario: /^that e?mail should have the following body:$/
+    When I go to "/emails/send_email"
+    Then an email should have been sent with:
+      """
+      From: from@example.com
+      """
+
+      # Test with correct body lines
+    Then the following multiline step should succeed:
+      """
+      Then that email should have the following body:
+        '''
+        with
+        line
+        '''
+      """
+
+       # Test with wrong body lines
+    Then the following multiline step should fail:
+      """
+      Then that email should have the following body:
+        '''
+        wrong
+        line
+        '''
+      """

data/tests/rails-4_capybara-3/features/step_definitions/overriding_steps.rb

@@ -1,3 +1,3 @@
 Then /^I should see "overridden value"$/ do
-  page.should have_content('overridden value')
+  expect(page).to have_content('overridden value')
 end

data/tests/rails-4_capybara-3/features/web_steps.feature

@@ -3,6 +3,7 @@ Feature: Web steps
   Scenario: /^the "([^"]*)" field should (not )?contain "([^"]*)"$/
     When I go to "/forms/form1"
     Then the "Text control" field should contain "Text control value"
+    Then the "Text control" field should not contain "false text"
     Then the "Select control" field should contain "Label 2"
     Then the "Select control without selection" field should contain "Label 1"
     Then the "Textarea control" field should contain "Textarea control value"
@@ -20,11 +21,29 @@ Feature: Web steps
       Textarea control line 1
       Textarea control line 2
       """
+    Then the "Textarea control" field should not contain:
+      """
+      Textarea control wrong line 1
+      Textarea control wrong line 2
+      """
     Then the "Empty textarea control" field should contain:
       """
       """
 
 
+  Scenario: /^the "([^\"]*)" field should( not)? have an error$/
+    When I go to "/forms/invalid_form"
+    Then the "Text control" field should have an error
+    Then the "Textarea control" field should have an error
+    Then the "Textarea control" field should have an error
+    Then the "Empty textarea control" field should not have an error
+
+
+  Scenario: /^the "([^"]*)" field should have no error$/
+    When I go to "/forms/invalid_form"
+    Then the "Empty textarea control" field should have no error
+
+
   Scenario: /^I should see a form with the following values:$/
     When I go to "/forms/form1"
     Then I should see a form with the following values:
@@ -47,7 +66,18 @@ Feature: Web steps
     Then nothing should be selected for "Select control with blank option"
     Then nothing should be selected for "Select control with blank selection"
 
-  
+  Scenario: /^the radio button "([^"]*)" should( not)? be (?:checked|selected)$/
+    When I go to "/forms/form1"
+    Then the radio button "Radio 1" should not be selected
+    Then the radio button "Radio 2" should not be selected
+    When I choose "Radio 1"
+    Then the radio button "Radio 1" should be selected
+    Then the radio button "Radio 2" should not be selected
+    When I choose "Radio 2"
+    Then the radio button "Radio 1" should not be selected
+    Then the radio button "Radio 2" should be selected
+
+
   Scenario: /^I go back$/
     Given I go to "/static_pages/link_to_home"
       And I follow "Home"
@@ -103,7 +133,7 @@ Feature: Web steps
 
   Scenario: /^Then (the tag )?"..." should( not)? be visible$/
     When I go to "/static_pages/visibility"
-    Then "hidden ümläüt" should not be visible
+    Then "hidden ümläüt" should be hidden
       And "visible ümläüt" should be visible
       And a hidden string with quotes should not be visible
       And a visible string with quotes should be visible
@@ -113,7 +143,7 @@ Feature: Web steps
   @javascript
   Scenario: /^Then (the tag )?"..." should( not)? be visible$/ with javascript
     When I go to "/static_pages/visibility"
-    Then "hidden ümläüt" should not be visible
+    Then "hidden ümläüt" should be hidden
     And "visible ümläüt" should be visible
     And a hidden string with quotes should not be visible
     And a visible string with quotes should be visible

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

@@ -12,4 +12,7 @@ class FormsController < ApplicationController
   def select_fields
   end
 
+  def invalid_form
+  end
+
 end

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

@@ -2,29 +2,34 @@ class Mailer < ActionMailer::Base
 
   REPLY_TO = "reply-to@example.com"
   TO = "to@example.com"
+  CC = "cc@example.com"
+  BCC = "bcc@example.com"
   FROM = "from@example.com"
   SUBJECT = "SUBJECT"
-  BODY = "BODY"
 
   if Rails.version >= "3"
 
     def email
+      attachments['attached_file.pdf'] = File.open("../../tmp/attachment.pdf", "w") {}
       mail(
         :from => FROM,
         :reply_to => REPLY_TO,
         :to => TO,
+        :cc => CC,
+        :bcc => BCC,
         :subject => SUBJECT
-      ) do |format|
-        format.text { render :text => BODY }
-      end
+      )
     end
 
   else
 
     def email
+      attachments['attached_file.pdf'] = File.open("../../tmp/attachment.pdf", "w") {}
       recipients TO
       reply_to REPLY_TO
       from FROM
+      cc CC
+      bcc BCC
       subject SUBJECT
       body BODY
     end