spreewald 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13490aa27d2ade6a30674d36cbe3374b0d4e6f4687958300b56047b2033a49b3
-  data.tar.gz: 897b9e7881f0f50f32aa8c78afac85380a281e39bf25e007694bf9bb07654efc
+  metadata.gz: 6a51defb2267ab0f0f6e9123b474e0069758e59eaa3f18cadefdfdb81a5f5760
+  data.tar.gz: f47297c29b676ee194c1dbc2f335eab608afefa9730e124e8811d4542089031e
 SHA512:
-  metadata.gz: f5653340cf2ae8b8f3aaabb29a47df7854e86fe1c88ef49310f583c7733e9ef8e49867e914ca4547a6b3ed3ee2f78dc4dc26a9c9dbda67ff426b38532efa8596
-  data.tar.gz: b00d439380d560f792963261900b3840733c0a2f394da89de984ea3a3469b0ee549b30ea84491fcc2017eaebf3e15ce622439dac5ea55f1b94d7c4258fe8b179
+  metadata.gz: 3b93c18acce9d744364898f65e6f3597d06b37ed85d69bb81e3593521d0433bc56338b974c32133c0fce749190ee8af63c146b355e12601397b3641d4424380d
+  data.tar.gz: b675ad24c9c6e9836880d9111f1538d8f3b5c2d91e390dc5ee5165842cb19298d039fa428405dd47df20daa40b59234f641fcc3e4cab2cf0f6405449ecad981c

data/CHANGELOG.md

@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 3.0.3
+
+- The `an email should have been sent with` step now interprets all lines as body when not specifying headers (see issue [#157](https://github.com/makandra/spreewald/issues/157))
+
 ## 3.0.2
 
 - Introduce wildcard for the beginning of a line. (see issue [#155](https://github.com/makandra/spreewald/issues/155))

data/lib/spreewald_support/mail_finder.rb

@@ -15,6 +15,11 @@ class MailFinder
         end
       end
 
+      # Interpret all lines as body if there are no header-link lines
+      if conditions.blank?
+        body = [header, body].join("\n\n")
+      end
+
       filename_method = Rails::VERSION::MAJOR < 3 ? 'original_filename' : 'filename'
       matching_header = ActionMailer::Base.deliveries.select do |mail|
         [ conditions[:to].nil? || mail.to.include?(resolve_email conditions[:to]),

data/lib/spreewald_support/version.rb

@@ -1,3 +1,3 @@
 module Spreewald
-  VERSION = '3.0.2'
+  VERSION = '3.0.3'
 end

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

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    spreewald (3.0.2)
+    spreewald (3.0.3)
       cucumber
       cucumber_priority (>= 0.3.0)
       rspec (>= 2.13.0)

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

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    spreewald (3.0.2)
+    spreewald (3.0.3)
       cucumber
       cucumber_priority (>= 0.3.0)
       rspec (>= 2.13.0)

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

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    spreewald (3.0.2)
+    spreewald (3.0.3)
       cucumber
       cucumber_priority (>= 0.3.0)
       rspec (>= 2.13.0)

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

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    spreewald (3.0.2)
+    spreewald (3.0.3)
       cucumber
       cucumber_priority (>= 0.3.0)
       rspec (>= 2.13.0)

data/tests/rails-6_capybara-3/app/mailers/spreewald_mailer.rb

@@ -46,5 +46,21 @@ class SpreewaldMailer < ApplicationMailer
     email
   end
 
+  def html_email_for_successful_test_without_header
+    email
+  end
+
+  def text_email_for_successful_test_without_header
+    email
+  end
+
+  def html_email_for_failed_test_without_header
+    email
+  end
+
+  def text_email_for_failed_test_without_header
+    email
+  end
+
 end
 

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

@@ -44,6 +44,26 @@ class EmailsController < ApplicationController
     render_nothing
   end
 
+  def send_html_email_for_successful_test_without_header
+    deliver :html_email_for_successful_test_without_header
+    render_nothing
+  end
+
+  def send_text_email_for_successful_test_without_header
+    deliver :text_email_for_successful_test_without_header
+    render_nothing
+  end
+
+  def send_html_email_for_failed_test_without_header
+    deliver :html_email_for_failed_test_without_header
+    render_nothing
+  end
+
+  def send_text_email_for_failed_test_without_header
+    deliver :text_email_for_failed_test_without_header
+    render_nothing
+  end
+
   private
 
   def deliver(method_name)

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

@@ -49,6 +49,22 @@ class Mailer < ActionMailer::Base
       email
     end
 
+    def html_email_for_successful_test_without_header
+      email
+    end
+
+    def text_email_for_successful_test_without_header
+      email
+    end
+
+    def html_email_for_failed_test_without_header
+      email
+    end
+
+    def text_email_for_failed_test_without_header
+      email
+    end
+
   else
 
     def email
@@ -82,6 +98,22 @@ class Mailer < ActionMailer::Base
       email
     end
 
+    def html_email_for_successful_test_without_header
+      email
+    end
+
+    def text_email_for_successful_test_without_header
+      email
+    end
+
+    def html_email_for_failed_test_without_header
+      email
+    end
+
+    def text_email_for_failed_test_without_header
+      email
+    end
+
   end
 
 end

data/tests/shared/app/views/mailer/html_email_for_failed_test_without_header.haml

@@ -0,0 +1,5 @@
+!!!
+%html(lang="en" xmlns="http://www.w3.org/1999/xhtml")
+  %body
+    %p
+      Bye

data/tests/shared/app/views/mailer/html_email_for_successful_test_without_header.haml

@@ -0,0 +1,7 @@
+!!!
+%html(lang="en" xmlns="http://www.w3.org/1999/xhtml")
+  %body
+    %p
+      Hello
+    %p
+      Bye

data/tests/shared/app/views/mailer/text_email_for_failed_test_without_header.text.erb

@@ -0,0 +1 @@
+Bye

data/tests/shared/app/views/mailer/text_email_for_successful_test_without_header.text.erb

@@ -0,0 +1,3 @@
+Hello
+
+Bye

data/tests/shared/config/routes.rb

@@ -13,6 +13,10 @@ Rails.application.routes.draw do
   get '/emails/send_html_email_with_linebreaks', to: 'emails#send_html_email_with_linebreaks'
   get '/emails/send_html_email_with_specific_line', to: 'emails#send_html_email_with_specific_line'
   get '/emails/send_text_email_with_specific_line', to: 'emails#send_text_email_with_specific_line'
+  get '/emails/send_html_email_for_successful_test_without_header', to: 'emails#send_html_email_for_successful_test_without_header'
+  get '/emails/send_text_email_for_successful_test_without_header', to: 'emails#send_text_email_for_successful_test_without_header'
+  get '/emails/send_html_email_for_failed_test_without_header', to: 'emails#send_html_email_for_failed_test_without_header'
+  get '/emails/send_text_email_for_failed_test_without_header', to: 'emails#send_text_email_for_failed_test_without_header'
 
   get '/forms/checkbox_form', to: 'forms#checkbox_form'
   get '/forms/disabled_elements', to: 'forms#disabled_elements'

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

@@ -324,6 +324,127 @@ Feature: Test Spreewald's email steps
         '''
       """
 
+    # Tests without header
+    When I clear my emails
+      And I go to "/emails/send_text_email_for_successful_test_without_header"
+    Then the following multiline step should succeed:
+      """
+      Then an email should have been sent with:
+        '''
+        Hello
+
+        Bye
+        '''
+      """
+      And the following multiline step should succeed:
+        """
+        Then an email should have been sent with:
+          '''
+          To: to@example.com
+
+          Hello
+
+          Bye
+          '''
+        """
+    But the following multiline step should fail:
+      """
+      Then an email should have been sent with:
+        '''
+        To: wrong-guy@example.com
+
+        Hello
+
+        Bye
+        '''
+      """
+
+    When I clear my emails
+      And I go to "/emails/send_text_email_for_failed_test_without_header"
+    Then the following multiline step should fail:
+      """
+      Then an email should have been sent with:
+        '''
+        Hello
+
+        Bye
+        '''
+      """
+    But the following multiline step should succeed:
+      """
+      Then an email should have been sent with:
+        '''
+        Bye
+        '''
+      """
+      And the following multiline step should succeed:
+        """
+        Then an email should have been sent with:
+          '''
+          To: to@example.com
+
+          Bye
+          '''
+        """
+
+    When I clear my emails
+      And I go to "/emails/send_html_email_for_successful_test_without_header"
+    Then the following multiline step should succeed:
+      """
+      Then an email should have been sent with:
+        '''
+        Hello
+        Bye
+        '''
+      """
+      And the following multiline step should succeed:
+        """
+        Then an email should have been sent with:
+          '''
+          To: to@example.com
+
+          Hello
+          Bye
+          '''
+        """
+    But the following multiline step should fail:
+      """
+      Then an email should have been sent with:
+        '''
+        To: wrong-guy@example.com
+
+        Hello
+        Bye
+        '''
+      """
+
+    When I clear my emails
+      And I go to "/emails/send_html_email_for_failed_test_without_header"
+    Then the following multiline step should fail:
+      """
+      Then an email should have been sent with:
+        '''
+        Hello
+        Bye
+        '''
+      """
+    But the following multiline step should succeed:
+      """
+      Then an email should have been sent with:
+        '''
+        Bye
+        '''
+      """
+      And the following multiline step should succeed:
+        """
+        Then an email should have been sent with:
+          '''
+          To: to@example.com
+
+          Bye
+          '''
+        """
+
   Scenario: /^I follow the (first|second|third)? ?link in the e?mail$/ (HTML e-mail body)
     When I go to "/emails/send_html_email_with_links"
       And I follow the first link in the email

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spreewald
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Tobias Kraze
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-18 00:00:00.000000000 Z
+date: 2021-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -348,9 +348,13 @@ files:
 - tests/shared/app/views/mailer/email.text.erb
 - tests/shared/app/views/mailer/email_crlf.text.erb
 - tests/shared/app/views/mailer/email_with_umlauts.text.erb
+- tests/shared/app/views/mailer/html_email_for_failed_test_without_header.haml
+- tests/shared/app/views/mailer/html_email_for_successful_test_without_header.haml
 - tests/shared/app/views/mailer/html_email_with_linebreaks.html
 - tests/shared/app/views/mailer/html_email_with_links.haml
 - tests/shared/app/views/mailer/html_email_with_specific_line.haml
+- tests/shared/app/views/mailer/text_email_for_failed_test_without_header.text.erb
+- tests/shared/app/views/mailer/text_email_for_successful_test_without_header.text.erb
 - tests/shared/app/views/mailer/text_email_with_links.text.erb
 - tests/shared/app/views/mailer/text_email_with_specific_line.text.erb
 - tests/shared/app/views/spreewald_mailer
@@ -413,7 +417,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Collection of useful cucumber steps.
@@ -584,9 +588,13 @@ test_files:
 - tests/shared/app/views/mailer/email.text.erb
 - tests/shared/app/views/mailer/email_crlf.text.erb
 - tests/shared/app/views/mailer/email_with_umlauts.text.erb
+- tests/shared/app/views/mailer/html_email_for_failed_test_without_header.haml
+- tests/shared/app/views/mailer/html_email_for_successful_test_without_header.haml
 - tests/shared/app/views/mailer/html_email_with_linebreaks.html
 - tests/shared/app/views/mailer/html_email_with_links.haml
 - tests/shared/app/views/mailer/html_email_with_specific_line.haml
+- tests/shared/app/views/mailer/text_email_for_failed_test_without_header.text.erb
+- tests/shared/app/views/mailer/text_email_for_successful_test_without_header.text.erb
 - tests/shared/app/views/mailer/text_email_with_links.text.erb
 - tests/shared/app/views/mailer/text_email_with_specific_line.text.erb
 - tests/shared/app/views/spreewald_mailer