sanitize_email 1.2.0 → 1.2.1

data/spec/sanitize_email_spec.rb

@@ -1,19 +1,21 @@
 # Copyright (c) 2008-16 Peter H. Boling of RailsBling.com
 # Released under the MIT license
-require 'spec_helper'
+require "spec_helper"
 
 #
-# TODO: Letter Opener should *not* be required, but setting the delivery method to :file was causing connection errors... WTF?
+# TODO: Letter Opener should *not* be required,
+#       but setting the delivery method to :file
+#       was causing connection errors... WTF?
 #
 describe SanitizeEmail do
 
   DEFAULT_TEST_CONFIG = {
-    :sanitized_cc =>  'cc@sanitize_email.org',
-    :sanitized_bcc => 'bcc@sanitize_email.org',
-    :use_actual_email_prepended_to_subject => false,
-    :use_actual_environment_prepended_to_subject => false,
-    :use_actual_email_as_sanitized_user_name => false
-  }
+    sanitized_cc:  "cc@sanitize_email.org",
+    sanitized_bcc: "bcc@sanitize_email.org",
+    use_actual_email_prepended_to_subject: false,
+    use_actual_environment_prepended_to_subject: false,
+    use_actual_email_as_sanitized_user_name: false
+  }.freeze
 
   before(:all) do
     SanitizeEmail::Deprecation.deprecate_in_silence = true
@@ -23,49 +25,68 @@ describe SanitizeEmail do
   after(:each) do
     SanitizeEmail::Config.config = SanitizeEmail::Config::DEFAULTS
     SanitizeEmail.force_sanitize = nil
-    # The following works with Ruby > 1.9, but to make the test suite run on 18.7 we need a little help
-    # Mail.class_variable_get(:@@delivery_interceptors).pop
-    Mail.send(:class_variable_get, :@@delivery_interceptors).pop
+    Mail.class_variable_get(:@@delivery_interceptors).pop
   end
 
-  def sanitize_spec_dryer(rails_env = 'test')
+  def sanitize_spec_dryer(rails_env = "test")
     allow(Launchy).to receive(:open)
-    location = File.expand_path('../tmp/mail_dump', __FILE__)
+    location = File.expand_path("../tmp/mail_dump", __FILE__)
     FileUtils.remove_file(location, true)
     Mail.defaults do
-      delivery_method LetterOpener::DeliveryMethod, :location => location
+      delivery_method LetterOpener::DeliveryMethod, location: location
     end
+    SanitizeEmail::Config.instance_variable_set(
+      :@config,
+      SanitizeEmail::Config::DEFAULTS.dup
+    )
     allow(Rails).to receive(:env).and_return(rails_env)
   end
 
   def configure_sanitize_email(sanitize_hash = {})
     options = DEFAULT_TEST_CONFIG.merge(sanitize_hash).dup
-    options.reverse_merge!({ :sanitized_to => 'to@sanitize_email.org' }) unless sanitize_hash.has_key?(:sanitized_recipients)
+    unless sanitize_hash.key?(:sanitized_recipients)
+      options.reverse_merge!(sanitized_to: "to@sanitize_email.org")
+    end
     SanitizeEmail::Config.configure do |config|
+      config[:engage] = options[:engage]
       config[:environment] = options[:environment]
       config[:activation_proc] = options[:activation_proc]
       config[:sanitized_to] = options[:sanitized_to]
       config[:sanitized_cc] = options[:sanitized_cc]
       config[:sanitized_bcc] = options[:sanitized_bcc]
-      config[:use_actual_email_prepended_to_subject] = options[:use_actual_email_prepended_to_subject]
-      config[:use_actual_environment_prepended_to_subject] = options[:use_actual_environment_prepended_to_subject]
-      config[:use_actual_email_as_sanitized_user_name] = options[:use_actual_email_as_sanitized_user_name]
+      config[:use_actual_email_prepended_to_subject] =
+        options[:use_actual_email_prepended_to_subject]
+      config[:use_actual_environment_prepended_to_subject] =
+        options[:use_actual_environment_prepended_to_subject]
+      config[:use_actual_email_as_sanitized_user_name] =
+        options[:use_actual_email_as_sanitized_user_name]
 
       # For testing *deprecated* configuration options:
-      config[:local_environments] = options[:local_environments] if options[:local_environments]
-      config[:sanitized_recipients] = options[:sanitized_recipients] if options[:sanitized_recipients]
-      config[:force_sanitize] = options[:force_sanitize] unless options[:force_sanitize].nil?
+      if options[:local_environments]
+        config[:local_environments] = options[:local_environments]
+      end
+      if options[:sanitized_recipients]
+        config[:sanitized_recipients] = options[:sanitized_recipients]
+      end
+      unless options[:force_sanitize].nil?
+        config[:force_sanitize] = options[:force_sanitize]
+      end
     end
     Mail.register_interceptor(SanitizeEmail::Bleach)
   end
 
   def funky_config
     SanitizeEmail::Config.configure do |config|
-      config[:sanitized_to] =         %w( funky@sanitize_email.org yummy@sanitize_email.org same@example.org )
-      config[:sanitized_cc] =         nil
-      config[:sanitized_bcc] =        nil
-      # run/call whatever logic should turn sanitize_email on and off in this Proc:
-      config[:activation_proc] =      Proc.new { Rails.env != 'production' }
+      config[:sanitized_to] =
+        %w(
+             funky@sanitize_email.org
+             yummy@sanitize_email.org
+             same@example.org
+          )
+      config[:sanitized_cc] = nil
+      config[:sanitized_bcc] = nil
+      # logic to turn sanitize_email on and off goes in this Proc:
+      config[:activation_proc] = proc { Rails.env != "production" }
       config[:use_actual_email_prepended_to_subject] = true
       config[:use_actual_environment_prepended_to_subject] = true
       config[:use_actual_email_as_sanitized_user_name] = false
@@ -93,69 +114,79 @@ describe SanitizeEmail do
 
   def mail_delivery_hot_mess
     @email_message = Mail.deliver do
-      from      'same@example.org'
-      to        %w( same@example.org same@example.org same@example.org same@example.org same@example.org )
-      cc        'same@example.org'
-      bcc       'same@example.org'
-      reply_to  'same@example.org'
-      subject   'original subject'
-      body      'funky fresh'
+      from      "same@example.org"
+      to        %w(
+                    same@example.org
+                    same@example.org
+                    same@example.org
+                    same@example.org
+                    same@example.org
+                  )
+      cc        "same@example.org"
+      bcc       "same@example.org"
+      reply_to  "same@example.org"
+      subject   "original subject"
+      body      "funky fresh"
     end
   end
 
   def mail_delivery
     @email_message = Mail.deliver do
-      from      'from@example.org'
-      to        'to@example.org'
-      cc        'cc@example.org'
-      bcc       'bcc@example.org'
-      reply_to  'reply_to@example.org'
-      subject   'original subject'
-      body      'funky fresh'
+      from      "from@example.org"
+      to        "to@example.org"
+      cc        "cc@example.org"
+      bcc       "bcc@example.org"
+      reply_to  "reply_to@example.org"
+      subject   "original subject"
+      body      "funky fresh"
     end
   end
 
   def mail_delivery_multiple_recipients
     @email_message = Mail.deliver do
-      from      'from@example.org'
+      from      "from@example.org"
       to        %w( to1@example.org to2@example.org to3@example.org )
       cc        %w( cc1@example.org cc2@example.org cc3@example.org )
       bcc       %w( bcc1@example.org bcc2@example.org bcc3@example.org )
-      reply_to  'reply_to@example.org'
-      subject   'original subject'
-      body      'funky fresh'
+      reply_to  "reply_to@example.org"
+      subject   "original subject"
+      body      "funky fresh"
     end
   end
 
-  context "module methods" do
-    before(:each) do
-      sanitize_spec_dryer
-    end
+  before(:each) do
+    sanitize_spec_dryer
+  end
 
+  context "module methods" do
     context "unsanitary" do
       before(:each) do
         configure_sanitize_email
         unsanitary_mail_delivery
       end
       it "should not alter non-sanitized attributes" do
-        expect(@email_message).to have_from('from@example.org')
-        expect(@email_message).to have_reply_to('reply_to@example.org')
-        expect(@email_message).to have_body_text('funky fresh')
+        expect(@email_message).to have_from("from@example.org")
+        expect(@email_message).to have_reply_to("reply_to@example.org")
+        expect(@email_message).to have_body_text("funky fresh")
       end
       it "should not prepend overrides" do
-        expect(@email_message).not_to have_to_username("to at sanitize_email.org")
-        expect(@email_message).not_to have_subject("(to at sanitize_email.org)")
+        expect(@email_message).not_to have_to_username(
+          "to at sanitize_email.org"
+        )
+        expect(@email_message).not_to have_subject(
+          "(to at sanitize_email.org)"
+        )
       end
       it "alters nothing" do
-        expect(@email_message).to have_from('from@example.org')
-        expect(@email_message).to have_reply_to('reply_to@example.org')
+        expect(@email_message).to have_from("from@example.org")
+        expect(@email_message).to have_reply_to("reply_to@example.org")
         expect(@email_message).to have_from("from@example.org")
         expect(@email_message).to have_to("to@example.org")
         expect(@email_message).not_to have_to_username("to at")
         expect(@email_message).to have_cc("cc@example.org")
         expect(@email_message).to have_bcc("bcc@example.org")
         expect(@email_message).to have_subject("original subject")
-        expect(@email_message).to have_body_text('funky fresh')
+        expect(@email_message).to have_body_text("funky fresh")
       end
     end
 
@@ -165,13 +196,17 @@ describe SanitizeEmail do
         sanitary_mail_delivery
       end
       it "should not alter non-sanitized attributes" do
-        expect(@email_message).to have_from('from@example.org')
-        expect(@email_message).to have_reply_to('reply_to@example.org')
-        expect(@email_message).to have_body_text('funky fresh')
+        expect(@email_message).to have_from("from@example.org")
+        expect(@email_message).to have_reply_to("reply_to@example.org")
+        expect(@email_message).to have_body_text("funky fresh")
       end
       it "should not prepend overrides" do
-        expect(@email_message).not_to have_to_username("to at sanitize_email.org")
-        expect(@email_message).not_to have_subject("(to at sanitize_email.org)")
+        expect(@email_message).not_to have_to_username(
+          "to at sanitize_email.org"
+        )
+        expect(@email_message).not_to have_subject(
+          "(to at sanitize_email.org)"
+        )
       end
       it "should override" do
         expect(@email_message).to have_to("to@sanitize_email.org")
@@ -179,13 +214,26 @@ describe SanitizeEmail do
         expect(@email_message).to have_bcc("bcc@sanitize_email.org")
       end
       it "should set headers" do
-        expect(@email_message).to have_header("X-Sanitize-Email-To", "to@example.org")
-        expect(@email_message).to have_header("X-Sanitize-Email-Cc", "cc@example.org")
-        expect(@email_message).not_to have_header("X-Sanitize-Email-Bcc", "bcc@sanitize_email.org")
+        expect(@email_message).to have_header(
+          "X-Sanitize-Email-To",
+          "to@example.org"
+        )
+        expect(@email_message).to have_header(
+          "X-Sanitize-Email-Cc",
+          "cc@example.org"
+        )
+        expect(@email_message).not_to have_header(
+          "X-Sanitize-Email-Bcc",
+          "bcc@sanitize_email.org"
+        )
       end
       it "should not prepend originals by default" do
-        expect(@email_message).not_to have_to_username("to at example.org <to@sanitize_email.org>")
-        expect(@email_message).not_to have_subject("(to at example.org) original subject")
+        expect(@email_message).not_to have_to_username(
+          "to at example.org <to@sanitize_email.org>"
+        )
+        expect(@email_message).not_to have_subject(
+          "(to at example.org) original subject"
+        )
       end
     end
 
@@ -195,12 +243,14 @@ describe SanitizeEmail do
         sanitary_mail_delivery_multiple_recipients
       end
       it "should not alter non-sanitized attributes" do
-        expect(@email_message).to have_from('from@example.org')
-        expect(@email_message).to have_reply_to('reply_to@example.org')
-        expect(@email_message).to have_body_text('funky fresh')
+        expect(@email_message).to have_from("from@example.org")
+        expect(@email_message).to have_reply_to("reply_to@example.org")
+        expect(@email_message).to have_body_text("funky fresh")
       end
       it "should not prepend overrides" do
-        expect(@email_message).not_to have_to_username("to at sanitize_email.org")
+        expect(@email_message).not_to have_to_username(
+          "to at sanitize_email.org"
+        )
         expect(@email_message).not_to have_subject("(to at sanitize_email.org)")
       end
       it "should override" do
@@ -209,29 +259,78 @@ describe SanitizeEmail do
         expect(@email_message).to have_bcc("bcc@sanitize_email.org")
       end
       it "should set headers for sanitized :to recipients" do
-        expect(@email_message).to have_header("X-Sanitize-Email-To", "to1@example.org")
-        expect(@email_message).not_to have_header("X-Sanitize-Email-To-0", "to1@example.org")
-        expect(@email_message).not_to have_header("X-Sanitize-Email-To-1", "to1@example.org")
-        expect(@email_message).to have_header("X-Sanitize-Email-To-2", "to2@example.org")
-        expect(@email_message).to have_header("X-Sanitize-Email-To-3", "to3@example.org")
+        expect(@email_message).to have_header(
+          "X-Sanitize-Email-To",
+          "to1@example.org"
+        )
+        expect(@email_message).not_to have_header(
+          "X-Sanitize-Email-To-0",
+          "to1@example.org"
+        )
+        expect(@email_message).not_to have_header(
+          "X-Sanitize-Email-To-1",
+          "to1@example.org"
+        )
+        expect(@email_message).to have_header(
+          "X-Sanitize-Email-To-2",
+          "to2@example.org"
+        )
+        expect(@email_message).to have_header(
+          "X-Sanitize-Email-To-3",
+          "to3@example.org"
+        )
       end
       it "should set headers for sanitized :cc recipients" do
-        expect(@email_message).to have_header("X-Sanitize-Email-Cc", "cc1@example.org")
-        expect(@email_message).not_to have_header("X-Sanitize-Email-Cc-0", "cc1@example.org")
-        expect(@email_message).not_to have_header("X-Sanitize-Email-Cc-1", "cc1@example.org")
-        expect(@email_message).to have_header("X-Sanitize-Email-Cc-2", "cc2@example.org")
-        expect(@email_message).to have_header("X-Sanitize-Email-Cc-3", "cc3@example.org")
+        expect(@email_message).to have_header(
+          "X-Sanitize-Email-Cc",
+          "cc1@example.org"
+        )
+        expect(@email_message).not_to have_header(
+          "X-Sanitize-Email-Cc-0",
+          "cc1@example.org"
+        )
+        expect(@email_message).not_to have_header(
+          "X-Sanitize-Email-Cc-1",
+          "cc1@example.org"
+        )
+        expect(@email_message).to have_header(
+          "X-Sanitize-Email-Cc-2",
+          "cc2@example.org"
+        )
+        expect(@email_message).to have_header(
+          "X-Sanitize-Email-Cc-3",
+          "cc3@example.org"
+        )
       end
       it "should not set headers for sanitized :bcc recipients" do
-        expect(@email_message).not_to have_header("X-Sanitize-Email-Bcc", "bcc1@sanitize_email.org")
-        expect(@email_message).not_to have_header("X-Sanitize-Email-Bcc-0", "bcc1@sanitize_email.org")
-        expect(@email_message).not_to have_header("X-Sanitize-Email-Bcc-1", "bcc1@sanitize_email.org")
-        expect(@email_message).not_to have_header("X-Sanitize-Email-Bcc-2", "bcc2@sanitize_email.org")
-        expect(@email_message).not_to have_header("X-Sanitize-Email-Bcc-3", "bcc3@sanitize_email.org")
+        expect(@email_message).not_to have_header(
+          "X-Sanitize-Email-Bcc",
+          "bcc1@sanitize_email.org"
+        )
+        expect(@email_message).not_to have_header(
+          "X-Sanitize-Email-Bcc-0",
+          "bcc1@sanitize_email.org"
+        )
+        expect(@email_message).not_to have_header(
+          "X-Sanitize-Email-Bcc-1",
+          "bcc1@sanitize_email.org"
+        )
+        expect(@email_message).not_to have_header(
+          "X-Sanitize-Email-Bcc-2",
+          "bcc2@sanitize_email.org"
+        )
+        expect(@email_message).not_to have_header(
+          "X-Sanitize-Email-Bcc-3",
+          "bcc3@sanitize_email.org"
+        )
       end
       it "should not prepend originals by default" do
-        expect(@email_message).not_to have_to_username("to at example.org <to@sanitize_email.org>")
-        expect(@email_message).not_to have_subject("(to at example.org) original subject")
+        expect(@email_message).not_to have_to_username(
+          "to at example.org <to@sanitize_email.org>"
+        )
+        expect(@email_message).not_to have_subject(
+          "(to at example.org) original subject"
+        )
       end
     end
 
@@ -242,19 +341,24 @@ describe SanitizeEmail do
         mail_delivery
       end
       it "original to is prepended to subject" do
-        expect(@email_message).to have_subject(/\(to at example.org\).*original subject/)
+        regex = /\(to at example.org\).*original subject/
+        expect(@email_message).to have_subject(regex)
       end
       it "original to is only prepended once to subject" do
-        expect(@email_message).not_to have_subject(/\(to at example.org\).*\(to at example.org\).*original subject/)
+        regex = /\(to at example.org\).*\(to at example.org\).*original subject/
+        expect(@email_message).not_to have_subject(regex)
       end
       it "should not alter non-sanitized attributes" do
-        expect(@email_message).to have_from('from@example.org')
-        expect(@email_message).to have_reply_to('reply_to@example.org')
-        expect(@email_message).to have_body_text('funky fresh')
+        expect(@email_message).to have_from("from@example.org")
+        expect(@email_message).to have_reply_to("reply_to@example.org")
+        expect(@email_message).to have_body_text("funky fresh")
       end
       it "should not prepend overrides" do
-        expect(@email_message).not_to have_to_username("to at sanitize_email.org")
-        expect(@email_message).not_to have_subject(/.*\(to at sanitize_email.org\).*/)
+        expect(@email_message).not_to have_to_username(
+          "to at sanitize_email.org"
+        )
+        regex = /.*\(to at sanitize_email.org\).*/
+        expect(@email_message).not_to have_subject(regex)
       end
       it "should override where original recipients were not nil" do
         expect(@email_message).to have_to("funky@sanitize_email.org")
@@ -264,21 +368,43 @@ describe SanitizeEmail do
         expect(@email_message).not_to have_bcc("bcc@sanitize_email.org")
       end
       it "should set headers of originals" do
-        expect(@email_message).to have_header("X-Sanitize-Email-To", "to@example.org")
-        expect(@email_message).to have_header("X-Sanitize-Email-Cc", "cc@example.org")
+        expect(@email_message).to have_header(
+          "X-Sanitize-Email-To",
+          "to@example.org"
+        )
+        expect(@email_message).to have_header(
+          "X-Sanitize-Email-Cc",
+          "cc@example.org"
+        )
       end
       it "should not set headers of bcc" do
-        expect(@email_message).not_to have_header("X-Sanitize-Email-Bcc", "bcc@sanitize_email.org")
+        expect(@email_message).not_to have_header(
+          "X-Sanitize-Email-Bcc",
+          "bcc@sanitize_email.org"
+        )
       end
       it "should not set headers of overrides" do
-        expect(@email_message).not_to have_header("X-Sanitize-Email-To", "funky@sanitize_email.org")
-        expect(@email_message).not_to have_header("X-Sanitize-Email-Cc", "cc@sanitize_email.org")
-        expect(@email_message).not_to have_header("X-Sanitize-Email-Bcc", "bcc@sanitize_email.org")
+        expect(@email_message).not_to have_header(
+          "X-Sanitize-Email-To",
+          "funky@sanitize_email.org"
+        )
+        expect(@email_message).not_to have_header(
+          "X-Sanitize-Email-Cc",
+          "cc@sanitize_email.org"
+        )
+        expect(@email_message).not_to have_header(
+          "X-Sanitize-Email-Bcc",
+          "bcc@sanitize_email.org"
+        )
         #puts "email headers:\n#{@email_message.header}"
       end
       it "should not prepend originals by default" do
-        expect(@email_message).not_to have_to_username("to at example.org <to@sanitize_email.org>")
-        expect(@email_message).not_to have_subject("(to at example.org) original subject")
+        expect(@email_message).not_to have_to_username(
+          "to at example.org <to@sanitize_email.org>"
+        )
+        expect(@email_message).not_to have_subject(
+          "(to at example.org) original subject"
+        )
       end
     end
 
@@ -289,15 +415,17 @@ describe SanitizeEmail do
         mail_delivery_hot_mess
       end
       it "original to is prepended to subject" do
-        expect(@email_message).to have_subject(/\(same at example.org\).*original subject/)
+        regex = /\(same at example.org\).*original subject/
+        expect(@email_message).to match_subject(regex)
       end
       it "original to is only prepended once to subject" do
-        expect(@email_message).not_to have_subject(/\(same at example.org\).*\(same at example.org\).*original subject/)
+        regex = /\(same at example.org\).*\(same at example.org\).*original subject/
+        expect(@email_message).not_to match_subject(regex)
       end
       it "should not alter non-sanitized attributes" do
-        expect(@email_message).to have_from('same@example.org')
-        expect(@email_message).to have_reply_to('same@example.org')
-        expect(@email_message).to have_body_text('funky fresh')
+        expect(@email_message).to have_from("same@example.org")
+        expect(@email_message).to have_reply_to("same@example.org")
+        expect(@email_message).to have_body_text("funky fresh")
       end
       it "should not prepend overrides" do
         expect(@email_message).not_to have_to_username("same at example.org")
@@ -310,19 +438,35 @@ describe SanitizeEmail do
         expect(@email_message).not_to have_bcc("same@example.org")
       end
       it "should set headers of originals" do
-        expect(@email_message).to have_header("X-Sanitize-Email-To", "same@example.org")
-        expect(@email_message).to have_header("X-Sanitize-Email-Cc", "same@example.org")
+        expect(@email_message).to have_header(
+          "X-Sanitize-Email-To",
+          "same@example.org"
+        )
+        expect(@email_message).to have_header(
+          "X-Sanitize-Email-Cc",
+          "same@example.org"
+        )
       end
       it "should not set headers of bcc" do
-        expect(@email_message).not_to have_header("X-Sanitize-Email-Bcc", "same@example.org")
+        expect(@email_message).not_to have_header(
+          "X-Sanitize-Email-Bcc",
+          "same@example.org"
+        )
       end
       it "should not set headers of overrides" do
-        expect(@email_message).not_to have_header("X-Sanitize-Email-Bcc", "same@example.org")
-        puts "email headers:\n#{@email_message.header}"
+        expect(@email_message).not_to have_header(
+          "X-Sanitize-Email-Bcc",
+          "same@example.org"
+        )
+        # puts "email headers:\n#{@email_message.header}"
       end
       it "should not prepend originals by default" do
-        expect(@email_message).not_to have_to_username("same at example.org <same@example.org>")
-        expect(@email_message).not_to have_subject("(same at example.org) original subject")
+        expect(@email_message).not_to have_to_username(
+          "same at example.org <same@example.org>"
+        )
+        expect(@email_message).not_to have_subject(
+          "(same at example.org) original subject"
+        )
       end
     end
 
@@ -330,14 +474,14 @@ describe SanitizeEmail do
       context "true" do
         before(:each) do
           # Should turn off sanitization using the force_sanitize
-          configure_sanitize_email({:activation_proc => Proc.new {true}})
+          configure_sanitize_email(activation_proc: proc { true })
           SanitizeEmail.force_sanitize = true
           mail_delivery
         end
         it "should not alter non-sanitized attributes" do
-          expect(@email_message).to have_from('from@example.org')
-          expect(@email_message).to have_reply_to('reply_to@example.org')
-          expect(@email_message).to have_body_text('funky fresh')
+          expect(@email_message).to have_from("from@example.org")
+          expect(@email_message).to have_reply_to("reply_to@example.org")
+          expect(@email_message).to have_body_text("funky fresh")
         end
         it "should override" do
           expect(@email_message).to have_to("to@sanitize_email.org")
@@ -345,75 +489,109 @@ describe SanitizeEmail do
           expect(@email_message).to have_bcc("bcc@sanitize_email.org")
         end
         it "should set headers" do
-          expect(@email_message).to have_header("X-Sanitize-Email-To", "to@example.org")
-          expect(@email_message).to have_header("X-Sanitize-Email-Cc", "cc@example.org")
-          expect(@email_message).not_to have_header("X-Sanitize-Email-Bcc", "bcc@sanitize_email.org")
+          expect(@email_message).to have_header(
+            "X-Sanitize-Email-To",
+            "to@example.org"
+          )
+          expect(@email_message).to have_header(
+            "X-Sanitize-Email-Cc",
+            "cc@example.org"
+          )
+          expect(@email_message).not_to have_header(
+            "X-Sanitize-Email-Bcc",
+            "bcc@sanitize_email.org"
+          )
         end
       end
       context "false" do
         before(:each) do
           # Should turn off sanitization using the force_sanitize
-          configure_sanitize_email({:activation_proc => Proc.new {true}})
+          configure_sanitize_email(activation_proc: proc { true })
           SanitizeEmail.force_sanitize = false
           mail_delivery
         end
         it "should not alter non-sanitized attributes" do
-          expect(@email_message).to have_from('from@example.org')
-          expect(@email_message).to have_reply_to('reply_to@example.org')
-          expect(@email_message).to have_body_text('funky fresh')
+          expect(@email_message).to have_from("from@example.org")
+          expect(@email_message).to have_reply_to("reply_to@example.org")
+          expect(@email_message).to have_body_text("funky fresh")
         end
         it "should not alter normally sanitized attributes" do
           expect(@email_message).to have_to("to@example.org")
           expect(@email_message).to have_cc("cc@example.org")
           expect(@email_message).to have_bcc("bcc@example.org")
-          expect(@email_message).not_to have_header("X-Sanitize-Email-To", "to@example.org")
-          expect(@email_message).not_to have_header("X-Sanitize-Email-Cc", "cc@example.org")
-          expect(@email_message).not_to have_header("X-Sanitize-Email-Bcc", "bcc@example.org")
+          expect(@email_message).not_to have_header(
+            "X-Sanitize-Email-To",
+            "to@example.org"
+          )
+          expect(@email_message).not_to have_header(
+            "X-Sanitize-Email-Cc",
+            "cc@example.org"
+          )
+          expect(@email_message).not_to have_header(
+            "X-Sanitize-Email-Bcc",
+            "bcc@example.org"
+          )
         end
       end
       context "nil" do
         context "activation proc enables" do
           before(:each) do
-            sanitize_spec_dryer
             # Should ignore force_sanitize setting
-            configure_sanitize_email({:activation_proc => Proc.new {true}})
+            configure_sanitize_email(activation_proc: proc { true })
             SanitizeEmail.force_sanitize = nil
             mail_delivery
           end
           it "should not alter non-sanitized attributes" do
-            expect(@email_message).to have_from('from@example.org')
-            expect(@email_message).to have_reply_to('reply_to@example.org')
-            expect(@email_message).to have_body_text('funky fresh')
+            expect(@email_message).to have_from("from@example.org")
+            expect(@email_message).to have_reply_to("reply_to@example.org")
+            expect(@email_message).to have_body_text("funky fresh")
           end
           it "should override" do
             expect(@email_message).to have_to("to@sanitize_email.org")
             expect(@email_message).to have_cc("cc@sanitize_email.org")
             expect(@email_message).to have_bcc("bcc@sanitize_email.org")
-            expect(@email_message).to have_header("X-Sanitize-Email-To", "to@example.org")
-            expect(@email_message).to have_header("X-Sanitize-Email-Cc", "cc@example.org")
-            expect(@email_message).not_to have_header("X-Sanitize-Email-Bcc", "bcc@sanitize_email.org")
+            expect(@email_message).to have_header(
+              "X-Sanitize-Email-To",
+              "to@example.org"
+            )
+            expect(@email_message).to have_header(
+              "X-Sanitize-Email-Cc",
+              "cc@example.org"
+            )
+            expect(@email_message).not_to have_header(
+              "X-Sanitize-Email-Bcc",
+              "bcc@sanitize_email.org"
+            )
           end
         end
         context "activation proc disables" do
           before(:each) do
-            sanitize_spec_dryer
             # Should ignore force_sanitize setting
-            configure_sanitize_email({:activation_proc => Proc.new {false}})
+            configure_sanitize_email(activation_proc: proc { false })
             SanitizeEmail.force_sanitize = nil
             mail_delivery
           end
           it "should not alter non-sanitized attributes" do
-            expect(@email_message).to have_from('from@example.org')
-            expect(@email_message).to have_reply_to('reply_to@example.org')
-            expect(@email_message).to have_body_text('funky fresh')
+            expect(@email_message).to have_from("from@example.org")
+            expect(@email_message).to have_reply_to("reply_to@example.org")
+            expect(@email_message).to have_body_text("funky fresh")
           end
           it "should not alter normally sanitized attributes" do
             expect(@email_message).to have_to("to@example.org")
             expect(@email_message).to have_cc("cc@example.org")
             expect(@email_message).to have_bcc("bcc@example.org")
-            expect(@email_message).not_to have_header("X-Sanitize-Email-To", "to@example.org")
-            expect(@email_message).not_to have_header("X-Sanitize-Email-Cc", "cc@example.org")
-            expect(@email_message).not_to have_header("X-Sanitize-Email-Bcc", "bcc@example.org")
+            expect(@email_message).not_to have_header(
+              "X-Sanitize-Email-To",
+              "to@example.org"
+            )
+            expect(@email_message).not_to have_header(
+              "X-Sanitize-Email-Cc",
+              "cc@example.org"
+            )
+            expect(@email_message).not_to have_header(
+              "X-Sanitize-Email-Bcc",
+              "bcc@example.org"
+            )
           end
         end
       end
@@ -424,40 +602,57 @@ describe SanitizeEmail do
     context ":use_actual_environment_prepended_to_subject" do
       context "true" do
         before(:each) do
-          configure_sanitize_email({:environment => "{{serverABC}}", :use_actual_environment_prepended_to_subject => true})
+          configure_sanitize_email(
+            environment: "{{serverABC}}",
+            use_actual_environment_prepended_to_subject: true
+          )
           sanitary_mail_delivery
         end
         it "original to is prepended" do
-          expect(@email_message).to have_subject("{{serverABC}} original subject")
+          expect(@email_message).to have_subject(
+            "{{serverABC}} original subject"
+          )
         end
         it "should not alter non-sanitized attributes" do
-          expect(@email_message).to have_from('from@example.org')
-          expect(@email_message).to have_reply_to('reply_to@example.org')
-          expect(@email_message).to have_body_text('funky fresh')
+          expect(@email_message).to have_from("from@example.org")
+          expect(@email_message).to have_reply_to("reply_to@example.org")
+          expect(@email_message).to have_body_text("funky fresh")
         end
         it "should not prepend overrides" do
-          expect(@email_message).not_to have_to_username("to at sanitize_email.org")
-          expect(@email_message).not_to have_subject("(to at sanitize_email.org)")
+          expect(@email_message).not_to have_to_username(
+            "to at sanitize_email.org"
+          )
+          expect(@email_message).not_to have_subject(
+            "(to at sanitize_email.org)"
+          )
         end
       end
       context "false" do
         before(:each) do
-          sanitize_spec_dryer('test')
-          configure_sanitize_email({:environment => "{{serverABC}}", :use_actual_environment_prepended_to_subject => false})
+          configure_sanitize_email(
+            environment: "{{serverABC}}",
+            use_actual_environment_prepended_to_subject: false
+          )
           sanitary_mail_delivery
         end
         it "original to is not prepended" do
-          expect(@email_message).not_to have_subject("{{serverABC}} original subject")
+          expect(@email_message).not_to have_subject(
+            "{{serverABC}} original subject"
+          )
           expect(@email_message.subject).to eq("original subject")
         end
         it "should not alter non-sanitized attributes" do
-          expect(@email_message).to have_from('from@example.org')
-          expect(@email_message).to have_reply_to('reply_to@example.org')
-          expect(@email_message).to have_body_text('funky fresh')
+          expect(@email_message).to have_from("from@example.org")
+          expect(@email_message).to have_reply_to("reply_to@example.org")
+          expect(@email_message).to have_body_text("funky fresh")
         end
         it "should not prepend overrides" do
-          expect(@email_message).not_to have_to_username("to at sanitize_email.org")
-          expect(@email_message).not_to have_subject("(to at sanitize_email.org)")
+          expect(@email_message).not_to have_to_username(
+            "to at sanitize_email.org"
+          )
+          expect(@email_message).not_to have_subject(
+            "(to at sanitize_email.org)"
+          )
         end
       end
     end
@@ -465,40 +660,77 @@ describe SanitizeEmail do
     context ":use_actual_email_prepended_to_subject" do
       context "true" do
         before(:each) do
-          sanitize_spec_dryer
-          configure_sanitize_email({:use_actual_email_prepended_to_subject => true})
-          sanitary_mail_delivery
-        end
-        it "original to is prepended" do
-          expect(@email_message).to have_subject("(to at example.org) original subject")
+          configure_sanitize_email(use_actual_email_prepended_to_subject: true)
         end
-        it "should not alter non-sanitized attributes" do
-          expect(@email_message).to have_from('from@example.org')
-          expect(@email_message).to have_reply_to('reply_to@example.org')
-          expect(@email_message).to have_body_text('funky fresh')
+        context "to address is an array" do
+          before do
+            sanitary_mail_delivery_multiple_recipients
+          end
+          it "original to is prepended" do
+            expect(@email_message).to have_subject(
+              "(to1 at example.org,to2 at example.org,to3 at example.org) original subject"
+            )
+          end
+          it "should not alter non-sanitized attributes" do
+            expect(@email_message).to have_from("from@example.org")
+            expect(@email_message).to have_reply_to("reply_to@example.org")
+            expect(@email_message).to have_body_text("funky fresh")
+          end
+          it "should not prepend overrides" do
+            expect(@email_message).not_to have_to_username(
+              "to at sanitize_email.org"
+            )
+            expect(@email_message).not_to have_subject(
+              "(to at sanitize_email.org)"
+            )
+          end
         end
-        it "should not prepend overrides" do
-          expect(@email_message).not_to have_to_username("to at sanitize_email.org")
-          expect(@email_message).not_to have_subject("(to at sanitize_email.org)")
+        context "to address is not an array" do
+          before do
+            sanitary_mail_delivery
+          end
+          it "original to is prepended" do
+            expect(@email_message).to have_subject(
+              "(to at example.org) original subject"
+            )
+          end
+          it "should not alter non-sanitized attributes" do
+            expect(@email_message).to have_from("from@example.org")
+            expect(@email_message).to have_reply_to("reply_to@example.org")
+            expect(@email_message).to have_body_text("funky fresh")
+          end
+          it "should not prepend overrides" do
+            expect(@email_message).not_to have_to_username(
+              "to at sanitize_email.org"
+            )
+            expect(@email_message).not_to have_subject(
+              "(to at sanitize_email.org)"
+            )
+          end
         end
       end
       context "false" do
         before(:each) do
-          sanitize_spec_dryer
-          configure_sanitize_email({:use_actual_email_prepended_to_subject => false})
+          configure_sanitize_email(use_actual_email_prepended_to_subject: false)
           sanitary_mail_delivery
         end
         it "original to is not prepended" do
-          expect(@email_message).not_to have_subject("(to at example.org) original subject")
+          expect(@email_message).not_to have_subject(
+            "(to at example.org) original subject"
+          )
         end
         it "should not alter non-sanitized attributes" do
-          expect(@email_message).to have_from('from@example.org')
-          expect(@email_message).to have_reply_to('reply_to@example.org')
-          expect(@email_message).to have_body_text('funky fresh')
+          expect(@email_message).to have_from("from@example.org")
+          expect(@email_message).to have_reply_to("reply_to@example.org")
+          expect(@email_message).to have_body_text("funky fresh")
         end
         it "should not prepend overrides" do
-          expect(@email_message).not_to have_to_username("to at sanitize_email.org")
-          expect(@email_message).not_to have_subject("(to at sanitize_email.org)")
+          expect(@email_message).not_to have_to_username(
+            "to at sanitize_email.org"
+          )
+          expect(@email_message).not_to have_subject(
+            "(to at sanitize_email.org)"
+          )
         end
       end
     end
@@ -506,40 +738,107 @@ describe SanitizeEmail do
     context ":use_actual_email_as_sanitized_user_name" do
       context "true" do
         before(:each) do
-          sanitize_spec_dryer
-          configure_sanitize_email({:use_actual_email_as_sanitized_user_name => true})
+          configure_sanitize_email(
+            use_actual_email_as_sanitized_user_name: true
+          )
           sanitary_mail_delivery
         end
         it "original to is munged and prepended" do
-          expect(@email_message).to have_to_username("to at example.org <to@sanitize_email.org>")
+          expect(@email_message).to have_to_username(
+            "to at example.org <to@sanitize_email.org>"
+          )
         end
         it "should not alter non-sanitized attributes" do
-          expect(@email_message).to have_from('from@example.org')
-          expect(@email_message).to have_reply_to('reply_to@example.org')
-          expect(@email_message).to have_body_text('funky fresh')
+          expect(@email_message).to have_from("from@example.org")
+          expect(@email_message).to have_reply_to("reply_to@example.org")
+          expect(@email_message).to have_body_text("funky fresh")
         end
         it "should not prepend overrides" do
-          expect(@email_message).not_to have_to_username("to at sanitize_email.org")
-          expect(@email_message).not_to have_subject("(to at sanitize_email.org)")
+          expect(@email_message).not_to have_to_username(
+            "to at sanitize_email.org"
+          )
+          expect(@email_message).not_to have_subject(
+            "(to at sanitize_email.org)"
+          )
         end
       end
       context "false" do
         before(:each) do
-          sanitize_spec_dryer
-          configure_sanitize_email({:use_actual_email_as_sanitized_user_name => false})
+          configure_sanitize_email(
+            use_actual_email_as_sanitized_user_name: false
+          )
           sanitary_mail_delivery
         end
         it "original to is not prepended" do
-          expect(@email_message).not_to have_to_username("to at example.org <to@sanitize_email.org>")
+          expect(@email_message).not_to have_to_username(
+            "to at example.org <to@sanitize_email.org>"
+          )
+        end
+        it "should not alter non-sanitized attributes" do
+          expect(@email_message).to have_from("from@example.org")
+          expect(@email_message).to have_reply_to("reply_to@example.org")
+          expect(@email_message).to have_body_text("funky fresh")
+        end
+        it "should not prepend overrides" do
+          expect(@email_message).not_to have_to_username(
+            "to at sanitize_email.org"
+          )
+          expect(@email_message).not_to have_subject(
+            "(to at sanitize_email.org)"
+          )
+        end
+      end
+    end
+
+    context ":engage" do
+      context "is true" do
+        before(:each) do
+          # Should turn off sanitization using the force_sanitize
+          configure_sanitize_email(
+            engage: true,
+            sanitized_recipients: "marv@example.org",
+            use_actual_email_prepended_to_subject: true,
+            use_actual_email_as_sanitized_user_name: true
+          )
+          mail_delivery
+        end
+        it "should not alter non-sanitized attributes" do
+          expect(@email_message).to have_from("from@example.org")
+          expect(@email_message).to have_reply_to("reply_to@example.org")
+          expect(@email_message).to have_body_text("funky fresh")
+        end
+        it "should prepend overrides" do
+          expect(@email_message).to have_to_username("to at example.org")
+          expect(@email_message).to have_subject("(to at example.org)")
+        end
+        it "should alter normally sanitized attributes" do
+          expect(@email_message).not_to have_to("to@example.org")
+          expect(@email_message).to have_to("marv@example.org")
+        end
+      end
+      context "is false" do
+        before(:each) do
+          # Should turn off sanitization using the force_sanitize
+          configure_sanitize_email(
+            engage: false,
+            sanitized_recipients: "marv@example.org",
+            use_actual_email_prepended_to_subject: true,
+            use_actual_email_as_sanitized_user_name: true
+          )
+          mail_delivery
         end
         it "should not alter non-sanitized attributes" do
-          expect(@email_message).to have_from('from@example.org')
-          expect(@email_message).to have_reply_to('reply_to@example.org')
-          expect(@email_message).to have_body_text('funky fresh')
+          expect(@email_message).to have_from("from@example.org")
+          expect(@email_message).to have_reply_to("reply_to@example.org")
+          expect(@email_message).to have_body_text("funky fresh")
         end
         it "should not prepend overrides" do
-          expect(@email_message).not_to have_to_username("to at sanitize_email.org")
-          expect(@email_message).not_to have_subject("(to at sanitize_email.org)")
+          expect(@email_message).not_to have_to_username("to at example.org")
+          expect(@email_message).not_to have_subject("(to at example.org)")
+        end
+        it "should not alter normally sanitized attributes" do
+          expect(@email_message).to have_to("to@example.org")
+          expect(@email_message).not_to have_to("marv@example.org")
         end
       end
     end
@@ -551,33 +850,33 @@ describe SanitizeEmail do
       context ":local_environments" do
         context "matching" do
           before(:each) do
-            sanitize_spec_dryer('test')
-            configure_sanitize_email({:local_environments => ['test']})
+            configure_sanitize_email(local_environments: ["test"])
             expect(SanitizeEmail[:activation_proc].call).to eq(true)
             mail_delivery
           end
           it "should not alter non-sanitized attributes" do
-            expect(@email_message).to have_from('from@example.org')
-            expect(@email_message).to have_reply_to('reply_to@example.org')
-            expect(@email_message).to have_body_text('funky fresh')
+            expect(@email_message).to have_from("from@example.org")
+            expect(@email_message).to have_reply_to("reply_to@example.org")
+            expect(@email_message).to have_body_text("funky fresh")
           end
           it "should use activation_proc for matching environment" do
-            expect(@email_message).to have_to("to@sanitize_email.org")
-            expect(@email_message).to have_cc("cc@sanitize_email.org")
-            expect(@email_message).to have_bcc("bcc@sanitize_email.org")
+            expect(@email_message).to match_to("to@sanitize_email.org")
+            expect(@email_message).to match_cc("cc@sanitize_email.org")
+            expect(@email_message).to match_bcc("bcc@sanitize_email.org")
           end
         end
         context "non-matching" do
           before(:each) do
-            sanitize_spec_dryer('production')
-            configure_sanitize_email({:local_environments => ['development']}) # Won't match!
+            sanitize_spec_dryer("production")
+            # Won't match!
+            configure_sanitize_email(local_environments: ["development"])
             expect(SanitizeEmail[:activation_proc].call).to eq(false)
             mail_delivery
           end
           it "should not alter non-sanitized attributes" do
-            expect(@email_message).to have_from('from@example.org')
-            expect(@email_message).to have_reply_to('reply_to@example.org')
-            expect(@email_message).to have_body_text('funky fresh')
+            expect(@email_message).to have_from("from@example.org")
+            expect(@email_message).to have_reply_to("reply_to@example.org")
+            expect(@email_message).to have_body_text("funky fresh")
           end
           it "should use activation_proc for non-matching environment" do
             expect(@email_message).to have_to("to@example.org")
@@ -589,14 +888,15 @@ describe SanitizeEmail do
 
       context ":sanitized_recipients" do
         before(:each) do
-          sanitize_spec_dryer
-          configure_sanitize_email({:sanitized_recipients => 'barney@sanitize_email.org'})
+          configure_sanitize_email(
+            sanitized_recipients: "barney@sanitize_email.org"
+          )
           sanitary_mail_delivery
         end
         it "should not alter non-sanitized attributes" do
-          expect(@email_message).to have_from('from@example.org')
-          expect(@email_message).to have_reply_to('reply_to@example.org')
-          expect(@email_message).to have_body_text('funky fresh')
+          expect(@email_message).to have_from("from@example.org")
+          expect(@email_message).to have_reply_to("reply_to@example.org")
+          expect(@email_message).to have_body_text("funky fresh")
         end
         it "used as sanitized_to" do
           expect(@email_message).to have_to("barney@sanitize_email.org")
@@ -605,21 +905,22 @@ describe SanitizeEmail do
 
       context ":force_sanitize" do
         before(:each) do
-          sanitize_spec_dryer
           # Should turn off sanitization using the force_sanitize
-          configure_sanitize_email({:activation_proc => Proc.new {true}, :force_sanitize => false})
+          configure_sanitize_email(
+            activation_proc: proc { true },
+            force_sanitize: false
+          )
           mail_delivery
         end
         it "should not alter non-sanitized attributes" do
-          expect(@email_message).to have_from('from@example.org')
-          expect(@email_message).to have_reply_to('reply_to@example.org')
-          expect(@email_message).to have_body_text('funky fresh')
+          expect(@email_message).to have_from("from@example.org")
+          expect(@email_message).to have_reply_to("reply_to@example.org")
+          expect(@email_message).to have_body_text("funky fresh")
         end
         it "should not alter normally sanitized attributes" do
           expect(@email_message).to have_to("to@example.org")
         end
       end
-
     end
   end
 end