From b5038fa5dc8483c17cabd6883770c6a0a9285848 Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Fri, 24 Aug 2018 20:00:34 +0100 Subject: [PATCH 1/2] Changed calls to MailMethod in specs to calls to Spree::Config[:mails_from] --- spec/controllers/admin/subscriptions_controller_spec.rb | 5 +---- spec/controllers/spree/admin/orders_controller_spec.rb | 5 +---- spec/controllers/spree/orders_controller_spec.rb | 5 +---- spec/controllers/user_passwords_controller_spec.rb | 1 - spec/features/consumer/shopping/orders_spec.rb | 5 +---- spec/mailers/enterprise_mailer_spec.rb | 1 - spec/mailers/producer_mailer_spec.rb | 5 +---- spec/mailers/user_mailer_spec.rb | 2 -- spec/models/order_cycle_spec.rb | 5 +---- spec/models/spree/order_spec.rb | 5 +---- 10 files changed, 7 insertions(+), 32 deletions(-) diff --git a/spec/controllers/admin/subscriptions_controller_spec.rb b/spec/controllers/admin/subscriptions_controller_spec.rb index 28834f50f6..ea4ea8ee61 100644 --- a/spec/controllers/admin/subscriptions_controller_spec.rb +++ b/spec/controllers/admin/subscriptions_controller_spec.rb @@ -626,10 +626,7 @@ describe Admin::SubscriptionsController, type: :controller do context "when at least one associate orders is 'canceled'" do before do - Spree::MailMethod.create!( - environment: Rails.env, - preferred_mails_from: 'spree@example.com' - ) + Spree::Config[:mails_from] = "spree@example.com" proxy_order.cancel end diff --git a/spec/controllers/spree/admin/orders_controller_spec.rb b/spec/controllers/spree/admin/orders_controller_spec.rb index 25c2683d4d..d25a9899e9 100644 --- a/spec/controllers/spree/admin/orders_controller_spec.rb +++ b/spec/controllers/spree/admin/orders_controller_spec.rb @@ -180,10 +180,7 @@ describe Spree::Admin::OrdersController, type: :controller do context "when the distributor's ABN has been set" do before { distributor.update_attribute(:abn, "123") } before do - Spree::MailMethod.create!( - environment: Rails.env, - preferred_mails_from: 'spree@example.com' - ) + Spree::Config[:mails_from] = "spree@example.com" end it "should allow me to send order invoices" do expect do diff --git a/spec/controllers/spree/orders_controller_spec.rb b/spec/controllers/spree/orders_controller_spec.rb index fbcd5ec107..6faf7456e3 100644 --- a/spec/controllers/spree/orders_controller_spec.rb +++ b/spec/controllers/spree/orders_controller_spec.rb @@ -398,10 +398,7 @@ describe Spree::OrdersController, type: :controller do let(:order) { create(:completed_order_with_totals, user: user) } before do - Spree::MailMethod.create!( - environment: Rails.env, - preferred_mails_from: 'spree@example.com' - ) + Spree::Config[:mails_from] = "spree@example.com" end it "responds with success" do diff --git a/spec/controllers/user_passwords_controller_spec.rb b/spec/controllers/user_passwords_controller_spec.rb index 42e505e172..90f1042d9f 100644 --- a/spec/controllers/user_passwords_controller_spec.rb +++ b/spec/controllers/user_passwords_controller_spec.rb @@ -32,7 +32,6 @@ describe UserPasswordsController, type: :controller do end it "renders Darkswarm" do - Spree::MailMethod.create!(environment: 'test') clear_jobs user.send_reset_password_instructions diff --git a/spec/features/consumer/shopping/orders_spec.rb b/spec/features/consumer/shopping/orders_spec.rb index 66f2bcf4ce..05d975e710 100644 --- a/spec/features/consumer/shopping/orders_spec.rb +++ b/spec/features/consumer/shopping/orders_spec.rb @@ -37,10 +37,7 @@ feature "Order Management", js: true do context "when the distributor allows changes to be made to orders" do before do - Spree::MailMethod.create!( - environment: Rails.env, - preferred_mails_from: 'spree@example.com' - ) + Spree::Config[:mails_from] = "spree@example.com" end before do order.distributor.update_attributes(allow_order_changes: true) diff --git a/spec/mailers/enterprise_mailer_spec.rb b/spec/mailers/enterprise_mailer_spec.rb index a31a9ec0e2..956cdc7556 100644 --- a/spec/mailers/enterprise_mailer_spec.rb +++ b/spec/mailers/enterprise_mailer_spec.rb @@ -6,7 +6,6 @@ describe EnterpriseMailer do before do ActionMailer::Base.deliveries = [] - Spree::MailMethod.create!(environment: 'test') end describe "#welcome" do diff --git a/spec/mailers/producer_mailer_spec.rb b/spec/mailers/producer_mailer_spec.rb index 5fd1fc172d..9785031436 100644 --- a/spec/mailers/producer_mailer_spec.rb +++ b/spec/mailers/producer_mailer_spec.rb @@ -3,10 +3,7 @@ require 'yaml' describe ProducerMailer do before do - Spree::MailMethod.create!( - environment: Rails.env, - preferred_mails_from: 'spree@example.com' - ) + Spree::Config[:mails_from] = "spree@example.com" end let!(:zone) { create(:zone_with_member) } let!(:tax_rate) { create(:tax_rate, included_in_price: true, calculator: Spree::Calculator::DefaultTax.new, zone: zone, amount: 0.1) } diff --git a/spec/mailers/user_mailer_spec.rb b/spec/mailers/user_mailer_spec.rb index d8d9b58744..f1198ba39a 100644 --- a/spec/mailers/user_mailer_spec.rb +++ b/spec/mailers/user_mailer_spec.rb @@ -11,8 +11,6 @@ describe Spree::UserMailer do ActionMailer::Base.delivery_method = :test ActionMailer::Base.perform_deliveries = true ActionMailer::Base.deliveries = [] - - Spree::MailMethod.create!(environment: 'test') end it "sends an email when given a user" do diff --git a/spec/models/order_cycle_spec.rb b/spec/models/order_cycle_spec.rb index efd0f3ba03..c55384b947 100644 --- a/spec/models/order_cycle_spec.rb +++ b/spec/models/order_cycle_spec.rb @@ -525,10 +525,7 @@ describe OrderCycle do let!(:order5) { create(:completed_order_with_totals, distributor: shop, user: user, order_cycle: oc) } before do - Spree::MailMethod.create!( - environment: Rails.env, - preferred_mails_from: 'spree@example.com' - ) + Spree::Config[:mails_from] = "spree@example.com" end before { order5.cancel } diff --git a/spec/models/spree/order_spec.rb b/spec/models/spree/order_spec.rb index 4e23a102ef..a65166e131 100644 --- a/spec/models/spree/order_spec.rb +++ b/spec/models/spree/order_spec.rb @@ -495,10 +495,7 @@ describe Spree::Order do describe "scopes" do describe "not_state" do before do - Spree::MailMethod.create!( - environment: Rails.env, - preferred_mails_from: 'spree@example.com' - ) + Spree::Config[:mails_from] = "spree@example.com" end it "finds only orders not in specified state" do From 082f9e404b6c33502e997b5e90a3c75c23fbddfe Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Mon, 27 Aug 2018 21:04:18 +0100 Subject: [PATCH 2/2] Fixed test on order_cycle_spec by replacing eq with match_array --- spec/models/order_cycle_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/models/order_cycle_spec.rb b/spec/models/order_cycle_spec.rb index c55384b947..855bfaf344 100644 --- a/spec/models/order_cycle_spec.rb +++ b/spec/models/order_cycle_spec.rb @@ -531,7 +531,7 @@ describe OrderCycle do it "only returns items from non-cancelled orders in the OC, placed by the user at the shop" do items = oc.items_bought_by_user(user, shop) - expect(items).to eq order1.reload.line_items + expect(items).to match_array order1.reload.line_items end end end