From 915bd19d7b2e60c9af5d51c498d1b62365d09f6c Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Thu, 20 Apr 2023 12:15:57 +1000 Subject: [PATCH] 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"