spreewald 2.99.2 → 2.99.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04e59902ff7a473603ddb7619f350b34de83072a81e36afc5767480e837c4345
-  data.tar.gz: 5dfc9a6630cc0332228024528a55025f7d672140bd0acabbffecbafbcd18188c
+  metadata.gz: 71f40dbc5a327e21940b95c4a4a9b1946e0c30b2090e3f46e927b81f3f44a18b
+  data.tar.gz: c464bee9033caa6ae2b32984058aa0e37128483a2aa299780e60297b5c81b7d4
 SHA512:
-  metadata.gz: 21eed3d8dab955f4da45fa3a30fda49c1d3f6ca2b462736cb4e171725a7c685f6e6149a1a261646028fcb1310fb9a070e68679426a670d77271d3c2e2926ca58
-  data.tar.gz: 299c23ccc3f6f751b850e0d776da679c6f2c4480cb1e150ff655cc31aaaffd33008f592b5b3d53a4f9bae543391ec75943f42805949b5be690f1d383a25bfed4
+  metadata.gz: a927120e6558399206bbd0c97e08c7410f7af5e700b1756daa091e961f9407c237509496791d4dc8f58a7c3e74ab3b78a6b97bca2b1bffa1dc1824ebf999a040
+  data.tar.gz: 12964e9c67396df967c29d1fa3925b6e01f0d0ba747ed016d15fa1cbee2c02e8b71173f6cf57e953cec9ad0d3df7dba6caf71d253e54739e3444c1b22687c2ef

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).
 
+## 2.99.3
+- Introduce wildcard for the beginning of a line. (see issue #155)
+  - This will allow you to check for a specific sentence inside the body
+
 ## 2.99.2
 
 - Fix deduplication of linebreaks for html mails in mail finder. (see issue [#153](https://github.com/makandra/spreewald/issues/153))

data/lib/spreewald_support/mail_finder.rb

@@ -87,6 +87,7 @@ class MailFinder
       expected = '\A\n' + Regexp.quote(expected_body.strip) + '\n\Z'
       expected.gsub! '\n\*\n', '\n[\s\S]*\n'
       expected.gsub! '\*\n', '.*\n'
+      expected.gsub! '\n\*', '\n.*'
 
       expected.gsub! '\A\n', '\A'
       expected.gsub! '\n\Z', '' # Change '' to '\Z' to force that the whole body matches

data/lib/spreewald_support/version.rb

@@ -1,3 +1,3 @@
 module Spreewald
-  VERSION = '2.99.2'
+  VERSION = '2.99.3'
 end

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

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    spreewald (2.99.2)
+    spreewald (2.99.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 (2.99.2)
+    spreewald (2.99.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 (2.99.2)
+    spreewald (2.99.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 (2.99.2)
+    spreewald (2.99.3)
       cucumber
       cucumber_priority (>= 0.3.0)
       rspec (>= 2.13.0)

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

@@ -38,5 +38,13 @@ class SpreewaldMailer < ApplicationMailer
     email
   end
 
+  def html_email_with_specific_line
+    email
+  end
+
+  def text_email_with_specific_line
+    email
+  end
+
 end
 

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

@@ -34,6 +34,16 @@ class EmailsController < ApplicationController
     render_nothing
   end
 
+  def send_html_email_with_specific_line
+    deliver :html_email_with_specific_line
+    render_nothing
+  end
+
+  def send_text_email_with_specific_line
+    deliver :text_email_with_specific_line
+    render_nothing
+  end
+
   private
 
   def deliver(method_name)

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

@@ -41,6 +41,14 @@ class Mailer < ActionMailer::Base
       email
     end
 
+    def html_email_with_specific_line
+      email
+    end
+
+    def text_email_with_specific_line
+      email
+    end
+
   else
 
     def email
@@ -66,6 +74,14 @@ class Mailer < ActionMailer::Base
       email
     end
 
+    def html_email_with_specific_line
+      email
+    end
+
+    def text_email_with_specific_line
+      email
+    end
+
   end
 
 end

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

@@ -0,0 +1,11 @@
+!!!
+%html(lang="en" xmlns="http://www.w3.org/1999/xhtml")
+  %body
+    %p
+      Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.
+
+    %p
+      Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. VERY IMPORTANT SENTENCE. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.
+
+    %p
+      Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.

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

@@ -0,0 +1,5 @@
+Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.
+
+Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. VERY IMPORTANT SENTENCE. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.
+
+Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.

data/tests/shared/config/routes.rb

@@ -11,6 +11,8 @@ Rails.application.routes.draw do
   get '/emails/send_html_email_with_links', to: 'emails#send_html_email_with_links'
   get '/emails/send_text_email_with_links', to: 'emails#send_text_email_with_links'
   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 '/forms/checkbox_form', to: 'forms#checkbox_form'
   get '/forms/disabled_elements', to: 'forms#disabled_elements'

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

@@ -130,6 +130,7 @@ Feature: Test Spreewald's email steps
         breaks
         '''
       """
+
     # Test with incorrect To header
     Then the following multiline step should fail:
       """
@@ -211,12 +212,104 @@ Feature: Test Spreewald's email steps
         Subject: SUBJECT
 
         Body
-        *th
+        t*e
         line
         break
         '''
       """
 
+    When I clear my emails
+      And I go to "/emails/send_crlf_email"
+
+    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
+        with
+        CRLF
+        line
+        breaks
+        '''
+      """
+
+    When I clear my emails
+      And I go to "/emails/send_email_with_umlauts"
+
+    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
+
+        Viele Grüße
+        '''
+      """
+
+    When I clear my emails
+      And I go to "/emails/send_html_email_with_linebreaks"
+
+    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
+
+        Hello!
+        Bye!
+        '''
+      """
+
+    # Test body with wildcard at the begin of a line
+    When I clear my emails
+      And I go to "/emails/send_html_email_with_specific_line"
+
+    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
+
+        Lorem ipsum dolor sit amet, consetetur sadipscing elitr*
+        *VERY IMPORTANT SENTENCE*
+        Ut wisi enim ad minim veniam*
+        '''
+      """
+
+    When I clear my emails
+      And I go to "/emails/send_text_email_with_specific_line"
+
+    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
+
+        Lorem ipsum dolor sit amet, consetetur sadipscing elitr*
+
+        *VERY IMPORTANT SENTENCE*
+
+        Ut wisi enim ad minim veniam*
+        '''
+      """
+
   Scenario: 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"
 
@@ -279,59 +372,6 @@ Feature: Test Spreewald's email steps
         '''
       """
 
-    When I clear my emails
-      And I go to "/emails/send_crlf_email"
-
-    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
-        with
-        CRLF
-        line
-        breaks
-        '''
-      """
-
-    When I clear my emails
-      And I go to "/emails/send_email_with_umlauts"
-
-    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
-
-        Viele Grüße
-        '''
-      """
-
-    When I clear my emails
-      And I go to "/emails/send_html_email_with_linebreaks"
-
-    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
-
-        Hello!
-        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: 2.99.2
+  version: 2.99.3
 platform: ruby
 authors:
 - Tobias Kraze
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-04 00:00:00.000000000 Z
+date: 2020-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -352,7 +352,9 @@ files:
 - tests/shared/app/views/mailer/email_with_umlauts.text.erb
 - 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_with_links.text.erb
+- tests/shared/app/views/mailer/text_email_with_specific_line.text.erb
 - tests/shared/app/views/spreewald_mailer
 - tests/shared/app/views/static_pages/click_on.html.haml
 - tests/shared/app/views/static_pages/home.html.haml
@@ -413,7 +415,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Collection of useful cucumber steps.
@@ -586,7 +588,9 @@ test_files:
 - tests/shared/app/views/mailer/email_with_umlauts.text.erb
 - 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_with_links.text.erb
+- tests/shared/app/views/mailer/text_email_with_specific_line.text.erb
 - tests/shared/app/views/spreewald_mailer
 - tests/shared/app/views/static_pages/click_on.html.haml
 - tests/shared/app/views/static_pages/home.html.haml