spreewald 2.99.0 → 2.99.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e40a203a4efe394c63dfe3513bcbee6fd9b2c03adeb6a2da742083f8e1916db
-  data.tar.gz: a3607b851a21bbed752f0abcb07a0f492efeb03d7bcf9dab65df2ee4049fbd30
+  metadata.gz: 00603bf8e54cec9e5ceab37fec65ebc1ed2e0a83b753a2eb63b7c1481470cd0b
+  data.tar.gz: 713310e4fd479da1786534a0c6c33769483d87b6199e47ff2fa432f9333245a2
 SHA512:
-  metadata.gz: 44e4db7d78e098e62fde16d7c912dd761384fde5d131d3dc9b92c7ff960ef60b36e284b9aba8f125ae61c1a36ba9a05c73715b39ae36ec735e285f8eae76baef
-  data.tar.gz: cabe0d013bdbeebd4e250ea73437e15b8de88bca1bfdb6d331fb9521ecda26d8f8fe74e7e7f8e4f150bec938c8d6099cc17823b09f7bf97650021a7cca2d9398
+  metadata.gz: 1ac94e470ce28516b0aa09dac529631a4208a4eb8dc8ae9959c6d8cbecc779521d74f569f5041a71a2bcd71a1a23a52b4e48a9decc991fed8e5db5e07c5a17a8
+  data.tar.gz: 9d66b30b3fa449c0e69f16b654ccacb4ee10349cf2eb34f328a08cf45cc5390fd73aad455d63232f75ca8df4e9e320763ef8aff39b711108d46dd553f2b2c25c

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.1
+
+- Reintroduced support for emails with CRLF line ending
+
 ## 2.99.0
 - The following steps were deprecated and will be removed in the upcoming major version:
   - `/^the "([^"]*)" field should have no error$/` (see [#134](https://github.com/makandra/spreewald/issues/134))

data/lib/spreewald_support/mail_finder.rb

@@ -58,7 +58,7 @@ class MailFinder
     end
 
     def email_text_body(mail, type = '')
-      if mail.html_part && type != 'plain-text'
+      body = if mail.html_part && type != 'plain-text'
         dom = Nokogiri::HTML(mail.html_part.body.to_s)
         dom.at_css('body').text.gsub(/\n\n/, "\n")
       elsif mail.text_part && type != 'HTML'
@@ -66,6 +66,7 @@ class MailFinder
       else
         mail.body.to_s
       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
 
     def show_mails(mails, only_header = false)

data/lib/spreewald_support/version.rb

@@ -1,3 +1,3 @@
 module Spreewald
-  VERSION = '2.99.0'
+  VERSION = '2.99.1'
 end

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

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

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

@@ -17,7 +17,15 @@ class SpreewaldMailer < ApplicationMailer
       :subject => SUBJECT
     )
   end
-  
+
+  def email_crlf
+    email
+  end
+
+  def email_with_umlauts
+    email
+  end
+
   def html_email_with_links
     email
   end

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

@@ -9,6 +9,16 @@ class EmailsController < ApplicationController
     render_nothing
   end
 
+  def send_crlf_email
+    deliver :email_crlf
+    render_nothing
+  end
+
+  def send_email_with_umlauts
+    deliver :email_with_umlauts
+    render_nothing
+  end
+
   def send_html_email_with_links
     deliver :html_email_with_links
     render_nothing

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

@@ -21,6 +21,14 @@ class Mailer < ActionMailer::Base
       )
     end
 
+    def email_crlf
+      email
+    end
+
+    def email_with_umlauts
+      email
+    end
+
     def html_email_with_links
       email
     end
@@ -42,6 +50,10 @@ class Mailer < ActionMailer::Base
       body BODY
     end
 
+    def email_crlf
+      email
+    end
+
     def html_email_with_links
       email
     end

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

@@ -0,0 +1,5 @@
+Body
+with
+CRLF
+line
+breaks

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

@@ -0,0 +1 @@
+Viele Grüße

data/tests/shared/config/routes.rb

@@ -6,6 +6,8 @@ Rails.application.routes.draw do
 
   get '/emails/do_nothing', to: 'emails#do_nothing'
   get '/emails/send_email', to: 'emails#send_email'
+  get '/emails/send_crlf_email', to: 'emails#send_crlf_email'
+  get '/emails/send_email_with_umlauts', to: 'emails#send_email_with_umlauts'
   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'
 

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

@@ -279,6 +279,41 @@ 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
+        '''
+      """
 
   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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spreewald
 version: !ruby/object:Gem::Version
-  version: 2.99.0
+  version: 2.99.1
 platform: ruby
 authors:
 - Tobias Kraze
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-01 00:00:00.000000000 Z
+date: 2020-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -348,6 +348,8 @@ files:
 - tests/shared/app/views/layouts/mailer.html.erb
 - tests/shared/app/views/layouts/mailer.text.erb
 - 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_with_links.haml
 - tests/shared/app/views/mailer/text_email_with_links.text.erb
 - tests/shared/app/views/spreewald_mailer
@@ -410,7 +412,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.
@@ -579,6 +581,8 @@ test_files:
 - tests/shared/app/views/layouts/mailer.html.erb
 - tests/shared/app/views/layouts/mailer.text.erb
 - 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_with_links.haml
 - tests/shared/app/views/mailer/text_email_with_links.text.erb
 - tests/shared/app/views/spreewald_mailer