spreewald 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64749212dae1262a16bb92a588740444cf7ede78c5980fbdf15f66271a4b081d
-  data.tar.gz: 7384baaed65e17289ff4d4c52874e1c257b315b0e9026fac51bbea9a414f4141
+  metadata.gz: e94fff73b1219c20c1140b38f45de5a44e57da77eed6ef8fd9107c157a075c37
+  data.tar.gz: 0b9dab763d05e9e248c25d3e8cecb1b6493116dfd96e5c6a5c12e9a52ee417ec
 SHA512:
-  metadata.gz: e06ba20e5252696bd8ce7aecb6f3a6f9f21eb16c3e2f7ba2cb6223bdfdfdf1cb05c34ada79e06bcd94631ea7288e802fab3f9cce98f8d59d34f7b0b9117300c3
-  data.tar.gz: d09e69ad26c4e76a09bfaa44989bcd870b1eb160de410be081bf0d40889e3a7ffc901e02c7e208538e8c92719752a3cb7fa396a9f7dada600c257dcbcf72fef3
+  metadata.gz: 8abca9273d361112be92fecbd993efe99664baf70cb30af7a8be91d006fa89cfa9492a89d3b066a9824adde47439dda412ead601e51cd5006bbf8fd3d7185fb0
+  data.tar.gz: ce43a7c95abf0bc13b21baa1b23b7c14fbe05e10a7ad705efc1debb03bd7c18251d2b8acfaae38e9882d2f34278d9b8fb96860c1ba2795baf16c6d3a38fa8c7e

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.1
+
+- Fix deduplication of linebreaks for html mails in mail finder. (see issue [#153](https://github.com/makandra/spreewald/issues/153))
+
 ## 3.0.0
 
 ### Breaking changes

data/lib/spreewald_support/mail_finder.rb

@@ -60,7 +60,7 @@ class MailFinder
     def email_text_body(mail, type = '')
       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")
+        dom.at_css('body').text.gsub(/[\r\n]+/, "\n")
       elsif mail.text_part && type != 'HTML'
         mail.text_part.body.to_s
       else

data/lib/spreewald_support/version.rb

@@ -1,3 +1,3 @@
 module Spreewald
-  VERSION = '3.0.0'
+  VERSION = '3.0.1'
 end

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

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

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

@@ -34,5 +34,9 @@ class SpreewaldMailer < ApplicationMailer
     email
   end
 
+  def html_email_with_linebreaks
+    email
+  end
+
 end
 

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

@@ -29,6 +29,11 @@ class EmailsController < ApplicationController
     render_nothing
   end
 
+  def send_html_email_with_linebreaks
+    deliver :html_email_with_linebreaks
+    render_nothing
+  end
+
   private
 
   def deliver(method_name)

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

@@ -37,6 +37,10 @@ class Mailer < ActionMailer::Base
       email
     end
 
+    def html_email_with_linebreaks
+      email
+    end
+
   else
 
     def email

data/tests/shared/app/views/mailer/html_email_with_linebreaks.html

@@ -0,0 +1,6 @@
+<p>
+Hello!
+</p>
+<p>
+Bye!
+</p>

data/tests/shared/config/routes.rb

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

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

@@ -269,6 +269,23 @@ Feature: Test Spreewald's email steps
         '''
       """
 
+    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: 3.0.0
+  version: 3.0.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,7 @@ 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_with_linebreaks.html
 - 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 +411,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.
@@ -581,6 +582,7 @@ 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_with_linebreaks.html
 - 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