spreewald 2.99.1 → 2.99.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00603bf8e54cec9e5ceab37fec65ebc1ed2e0a83b753a2eb63b7c1481470cd0b
-  data.tar.gz: 713310e4fd479da1786534a0c6c33769483d87b6199e47ff2fa432f9333245a2
+  metadata.gz: 04e59902ff7a473603ddb7619f350b34de83072a81e36afc5767480e837c4345
+  data.tar.gz: 5dfc9a6630cc0332228024528a55025f7d672140bd0acabbffecbafbcd18188c
 SHA512:
-  metadata.gz: 1ac94e470ce28516b0aa09dac529631a4208a4eb8dc8ae9959c6d8cbecc779521d74f569f5041a71a2bcd71a1a23a52b4e48a9decc991fed8e5db5e07c5a17a8
-  data.tar.gz: 9d66b30b3fa449c0e69f16b654ccacb4ee10349cf2eb34f328a08cf45cc5390fd73aad455d63232f75ca8df4e9e320763ef8aff39b711108d46dd553f2b2c25c
+  metadata.gz: 21eed3d8dab955f4da45fa3a30fda49c1d3f6ca2b462736cb4e171725a7c685f6e6149a1a261646028fcb1310fb9a070e68679426a670d77271d3c2e2926ca58
+  data.tar.gz: 299c23ccc3f6f751b850e0d776da679c6f2c4480cb1e150ff655cc31aaaffd33008f592b5b3d53a4f9bae543391ec75943f42805949b5be690f1d383a25bfed4

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.2
+
+- Fix deduplication of linebreaks for html mails in mail finder. (see issue [#153](https://github.com/makandra/spreewald/issues/153))
+
 ## 2.99.1
 
 - Reintroduced support for emails with CRLF line ending

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 = '2.99.1'
+  VERSION = '2.99.2'
 end

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

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    spreewald (2.99.1)
+    spreewald (2.99.2)
       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.1)
+    spreewald (2.99.2)
       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.1)
+    spreewald (2.99.2)
       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.1)
+    spreewald (2.99.2)
       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

@@ -315,6 +315,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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spreewald
 version: !ruby/object:Gem::Version
-  version: 2.99.1
+  version: 2.99.2
 platform: ruby
 authors:
 - Tobias Kraze
@@ -350,6 +350,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
@@ -583,6 +584,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