Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Fixed deprecation warnings and flaky test in emails

Damian Legawieca9bcf86c4bd4
diff --git a/core/app/helpers/spree/mail_helper.rb b/core/app/helpers/spree/mail_helper.rb
index 76dc294ed9..42c5052b5d 100644
--- a/core/app/helpers/spree/mail_helper.rb
+++ b/core/app/helpers/spree/mail_helper.rb
@@ -1,10 +1,11 @@
module Spree
module MailHelper
- include BaseHelper
+ include Spree::BaseHelper
+ include Spree::ImagesHelper
def variant_image_url(variant)
- image = default_image_for_product_or_variant(variant)
- image ? main_app.cdn_image_url(image.url(:small)) : image_url('noimage/small.png')
+ image = variant.default_image
+ image.present? && image.attached? ? spree_image_url(image, width: 100, height: 100) : image_url('noimage/small.png')
end
def name_for(order)
diff --git a/emails/spec/helpers/spree/mail_helper_spec.rb b/emails/spec/helpers/spree/mail_helper_spec.rb
index 818c499242..b0f7a537f6 100644
--- a/emails/spec/helpers/spree/mail_helper_spec.rb
+++ b/emails/spec/helpers/spree/mail_helper_spec.rb
@@ -21,7 +21,7 @@ module Spree
let(:image) { create(:image) }
specify 'returns proper image path' do
- expect(subject).to eq main_app.cdn_image_url(image.url(:small))
+ expect(subject).to eq spree_image_url(image, width: 100, height: 100)
end
end
end
diff --git a/emails/spec/mailers/spree/order_mailer_spec.rb b/emails/spec/mailers/spree/order_mailer_spec.rb
index 586c6975f3..51d13a68a6 100644
--- a/emails/spec/mailers/spree/order_mailer_spec.rb
+++ b/emails/spec/mailers/spree/order_mailer_spec.rb
@@ -5,21 +5,14 @@ describe Spree::OrderMailer, type: :mailer do
include EmailSpec::Helpers
include EmailSpec::Matchers
- let(:store) { @default_store }
- let(:first_store) { create(:store, name: 'First Store', default: true, default_locale: 'en') }
+ let!(:store) { create(:store, name: 'First Store', default: true, default_locale: 'en') }
let(:second_store) { create(:store, name: 'Second Store', url: 'other.example.com', default_locale: 'en') }
- before do
- # Make sure we always start with the default locale
- I18n.locale = :en
- end
-
let(:order) do
- order = create(:completed_order_with_totals, email: '[email protected]')
+ order = create(:completed_order_with_totals, email: '[email protected]', store: store)
product = create(:product, name: %{The "BEST" product})
variant = create(:variant, product: product)
price = create(:price, variant: variant, amount: 5.00)
- store = first_store
line_item = create(:line_item, variant: variant, order: order, quantity: 1, price: 4.99)
allow(product).to receive_messages(default_variant: variant)
allow(variant).to receive_messages(default_price: price)
@@ -29,7 +22,7 @@ describe Spree::OrderMailer, type: :mailer do
end
let(:second_order) do
- order = create(:completed_order_with_totals, email: '[email protected]')
+ order = create(:completed_order_with_totals, email: '[email protected]', store: second_store)
product = create(:product, name: %{The "BESTEST" product})
variant = create(:variant, product: product)
price = create(:price, variant: variant, amount: 15.00)
@@ -217,12 +210,12 @@ describe Spree::OrderMailer, type: :mailer do
order
I18n.locale = :'pt-BR'
- first_store.update(default_locale: 'pt-BR')
+ store.update(default_locale: 'pt-BR')
end
after do
I18n.locale = :en
- first_store.update(default_locale: 'en')
+ store.update(default_locale: 'en')
end
it_behaves_like 'translates emails'
@@ -255,8 +248,8 @@ describe Spree::OrderMailer, type: :mailer do
context 'confirm_email comes with data of the store where order was made' do
it 'shows order store data' do
confirmation_email = described_class.confirm_email(order)
- expect(confirmation_email.from).to include(first_store.mail_from_address)
- expect(confirmation_email.subject).to include(first_store.name)
+ expect(confirmation_email.from).to include(store.mail_from_address)
+ expect(confirmation_email.subject).to include(store.name)
end
it 'shows order store data #2' do
@@ -283,7 +276,7 @@ describe Spree::OrderMailer, type: :mailer do
describe '#payment_link_email' do
let(:payment_link_email) { described_class.payment_link_email(order_for_payment.id) }
- let(:order_for_payment) { create(:order_with_line_items, store: first_store) }
+ let(:order_for_payment) { create(:order_with_line_items, store: store) }
let(:payment_url) { "http://shop.com/checkout/#{order_for_payment.token}/payment" }
before do
@@ -291,7 +284,7 @@ describe Spree::OrderMailer, type: :mailer do
end
it 'sends an email with the payment link' do
- expect(payment_link_email.from).to contain_exactly(first_store.mail_from_address)
+ expect(payment_link_email.from).to contain_exactly(store.mail_from_address)
expect(payment_link_email.to).to contain_exactly(order_for_payment.email)
expect(payment_link_email.subject).to eq("Payment link for order ##{order_for_payment.number}")
expect(payment_link_email.body).to include(payment_url)
diff --git a/emails/spec/mailers/spree/reimbursement_mailer_spec.rb b/emails/spec/mailers/spree/reimbursement_mailer_spec.rb
index 1013f5e45b..57773457c5 100644
--- a/emails/spec/mailers/spree/reimbursement_mailer_spec.rb
+++ b/emails/spec/mailers/spree/reimbursement_mailer_spec.rb
@@ -7,11 +7,6 @@ describe Spree::ReimbursementMailer, type: :mailer do
let(:reimbursement) { create(:reimbursement) }
- before do
- # Make sure we always start with the default locale
- I18n.locale = :en
- end
-
context ':from not set explicitly' do
it 'uses store mail from address' do
message = Spree::ReimbursementMailer.reimbursement_email(reimbursement)
diff --git a/emails/spec/mailers/spree/shipment_mailer_spec.rb b/emails/spec/mailers/spree/shipment_mailer_spec.rb
index d0262bf60a..2270ba3b86 100644
--- a/emails/spec/mailers/spree/shipment_mailer_spec.rb
+++ b/emails/spec/mailers/spree/shipment_mailer_spec.rb
@@ -5,16 +5,12 @@ describe Spree::ShipmentMailer, type: :mailer do
include EmailSpec::Helpers
include EmailSpec::Matchers
- let(:store) { @default_store }
-
+ let(:store) { create(:store, default: true) }
let(:order) { create(:shipped_order, store: store, email: '[email protected]', user: nil) }
let(:shipment) { order.shipments.first }
let(:shipping_method) { shipment.shipping_method }
before do
- # Make sure we always start with the default locale
- I18n.locale = :en
-
shipping_method.update(tracking_url: 'http://example.com/tracking')
end
diff --git a/emails/spec/spec_helper.rb b/emails/spec/spec_helper.rb
index bb18b383d8..af6b0e9a63 100644
--- a/emails/spec/spec_helper.rb
+++ b/emails/spec/spec_helper.rb
@@ -72,6 +72,7 @@ RSpec.configure do |config|
config.before(:each) do
Spree::Webhooks.disabled = true
reset_spree_preferences
+ I18n.locale = :en
end
config.include FactoryBot::Syntax::Methods