From 04d33adaf28e01ab741a46f788241cb6d3e6291f Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Thu, 20 Apr 2023 13:28:59 +1000
Subject: [PATCH] Remove duplicate declaration of test mail delivery

Our test environment sets the mail delivery method already. We don't
have to do it in individual spec files.
---
 spec/lib/spree/core/mail_interceptor_spec.rb | 4 ----
 spec/mailers/order_mailer_spec.rb            | 1 -
 spec/mailers/user_mailer_spec.rb             | 1 -
 3 files changed, 6 deletions(-)

diff --git a/spec/lib/spree/core/mail_interceptor_spec.rb b/spec/lib/spree/core/mail_interceptor_spec.rb
index 4642a262f6..4129a110cb 100644
--- a/spec/lib/spree/core/mail_interceptor_spec.rb
+++ b/spec/lib/spree/core/mail_interceptor_spec.rb
@@ -15,10 +15,6 @@ describe Spree::OrderMailer do
   end
 
   context "#deliver" do
-    before do
-      ActionMailer::Base.delivery_method = :test
-    end
-
     after { ActionMailer::Base.deliveries.clear }
 
     it "should use the from address specified in the preference" do
diff --git a/spec/mailers/order_mailer_spec.rb b/spec/mailers/order_mailer_spec.rb
index 47dc67846f..ac467b28ae 100644
--- a/spec/mailers/order_mailer_spec.rb
+++ b/spec/mailers/order_mailer_spec.rb
@@ -158,7 +158,6 @@ describe Spree::OrderMailer do
     end
 
     before do
-      ActionMailer::Base.delivery_method = :test
       ActionMailer::Base.deliveries = []
     end
 
diff --git a/spec/mailers/user_mailer_spec.rb b/spec/mailers/user_mailer_spec.rb
index 76caa391bf..77bdcc7a43 100644
--- a/spec/mailers/user_mailer_spec.rb
+++ b/spec/mailers/user_mailer_spec.rb
@@ -10,7 +10,6 @@ describe Spree::UserMailer do
   end
 
   before do
-    ActionMailer::Base.delivery_method = :test
     ActionMailer::Base.deliveries = []
   end