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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
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.rbindex 76dc294ed9..42c5052b5d 100644--- a/core/app/helpers/spree/mail_helper.rb+++ b/core/app/helpers/spree/mail_helper.rb@@ -1,10 +1,11 @@module Spreemodule MailHelper- include BaseHelper+ include Spree::BaseHelper+ include Spree::ImagesHelperdef 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')enddef name_for(order)diff --git a/emails/spec/helpers/spree/mail_helper_spec.rb b/emails/spec/helpers/spree/mail_helper_spec.rbindex 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 Spreelet(: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)endendenddiff --git a/emails/spec/mailers/spree/order_mailer_spec.rb b/emails/spec/mailers/spree/order_mailer_spec.rbindex 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 doinclude EmailSpec::Helpersinclude 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_storeline_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 doendlet(: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 doorderI18n.locale = :'pt-BR'- first_store.update(default_locale: 'pt-BR')+ store.update(default_locale: 'pt-BR')endafter doI18n.locale = :en- first_store.update(default_locale: 'en')+ store.update(default_locale: 'en')endit_behaves_like 'translates emails'@@ -255,8 +248,8 @@ describe Spree::OrderMailer, type: :mailer docontext 'confirm_email comes with data of the store where order was made' doit 'shows order store data' doconfirmation_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)endit 'shows order store data #2' do@@ -283,7 +276,7 @@ describe Spree::OrderMailer, type: :mailer dodescribe '#payment_link_email' dolet(: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 doendit '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.rbindex 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 dolet(:reimbursement) { create(:reimbursement) }- before do- # Make sure we always start with the default locale- I18n.locale = :en- end-context ':from not set explicitly' doit 'uses store mail from address' domessage = Spree::ReimbursementMailer.reimbursement_email(reimbursement)diff --git a/emails/spec/mailers/spree/shipment_mailer_spec.rb b/emails/spec/mailers/spree/shipment_mailer_spec.rbindex 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 doinclude EmailSpec::Helpersinclude 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')enddiff --git a/emails/spec/spec_helper.rb b/emails/spec/spec_helper.rbindex 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) doSpree::Webhooks.disabled = truereset_spree_preferences+ I18n.locale = :enendconfig.include FactoryBot::Syntax::Methods