From 99980256877c0da7b5e8e6e091bc32c1912e2a74 Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Thu, 20 Apr 2023 12:06:00 +1000
Subject: [PATCH 1/4] Remove useless test header setup for emails

Once upon a time we needed a helper to set the `from` header of emails.
This is now set in the ApplicationMailer and not necessary any more.
---
 spec/controllers/admin/subscriptions_controller_spec.rb | 2 --
 spec/controllers/spree/admin/orders/invoices_spec.rb    | 3 ---
 spec/controllers/spree/admin/orders_controller_spec.rb  | 2 --
 spec/controllers/spree/orders_controller_spec.rb        | 5 -----
 spec/controllers/user_confirmations_controller_spec.rb  | 2 --
 spec/controllers/user_registrations_controller_spec.rb  | 6 ------
 spec/jobs/subscription_confirm_job_spec.rb              | 2 --
 spec/mailers/enterprise_mailer_spec.rb                  | 3 ---
 spec/mailers/order_mailer_spec.rb                       | 3 ---
 spec/mailers/producer_mailer_spec.rb                    | 4 ----
 spec/mailers/subscription_mailer_spec.rb                | 3 ---
 spec/mailers/user_mailer_spec.rb                        | 4 ----
 spec/models/order_cycle_spec.rb                         | 5 -----
 spec/models/spree/order_spec.rb                         | 6 ------
 spec/models/spree/user_spec.rb                          | 4 ----
 spec/support/email_helper.rb                            | 6 ------
 spec/system/admin/enterprise_roles_spec.rb              | 2 --
 spec/system/admin/users_spec.rb                         | 1 -
 spec/system/consumer/account/settings_spec.rb           | 1 -
 spec/system/consumer/authentication_spec.rb             | 1 -
 spec/system/consumer/shopping/orders_spec.rb            | 4 ----
 spec/system/consumer/user_password_spec.rb              | 1 -
 22 files changed, 70 deletions(-)

diff --git a/spec/controllers/admin/subscriptions_controller_spec.rb b/spec/controllers/admin/subscriptions_controller_spec.rb
index 1f7a1055a0..327fa5bf49 100644
--- a/spec/controllers/admin/subscriptions_controller_spec.rb
+++ b/spec/controllers/admin/subscriptions_controller_spec.rb
@@ -4,7 +4,6 @@ require 'spec_helper'
 
 describe Admin::SubscriptionsController, type: :controller do
   include AuthenticationHelper
-  include OpenFoodNetwork::EmailHelper
 
   describe 'index' do
     let!(:user) { create(:user, enterprise_limit: 10) }
@@ -676,7 +675,6 @@ describe Admin::SubscriptionsController, type: :controller do
 
             context "when at least one associate orders is 'canceled'" do
               before do
-                setup_email
                 proxy_order.cancel
               end
 
diff --git a/spec/controllers/spree/admin/orders/invoices_spec.rb b/spec/controllers/spree/admin/orders/invoices_spec.rb
index 036950b996..0482069cb5 100644
--- a/spec/controllers/spree/admin/orders/invoices_spec.rb
+++ b/spec/controllers/spree/admin/orders/invoices_spec.rb
@@ -3,8 +3,6 @@
 require 'spec_helper'
 
 describe Spree::Admin::OrdersController, type: :controller do
-  include OpenFoodNetwork::EmailHelper
-
   describe "#invoice" do
     let!(:user) { create(:user) }
     let!(:enterprise_user) { create(:user) }
@@ -54,7 +52,6 @@ describe Spree::Admin::OrdersController, type: :controller do
           before do
             allow(Spree::OrderMailer).to receive(:invoice_email) { mail_mock }
             distributor.update_attribute(:abn, "123")
-            setup_email
           end
 
           it "should allow me to send order invoices" do
diff --git a/spec/controllers/spree/admin/orders_controller_spec.rb b/spec/controllers/spree/admin/orders_controller_spec.rb
index 9934ab66c7..bef6e7cf1c 100644
--- a/spec/controllers/spree/admin/orders_controller_spec.rb
+++ b/spec/controllers/spree/admin/orders_controller_spec.rb
@@ -3,8 +3,6 @@
 require 'spec_helper'
 
 describe Spree::Admin::OrdersController, type: :controller do
-  include OpenFoodNetwork::EmailHelper
-
   describe "#edit" do
     let!(:order) { create(:order_with_totals_and_distribution, ship_address: create(:address)) }
 
diff --git a/spec/controllers/spree/orders_controller_spec.rb b/spec/controllers/spree/orders_controller_spec.rb
index 44b5873661..60d27d13f5 100644
--- a/spec/controllers/spree/orders_controller_spec.rb
+++ b/spec/controllers/spree/orders_controller_spec.rb
@@ -3,7 +3,6 @@
 require 'spec_helper'
 
 describe Spree::OrdersController, type: :controller do
-  include OpenFoodNetwork::EmailHelper
   include CheckoutHelper
   include StripeStubs
 
@@ -471,10 +470,6 @@ describe Spree::OrdersController, type: :controller do
                                                distributor: create(:distributor_enterprise))
         }
 
-        before do
-          setup_email
-        end
-
         it "responds with success" do
           spree_put :cancel, params
 
diff --git a/spec/controllers/user_confirmations_controller_spec.rb b/spec/controllers/user_confirmations_controller_spec.rb
index ce2a8a323f..f8fd71b38d 100644
--- a/spec/controllers/user_confirmations_controller_spec.rb
+++ b/spec/controllers/user_confirmations_controller_spec.rb
@@ -63,8 +63,6 @@ describe UserConfirmationsController, type: :controller do
   end
 
   context "requesting confirmation instructions to be resent" do
-    before { setup_email }
-
     it "redirects the user to login" do
       spree_post :create, spree_user: { email: unconfirmed_user.email }
       expect(response).to redirect_to login_path
diff --git a/spec/controllers/user_registrations_controller_spec.rb b/spec/controllers/user_registrations_controller_spec.rb
index 990b8108e7..8d91a8d25f 100644
--- a/spec/controllers/user_registrations_controller_spec.rb
+++ b/spec/controllers/user_registrations_controller_spec.rb
@@ -3,12 +3,6 @@
 require 'spec_helper'
 
 describe UserRegistrationsController, type: :controller do
-  include OpenFoodNetwork::EmailHelper
-
-  before(:all) do
-    setup_email
-  end
-
   before do
     @request.env["devise.mapping"] = Devise.mappings[:spree_user]
   end
diff --git a/spec/jobs/subscription_confirm_job_spec.rb b/spec/jobs/subscription_confirm_job_spec.rb
index 18db445c55..03938f62fc 100644
--- a/spec/jobs/subscription_confirm_job_spec.rb
+++ b/spec/jobs/subscription_confirm_job_spec.rb
@@ -76,7 +76,6 @@ describe SubscriptionConfirmJob do
     end
 
     it "ignores orders that have been cancelled" do
-      setup_email
       proxy_order.order.cancel!
       expect(proxy_orders).to_not include proxy_order
     end
@@ -145,7 +144,6 @@ describe SubscriptionConfirmJob do
       OrderWorkflow.new(order).complete!
       allow(job).to receive(:send_confirmation_email).and_call_original
       allow(job).to receive(:send_payment_authorization_emails).and_call_original
-      setup_email
       expect(job).to receive(:record_order)
     end
 
diff --git a/spec/mailers/enterprise_mailer_spec.rb b/spec/mailers/enterprise_mailer_spec.rb
index 2182b06277..c727a9097a 100644
--- a/spec/mailers/enterprise_mailer_spec.rb
+++ b/spec/mailers/enterprise_mailer_spec.rb
@@ -3,14 +3,11 @@
 require 'spec_helper'
 
 describe EnterpriseMailer do
-  include OpenFoodNetwork::EmailHelper
-
   let!(:enterprise) { create(:enterprise) }
   let!(:user) { create(:user) }
 
   before do
     ActionMailer::Base.deliveries = []
-    setup_email
   end
 
   describe "#welcome" do
diff --git a/spec/mailers/order_mailer_spec.rb b/spec/mailers/order_mailer_spec.rb
index 5c2adb5196..a4c2d88455 100644
--- a/spec/mailers/order_mailer_spec.rb
+++ b/spec/mailers/order_mailer_spec.rb
@@ -3,8 +3,6 @@
 require 'spec_helper'
 
 describe Spree::OrderMailer do
-  include OpenFoodNetwork::EmailHelper
-
   describe '#confirm_email_for_customer' do
     subject(:email) { described_class.confirm_email_for_customer(order) }
 
@@ -160,7 +158,6 @@ describe Spree::OrderMailer do
     end
 
     before do
-      setup_email
       ActionMailer::Base.delivery_method = :test
       ActionMailer::Base.perform_deliveries = true
       ActionMailer::Base.deliveries = []
diff --git a/spec/mailers/producer_mailer_spec.rb b/spec/mailers/producer_mailer_spec.rb
index 0d365ec0f4..84f0d430da 100644
--- a/spec/mailers/producer_mailer_spec.rb
+++ b/spec/mailers/producer_mailer_spec.rb
@@ -4,10 +4,6 @@ require 'spec_helper'
 require 'yaml'
 
 describe ProducerMailer, type: :mailer do
-  include OpenFoodNetwork::EmailHelper
-
-  before { setup_email }
-
   let!(:zone) { create(:zone_with_member) }
   let!(:tax_rate) {
     create(:tax_rate, included_in_price: true, calculator: Calculator::DefaultTax.new, zone: zone,
diff --git a/spec/mailers/subscription_mailer_spec.rb b/spec/mailers/subscription_mailer_spec.rb
index 5113a8275e..0c4a85c6d9 100644
--- a/spec/mailers/subscription_mailer_spec.rb
+++ b/spec/mailers/subscription_mailer_spec.rb
@@ -4,9 +4,6 @@ require 'spec_helper'
 
 describe SubscriptionMailer, type: :mailer do
   include ActionView::Helpers::SanitizeHelper
-  include OpenFoodNetwork::EmailHelper
-
-  before { setup_email }
 
   describe '#placement_email' do
     subject(:email) { SubscriptionMailer.placement_email(order, changes) }
diff --git a/spec/mailers/user_mailer_spec.rb b/spec/mailers/user_mailer_spec.rb
index cf97744bde..08bc64e62b 100644
--- a/spec/mailers/user_mailer_spec.rb
+++ b/spec/mailers/user_mailer_spec.rb
@@ -3,8 +3,6 @@
 require 'spec_helper'
 
 describe Spree::UserMailer do
-  include OpenFoodNetwork::EmailHelper
-
   let(:user) { build(:user) }
 
   after do
@@ -15,8 +13,6 @@ describe Spree::UserMailer do
     ActionMailer::Base.delivery_method = :test
     ActionMailer::Base.perform_deliveries = true
     ActionMailer::Base.deliveries = []
-
-    setup_email
   end
 
   describe '#signup_confirmation' do
diff --git a/spec/models/order_cycle_spec.rb b/spec/models/order_cycle_spec.rb
index 410fef5aeb..f06be8562a 100644
--- a/spec/models/order_cycle_spec.rb
+++ b/spec/models/order_cycle_spec.rb
@@ -3,8 +3,6 @@
 require 'spec_helper'
 
 describe OrderCycle do
-  include OpenFoodNetwork::EmailHelper
-
   it "should be valid when built from factory" do
     expect(build(:simple_order_cycle)).to be_valid
   end
@@ -448,9 +446,6 @@ describe OrderCycle do
       create(:completed_order_with_totals, distributor: shop, user: user, order_cycle: oc)
     }
 
-    before do
-      setup_email
-    end
     before { order_cancelled.cancel }
 
     it "only returns items from non-cancelled orders in the OC, placed by the user at the shop" do
diff --git a/spec/models/spree/order_spec.rb b/spec/models/spree/order_spec.rb
index 86c7d8f377..4ea1933d6c 100644
--- a/spec/models/spree/order_spec.rb
+++ b/spec/models/spree/order_spec.rb
@@ -3,8 +3,6 @@
 require 'spec_helper'
 
 describe Spree::Order do
-  include OpenFoodNetwork::EmailHelper
-
   let(:user) { build(:user, email: "spree@example.com") }
   let(:order) { build(:order, user: user) }
 
@@ -909,10 +907,6 @@ describe Spree::Order do
 
   describe "scopes" do
     describe "not_state" do
-      before do
-        setup_email
-      end
-
       it "finds only orders not in specified state" do
         o = FactoryBot.create(:completed_order_with_totals,
                               distributor: create(:distributor_enterprise))
diff --git a/spec/models/spree/user_spec.rb b/spec/models/spree/user_spec.rb
index 9dac88ad76..0ac5dbc159 100644
--- a/spec/models/spree/user_spec.rb
+++ b/spec/models/spree/user_spec.rb
@@ -84,8 +84,6 @@ describe Spree::User do
 
   context "#create" do
     it "should send a confirmation email" do
-      setup_email
-
       performing_deliveries do
         expect do
           create(:user, email: 'new_user@example.com', confirmation_sent_at: nil, confirmed_at: nil)
@@ -118,8 +116,6 @@ describe Spree::User do
 
   context "confirming email" do
     it "should send a welcome email" do
-      setup_email
-
       expect do
         create(:user, confirmed_at: nil).confirm
       end.to enqueue_job ActionMailer::MailDeliveryJob
diff --git a/spec/support/email_helper.rb b/spec/support/email_helper.rb
index f49a4d4918..5f58e919de 100644
--- a/spec/support/email_helper.rb
+++ b/spec/support/email_helper.rb
@@ -2,12 +2,6 @@
 
 module OpenFoodNetwork
   module EmailHelper
-    # Some specs trigger actions that send emails, for example creating an order.
-    # But sending emails doesn't work out-of-the-box. This code sets it up.
-    def setup_email
-      Spree::Config[:mails_from] = "test@ofn.example.org"
-    end
-
     # Ensures the value `perform_deliveries` had is restored. This saves us
     # from messing up with the test suite's global state which is cause of
     # trouble.
diff --git a/spec/system/admin/enterprise_roles_spec.rb b/spec/system/admin/enterprise_roles_spec.rb
index 0d08fdd836..d7431592e2 100644
--- a/spec/system/admin/enterprise_roles_spec.rb
+++ b/spec/system/admin/enterprise_roles_spec.rb
@@ -8,7 +8,6 @@ describe '
 ' do
   include AuthenticationHelper
   include WebHelper
-  include OpenFoodNetwork::EmailHelper
 
   context "as a site administrator" do
     before { login_to_admin_section }
@@ -150,7 +149,6 @@ create(:enterprise)
       end
 
       xit "can invite unregistered users to be managers" do
-        setup_email
         find('a.button.help-modal').click
         expect(page).to have_css '#invite-manager-modal'
 
diff --git a/spec/system/admin/users_spec.rb b/spec/system/admin/users_spec.rb
index 94f9c95096..ae2dd3ef8e 100644
--- a/spec/system/admin/users_spec.rb
+++ b/spec/system/admin/users_spec.rb
@@ -8,7 +8,6 @@ describe "Managing users" do
 
   context "as super-admin" do
     before do
-      setup_email
       login_as_admin
     end
 
diff --git a/spec/system/consumer/account/settings_spec.rb b/spec/system/consumer/account/settings_spec.rb
index 69c3a4faed..1c1470f74a 100644
--- a/spec/system/consumer/account/settings_spec.rb
+++ b/spec/system/consumer/account/settings_spec.rb
@@ -15,7 +15,6 @@ describe "Account Settings" do
     end
 
     before do
-      setup_email
       login_as user
       visit "/account"
       find("a", text: /Account Settings/i).click
diff --git a/spec/system/consumer/authentication_spec.rb b/spec/system/consumer/authentication_spec.rb
index 668369c643..82f140b43b 100644
--- a/spec/system/consumer/authentication_spec.rb
+++ b/spec/system/consumer/authentication_spec.rb
@@ -5,7 +5,6 @@ require 'system_helper'
 describe "Authentication" do
   include AuthenticationHelper
   include UIComponentHelper
-  include OpenFoodNetwork::EmailHelper
 
   describe "login" do
     let(:user) { create(:user, password: "password", password_confirmation: "password") }
diff --git a/spec/system/consumer/shopping/orders_spec.rb b/spec/system/consumer/shopping/orders_spec.rb
index c2243d9bad..20ca151d3a 100644
--- a/spec/system/consumer/shopping/orders_spec.rb
+++ b/spec/system/consumer/shopping/orders_spec.rb
@@ -4,7 +4,6 @@ require 'system_helper'
 
 describe "Order Management" do
   include AuthenticationHelper
-  include OpenFoodNetwork::EmailHelper
 
   describe "viewing a completed order" do
     let!(:distributor) { create(:distributor_enterprise) }
@@ -148,9 +147,6 @@ describe "Order Management" do
     end
 
     context "when the distributor allows changes to be made to orders" do
-      before do
-        setup_email
-      end
       before do
         order.distributor.update(allow_order_changes: true)
       end
diff --git a/spec/system/consumer/user_password_spec.rb b/spec/system/consumer/user_password_spec.rb
index ac31691219..533ebb9688 100644
--- a/spec/system/consumer/user_password_spec.rb
+++ b/spec/system/consumer/user_password_spec.rb
@@ -4,7 +4,6 @@ require "system_helper"
 
 describe "User password confirm/reset page" do
   include UIComponentHelper
-  include OpenFoodNetwork::EmailHelper
 
   let(:email) { "test@example.org" }
   let(:user) { Spree::User.create(email: email, unconfirmed_email: email, password: "secret") }

From 915bd19d7b2e60c9af5d51c498d1b62365d09f6c Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Thu, 20 Apr 2023 12:15:57 +1000
Subject: [PATCH 2/4] Remove useless email test setup

We always deliver emails these days.
---
 .../spree/admin/mail_methods_controller_spec.rb |  1 -
 .../user_confirmations_controller_spec.rb       | 12 ++++--------
 spec/jobs/subscription_confirm_job_spec.rb      |  6 ------
 spec/lib/spree/core/mail_interceptor_spec.rb    |  1 -
 spec/mailers/order_mailer_spec.rb               |  1 -
 spec/mailers/user_mailer_spec.rb                |  1 -
 spec/models/spree/user_spec.rb                  | 10 +++-------
 spec/support/email_helper.rb                    | 17 -----------------
 spec/system/admin/users_spec.rb                 |  5 -----
 spec/system/consumer/account/settings_spec.rb   |  9 +++------
 10 files changed, 10 insertions(+), 53 deletions(-)
 delete mode 100644 spec/support/email_helper.rb

diff --git a/spec/controllers/spree/admin/mail_methods_controller_spec.rb b/spec/controllers/spree/admin/mail_methods_controller_spec.rb
index f91617e671..43ff49f9f0 100644
--- a/spec/controllers/spree/admin/mail_methods_controller_spec.rb
+++ b/spec/controllers/spree/admin/mail_methods_controller_spec.rb
@@ -24,7 +24,6 @@ describe Spree::Admin::MailMethodsController do
                                     has_spree_role?: true,
                                     locale: nil)
     allow(controller).to receive_messages(spree_current_user: user)
-    ActionMailer::Base.perform_deliveries = true
 
     expect {
       spree_post :testmail
diff --git a/spec/controllers/user_confirmations_controller_spec.rb b/spec/controllers/user_confirmations_controller_spec.rb
index f8fd71b38d..3fbbf72a95 100644
--- a/spec/controllers/user_confirmations_controller_spec.rb
+++ b/spec/controllers/user_confirmations_controller_spec.rb
@@ -3,8 +3,6 @@
 require 'spec_helper'
 
 describe UserConfirmationsController, type: :controller do
-  include OpenFoodNetwork::EmailHelper
-
   let!(:user) { create(:user) }
   let!(:confirmed_user) { create(:user, confirmed_at: nil) }
   let!(:unconfirmed_user) { create(:user, confirmed_at: nil) }
@@ -70,13 +68,11 @@ describe UserConfirmationsController, type: :controller do
     end
 
     it "sends the confirmation email" do
-      performing_deliveries do
-        expect do
-          spree_post :create, spree_user: { email: unconfirmed_user.email }
-        end.to enqueue_job ActionMailer::MailDeliveryJob
+      expect do
+        spree_post :create, spree_user: { email: unconfirmed_user.email }
+      end.to enqueue_job ActionMailer::MailDeliveryJob
 
-        expect(enqueued_jobs.last.to_s).to match "confirmation_instructions"
-      end
+      expect(enqueued_jobs.last.to_s).to match "confirmation_instructions"
     end
   end
 end
diff --git a/spec/jobs/subscription_confirm_job_spec.rb b/spec/jobs/subscription_confirm_job_spec.rb
index 03938f62fc..7c7748818a 100644
--- a/spec/jobs/subscription_confirm_job_spec.rb
+++ b/spec/jobs/subscription_confirm_job_spec.rb
@@ -3,8 +3,6 @@
 require 'spec_helper'
 
 describe SubscriptionConfirmJob do
-  include OpenFoodNetwork::EmailHelper
-
   let(:job) { SubscriptionConfirmJob.new }
 
   describe "finding proxy_orders that are ready to be confirmed" do
@@ -239,10 +237,6 @@ describe SubscriptionConfirmJob do
         end
 
         context "when payments are processed without error" do
-          around do |example|
-            performing_deliveries { example.run }
-          end
-
           before do
             expect(payment).to receive(:process_offline!) { true }
             expect(payment).to receive(:completed?) { true }
diff --git a/spec/lib/spree/core/mail_interceptor_spec.rb b/spec/lib/spree/core/mail_interceptor_spec.rb
index 05a071aab5..4642a262f6 100644
--- a/spec/lib/spree/core/mail_interceptor_spec.rb
+++ b/spec/lib/spree/core/mail_interceptor_spec.rb
@@ -11,7 +11,6 @@ describe Spree::OrderMailer do
   let(:message) { Spree::OrderMailer.confirm_email_for_shop(order) }
 
   before(:all) do
-    ActionMailer::Base.perform_deliveries = true
     ActionMailer::Base.deliveries.clear
   end
 
diff --git a/spec/mailers/order_mailer_spec.rb b/spec/mailers/order_mailer_spec.rb
index a4c2d88455..47dc67846f 100644
--- a/spec/mailers/order_mailer_spec.rb
+++ b/spec/mailers/order_mailer_spec.rb
@@ -159,7 +159,6 @@ describe Spree::OrderMailer do
 
     before do
       ActionMailer::Base.delivery_method = :test
-      ActionMailer::Base.perform_deliveries = true
       ActionMailer::Base.deliveries = []
     end
 
diff --git a/spec/mailers/user_mailer_spec.rb b/spec/mailers/user_mailer_spec.rb
index 08bc64e62b..76caa391bf 100644
--- a/spec/mailers/user_mailer_spec.rb
+++ b/spec/mailers/user_mailer_spec.rb
@@ -11,7 +11,6 @@ describe Spree::UserMailer do
 
   before do
     ActionMailer::Base.delivery_method = :test
-    ActionMailer::Base.perform_deliveries = true
     ActionMailer::Base.deliveries = []
   end
 
diff --git a/spec/models/spree/user_spec.rb b/spec/models/spree/user_spec.rb
index 0ac5dbc159..9efa18f8af 100644
--- a/spec/models/spree/user_spec.rb
+++ b/spec/models/spree/user_spec.rb
@@ -3,8 +3,6 @@
 require 'spec_helper'
 
 describe Spree::User do
-  include OpenFoodNetwork::EmailHelper
-
   describe "associations" do
     it { is_expected.to have_many(:owned_enterprises) }
     it { is_expected.to have_many(:webhook_endpoints).dependent(:destroy) }
@@ -84,11 +82,9 @@ describe Spree::User do
 
   context "#create" do
     it "should send a confirmation email" do
-      performing_deliveries do
-        expect do
-          create(:user, email: 'new_user@example.com', confirmation_sent_at: nil, confirmed_at: nil)
-        end.to enqueue_job ActionMailer::MailDeliveryJob
-      end
+      expect do
+        create(:user, email: 'new_user@example.com', confirmation_sent_at: nil, confirmed_at: nil)
+      end.to enqueue_job ActionMailer::MailDeliveryJob
 
       expect(enqueued_jobs.last.to_s).to match "confirmation_instructions"
     end
diff --git a/spec/support/email_helper.rb b/spec/support/email_helper.rb
deleted file mode 100644
index 5f58e919de..0000000000
--- a/spec/support/email_helper.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module OpenFoodNetwork
-  module EmailHelper
-    # Ensures the value `perform_deliveries` had is restored. This saves us
-    # from messing up with the test suite's global state which is cause of
-    # trouble.
-    def performing_deliveries
-      old_value = ActionMailer::Base.perform_deliveries
-      ActionMailer::Base.perform_deliveries = true
-
-      yield
-
-      ActionMailer::Base.perform_deliveries = old_value
-    end
-  end
-end
diff --git a/spec/system/admin/users_spec.rb b/spec/system/admin/users_spec.rb
index ae2dd3ef8e..13fa1df495 100644
--- a/spec/system/admin/users_spec.rb
+++ b/spec/system/admin/users_spec.rb
@@ -4,7 +4,6 @@ require "system_helper"
 
 describe "Managing users" do
   include AuthenticationHelper
-  include OpenFoodNetwork::EmailHelper
 
   context "as super-admin" do
     before do
@@ -153,10 +152,6 @@ describe "Managing users" do
     describe "resending confirmation email" do
       let(:user) { create :user, confirmed_at: nil }
 
-      around do |example|
-        performing_deliveries { example.run }
-      end
-
       it "displays success" do
         visit spree.edit_admin_user_path user
 
diff --git a/spec/system/consumer/account/settings_spec.rb b/spec/system/consumer/account/settings_spec.rb
index 1c1470f74a..2a6e4c2a6d 100644
--- a/spec/system/consumer/account/settings_spec.rb
+++ b/spec/system/consumer/account/settings_spec.rb
@@ -4,7 +4,6 @@ require 'system_helper'
 
 describe "Account Settings" do
   include AuthenticationHelper
-  include OpenFoodNetwork::EmailHelper
 
   describe "as a logged in user" do
     let(:user) do
@@ -24,11 +23,9 @@ describe "Account Settings" do
     it "allows the user to update their email address" do
       fill_in 'user_email', with: 'new@email.com'
 
-      performing_deliveries do
-        expect do
-          click_button 'Update'
-        end.to enqueue_job ActionMailer::MailDeliveryJob
-      end
+      expect do
+        click_button 'Update'
+      end.to enqueue_job ActionMailer::MailDeliveryJob
 
       expect(enqueued_jobs.last.to_s).to match "new@email.com"
 

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 3/4] 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
 

From 9b3cfe80fff1aefcf6ae8ceeeb80538ae8e4299e Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Thu, 20 Apr 2023 13:35:40 +1000
Subject: [PATCH 4/4] Remove useless clearing of test emails

They are cleared by the test environment anyway.
---
 spec/lib/spree/core/mail_interceptor_spec.rb | 6 ------
 spec/mailers/enterprise_mailer_spec.rb       | 4 ----
 spec/mailers/order_mailer_spec.rb            | 8 --------
 spec/mailers/user_mailer_spec.rb             | 8 --------
 spec/services/place_proxy_order_spec.rb      | 2 --
 spec/system/consumer/authentication_spec.rb  | 1 -
 6 files changed, 29 deletions(-)

diff --git a/spec/lib/spree/core/mail_interceptor_spec.rb b/spec/lib/spree/core/mail_interceptor_spec.rb
index 4129a110cb..fff2b44c59 100644
--- a/spec/lib/spree/core/mail_interceptor_spec.rb
+++ b/spec/lib/spree/core/mail_interceptor_spec.rb
@@ -10,13 +10,7 @@ describe Spree::OrderMailer do
   end
   let(:message) { Spree::OrderMailer.confirm_email_for_shop(order) }
 
-  before(:all) do
-    ActionMailer::Base.deliveries.clear
-  end
-
   context "#deliver" do
-    after { ActionMailer::Base.deliveries.clear }
-
     it "should use the from address specified in the preference" do
       Spree::Config[:mails_from] = "no-reply@foobar.com"
       message.deliver_now
diff --git a/spec/mailers/enterprise_mailer_spec.rb b/spec/mailers/enterprise_mailer_spec.rb
index c727a9097a..a9417a3841 100644
--- a/spec/mailers/enterprise_mailer_spec.rb
+++ b/spec/mailers/enterprise_mailer_spec.rb
@@ -6,10 +6,6 @@ describe EnterpriseMailer do
   let!(:enterprise) { create(:enterprise) }
   let!(:user) { create(:user) }
 
-  before do
-    ActionMailer::Base.deliveries = []
-  end
-
   describe "#welcome" do
     it "sends a welcome email when given an enterprise" do
       EnterpriseMailer.welcome(enterprise).deliver_now
diff --git a/spec/mailers/order_mailer_spec.rb b/spec/mailers/order_mailer_spec.rb
index ac467b28ae..5a20e0fd2e 100644
--- a/spec/mailers/order_mailer_spec.rb
+++ b/spec/mailers/order_mailer_spec.rb
@@ -153,14 +153,6 @@ describe Spree::OrderMailer do
                                      special_instructions: shipping_instructions)
     }
 
-    after do
-      ActionMailer::Base.deliveries.clear
-    end
-
-    before do
-      ActionMailer::Base.deliveries = []
-    end
-
     describe "for customers" do
       it "should send an email to the customer when given an order" do
         Spree::OrderMailer.confirm_email_for_customer(order.id).deliver_now
diff --git a/spec/mailers/user_mailer_spec.rb b/spec/mailers/user_mailer_spec.rb
index 77bdcc7a43..b90b3385fd 100644
--- a/spec/mailers/user_mailer_spec.rb
+++ b/spec/mailers/user_mailer_spec.rb
@@ -5,14 +5,6 @@ require 'spec_helper'
 describe Spree::UserMailer do
   let(:user) { build(:user) }
 
-  after do
-    ActionMailer::Base.deliveries.clear
-  end
-
-  before do
-    ActionMailer::Base.deliveries = []
-  end
-
   describe '#signup_confirmation' do
     it "sends email when given a user" do
       Spree::UserMailer.signup_confirmation(user).deliver_now
diff --git a/spec/services/place_proxy_order_spec.rb b/spec/services/place_proxy_order_spec.rb
index 3c6984f5ec..b01ee48fd8 100644
--- a/spec/services/place_proxy_order_spec.rb
+++ b/spec/services/place_proxy_order_spec.rb
@@ -56,8 +56,6 @@ describe PlaceProxyOrder do
       end
 
       it "records an issue and ignores it" do
-        ActionMailer::Base.deliveries.clear
-
         expect(summarizer).to receive(:record_issue).with(:complete, order).once
         expect { subject.call }.to_not change { order.reload.state }
         expect(order.payments.first.state).to eq "checkout"
diff --git a/spec/system/consumer/authentication_spec.rb b/spec/system/consumer/authentication_spec.rb
index 82f140b43b..e3dfe2bbfd 100644
--- a/spec/system/consumer/authentication_spec.rb
+++ b/spec/system/consumer/authentication_spec.rb
@@ -125,7 +125,6 @@ describe "Authentication" do
 
         describe "forgetting passwords" do
           before do
-            ActionMailer::Base.deliveries.clear
             select_login_tab "Forgot Password?"
           end