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.

Deprecate MailHelper#logo_path

Damian Legawiecc51a043b45fe
diff --git a/core/app/helpers/spree/mail_helper.rb b/core/app/helpers/spree/mail_helper.rb
index 42c5052b5d..33bff54d65 100644
--- a/core/app/helpers/spree/mail_helper.rb
+++ b/core/app/helpers/spree/mail_helper.rb
@@ -17,6 +17,8 @@ module Spree
end
def logo_path
+ Spree::Deprecation.warn('logo_path is deprecated and will be removed in Spree 6.0. Please use Active Storage URL helpers instead.')
+
return main_app.cdn_image_url(store_logo.variant(resize_to_limit: [244, 104])) if store_logo&.variable?
return main_app.cdn_image_url(store_logo) if store_logo&.image?
diff --git a/emails/spec/helpers/spree/mail_helper_spec.rb b/emails/spec/helpers/spree/mail_helper_spec.rb
index b0f7a537f6..a5ccd561f0 100644
--- a/emails/spec/helpers/spree/mail_helper_spec.rb
+++ b/emails/spec/helpers/spree/mail_helper_spec.rb
@@ -2,6 +2,11 @@ require 'spec_helper'
module Spree
describe MailHelper, type: :helper do
+ let(:store) { create(:store) }
+
+ before do
+ allow(helper).to receive(:current_store) { store }
+ end
describe '#variant_image_url' do
subject { helper.variant_image_url(variant) }
@@ -48,42 +53,5 @@ module Spree
end
end
end
-
- describe '#logo_path' do
- subject { helper.logo_path }
-
- let(:store) { @default_store }
-
- before do
- allow(helper).to receive(:current_store) { store }
- end
-
- context 'when @order exists' do
- let(:logo_image) { File.open(File.expand_path('../../../app/assets/images/logo/spree_50.png', __dir__)) }
-
- before do
- store.mailer_logo.attach(io: logo_image, filename: 'spree_50.png', content_type: 'image/png')
- store.save!
- @order = create(:order, store: store)
- end
-
- it 'shows logo attached to orders store' do
- expect(subject).to include(store.mailer_logo.filename.to_s)
- end
- end
-
- context 'when @order does not exist' do
- let(:logo_image) { File.open(File.expand_path('../../../app/assets/images/noimage/mini.png', __dir__)) }
-
- before do
- store.mailer_logo.attach(io: logo_image, filename: 'mini.png', content_type: 'image/png')
- store.save!
- end
-
- it 'shows logo attached to current store' do
- expect(subject).to include(store.mailer_logo.filename.to_s)
- end
- end
- end
end
end