mail 2.6.1 → 2.8.1

data/lib/mail/matchers/has_sent_mail.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Mail
   module Matchers
     def have_sent_email
@@ -42,15 +43,25 @@ module Mail
 
       def bcc(recipient_or_list)
         @blind_copy_recipients ||= []
+        @blind_copy_recipients.concat(Array(recipient_or_list))
+        self
+      end
 
-        if recipient_or_list.kind_of?(Array)
-          @blind_copy_recipients += recipient_or_list
-        else
-          @blind_copy_recipients << recipient_or_list
-        end
+      def with_attachments(attachments)
+        @attachments ||= []
+        @attachments.concat(Array(attachments))
+        self
+      end
+
+      def with_no_attachments
+        @having_attachments = false
         self
       end
 
+      def with_any_attachments
+        @having_attachments = true
+        self
+      end
 
       def with_subject(subject)
         @subject = subject
@@ -72,6 +83,16 @@ module Mail
         self
       end
 
+      def with_html(body)
+        @html_part_body = body
+        self
+      end
+
+      def with_text(body)
+        @text_part_body = body
+        self
+      end
+
       def description
         result = "send a matching email"
         result
@@ -84,7 +105,7 @@ module Mail
         result
       end
 
-      def negative_failure_message
+      def failure_message_when_negated
         result = "Expected no email to be sent "
         result += explain_expectations
         result += dump_deliveries
@@ -92,11 +113,13 @@ module Mail
       end
 
       protected
-      
+
       def filter_matched_deliveries(deliveries)
         candidate_deliveries = deliveries
-
-        %w(sender recipients copy_recipients blind_copy_recipients subject subject_matcher body body_matcher).each do |modifier_name|
+        modifiers =
+          %w(sender recipients copy_recipients blind_copy_recipients subject
+          subject_matcher body body_matcher html_part_body text_part_body  having_attachments attachments)
+        modifiers.each do |modifier_name|
           next unless instance_variable_defined?("@#{modifier_name}")
           candidate_deliveries = candidate_deliveries.select{|matching_delivery| self.send("matches_on_#{modifier_name}?", matching_delivery)}
         end
@@ -128,6 +151,17 @@ module Mail
         @subject_matcher.match delivery.subject
       end
 
+      def matches_on_having_attachments?(delivery)
+        @having_attachments && delivery.attachments.any? ||
+          (!@having_attachments && delivery.attachments.none?)
+      end
+
+      def matches_on_attachments?(delivery)
+        @attachments.each_with_index.inject( true ) do |sent_attachments, (attachment, index)|
+          sent_attachments &&= (attachment === delivery.attachments[index])
+        end
+      end
+
       def matches_on_body?(delivery)
         delivery.body == @body
       end
@@ -136,6 +170,14 @@ module Mail
         @body_matcher.match delivery.body.raw_source
       end
 
+      def matches_on_html_part_body?(delivery)
+        delivery.html_part.body == @html_part_body
+      end
+
+      def matches_on_text_part_body?(delivery)
+        delivery.text_part.body == @text_part_body
+      end
+
       def explain_expectations
         result = ''
         result += "from #{@sender} " if instance_variable_defined?('@sender')
@@ -146,6 +188,8 @@ module Mail
         result += "with subject matching \"#{@subject_matcher}\" " if instance_variable_defined?('@subject_matcher')
         result += "with body \"#{@body}\" " if instance_variable_defined?('@body')
         result += "with body matching \"#{@body_matcher}\" " if instance_variable_defined?('@body_matcher')
+        result += "with a text part matching \"#{@text_part_body}\" " if instance_variable_defined?('@text_part_body')
+        result += "with an HTML part matching \"#{@html_part_body}\" " if instance_variable_defined?('@html_part_body')
         result
       end