mirror of
https://github.com/openfoodfoundation/openfoodnetwork
synced 2026-01-24 20:36:49 +00:00
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.
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)) }
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 = []
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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) }
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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))
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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'
|
||||
|
||||
|
||||
@@ -8,7 +8,6 @@ describe "Managing users" do
|
||||
|
||||
context "as super-admin" do
|
||||
before do
|
||||
setup_email
|
||||
login_as_admin
|
||||
end
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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") }
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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") }
|
||||
|
||||
Reference in New Issue
Block a user