effective_test_bot 1.5.9 → 1.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7de769d60d59f161b3606b64719f254251dea7834310e440be28ea831263fa5
-  data.tar.gz: 1979f907166f5a0b445e1498b50bd4476700db1f737b0dea7b92a6dad2277d76
+  metadata.gz: 5d6c35e391f98542191fd633aa5b1969e90657ceb2b5fe872e7735184c392a71
+  data.tar.gz: dcd72ecee5a4e73dfee52a068166010f54c1c30b96ca1305c88fbe824987d8ee
 SHA512:
-  metadata.gz: '069bb7337b7bb695e4b98c849dc2a939dfe44e082a34ef9259b1b2b2ab50053f9b2fbb98b4190ed04ffc8d718c771c35396488753f02bee94f3e72d4d23d49b8'
-  data.tar.gz: 762721642757acfdae3953a6de328a306fb798d445e03fcd76a4004fb02f28e67b771392ccf4646948f4d2ea8e1da7a9cbcba2204a24695057e1f2cb68eb6b9e
+  metadata.gz: 38f0da58d5f36f2e45121ddcdf1adbd8bd2f022eb9bec14311f5951b24f9bcddb21a54c33f64d789d3b3d02987d7cb140cde357302b4cf5c6501cb6f6c6260a0
+  data.tar.gz: 4b1adb6b0a0ce8408f40fb0090b7646099925f887b2c6e0910798bb8601123f5c8dd83d02534b60a2720bed76cd1bf6293e85aa42314389aadcf4c456081bb5f

data/lib/effective_test_bot/version.rb

@@ -1,3 +1,3 @@
 module EffectiveTestBot
-  VERSION = '1.5.9'.freeze
+  VERSION = '1.5.10'.freeze
 end

data/test/support/effective_test_bot_assertions.rb

@@ -253,13 +253,16 @@ module EffectiveTestBotAssertions
   # assert_email :new_user_sign_up
   # assert_email :new_user_sign_up, to: 'newuser@example.com'
   # assert_email from: 'admin@example.com'
-  def assert_email(action = nil, perform: true, to: nil, from: nil, subject: nil, body: nil, message: nil, count: nil, &block)
+  def assert_email(action = nil, perform: true, to: nil, from: nil, subject: nil, body: nil, message: nil, count: nil, plain_layout: nil, html_layout: nil, &block)
     retval = nil
 
     # Clear the queue of any previous emails first
     if perform
       assert_email_perform_enqueued_jobs
       raise('expected empty mailer queue. unable to clear it.') unless (assert_email_perform_enqueued_jobs.to_i == 0)
+
+      ActionMailer::Base.deliveries.clear
+      raise('expected empty mailer deliveries. unable to clear it.') unless (ActionMailer::Base.deliveries.length.to_i == 0)
     end
 
     before = ActionMailer::Base.deliveries.length
@@ -277,7 +280,7 @@ module EffectiveTestBotAssertions
       end
     end
 
-    if (action || to || from || subject || body).nil?
+    if (action || to || from || subject || body || plain_layout || html_layout).nil?
       assert ActionMailer::Base.deliveries.present?, message || "(assert_email) Expected email to have been delivered"
       return retval
     end
@@ -287,11 +290,23 @@ module EffectiveTestBotAssertions
     ActionMailer::Base.deliveries.each do |message|
       matches = true
 
+      html_body = message.parts.find { |part| part.content_type.start_with?('text/html') }.try(:body).to_s.presence
+      plain_body = message.parts.find { |part| part.content_type.start_with?('text/plain') }.try(:body).to_s.presence
+      message_body = message.body.to_s
+
       matches &&= (actions.include?(action.to_s)) if action
       matches &&= (Array(message.to).include?(to)) if to
       matches &&= (Array(message.from).include?(from)) if from
       matches &&= (message.subject == subject) if subject
-      matches &&= (message.body == body) if body
+
+      if body && html_layout
+        matches &&= html_body.to_s.gsub("\r\n", '').gsub("\n", '').include?(">#{body}<")
+      elsif body
+        matches &&= (plain_body == body || message_body == body)
+      end
+
+      matches &&= (html_body.present? && html_body.include?('<meta')) if html_layout
+      matches &&= (html_body.blank? && plain_body.blank? && message_body.exclude?('<meta')) if plain_layout
 
       return retval if matches
     end
@@ -302,6 +317,8 @@ module EffectiveTestBotAssertions
       ("from: {from}" if from),
       ("subject: #{subject}" if subject),
       ("body: #{body}" if body),
+      ("an HTML layout" if html_layout),
+      ("no HTML layout" if plain_layout),
     ].compact.to_sentence
 
     assert false, message || "(assert_email) Expected email with #{expected} to have been delivered"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_test_bot
 version: !ruby/object:Gem::Version
-  version: 1.5.9
+  version: 1.5.10
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-07 00:00:00.000000000 Z
+date: 2024-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails