mirror of
https://github.com/openfoodfoundation/openfoodnetwork
synced 2026-03-31 06:31:41 +00:00
Remove useless email test setup
We always deliver emails these days.
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 }
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -159,7 +159,6 @@ describe Spree::OrderMailer do
|
||||
|
||||
before do
|
||||
ActionMailer::Base.delivery_method = :test
|
||||
ActionMailer::Base.perform_deliveries = true
|
||||
ActionMailer::Base.deliveries = []
|
||||
end
|
||||
|
||||
|
||||
@@ -11,7 +11,6 @@ describe Spree::UserMailer do
|
||||
|
||||
before do
|
||||
ActionMailer::Base.delivery_method = :test
|
||||
ActionMailer::Base.perform_deliveries = true
|
||||
ActionMailer::Base.deliveries = []
|
||||
end
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user