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.

FIX customers export (#13138)

brozek2f3dd835c6fb
diff --git a/core/app/models/concerns/spree/user_methods.rb b/core/app/models/concerns/spree/user_methods.rb
index d5cd74fdec..0fa3cfac30 100644
--- a/core/app/models/concerns/spree/user_methods.rb
+++ b/core/app/models/concerns/spree/user_methods.rb
@@ -83,6 +83,11 @@ module Spree
where("#{Spree::Address.table_name}.firstname LIKE ? or #{Spree::Address.table_name}.lastname LIKE ? or #{table_name}.email LIKE ?",
"%#{address}%", "%#{address}%", "%#{email}%")
end
+
+ # We override this method because we cannot use for_store on users because it will return admin users
+ def self.for_store(store)
+ self
+ end
end
# Returns the last incomplete spree order for the current store
diff --git a/core/lib/spree/testing_support/factories/export_factory.rb b/core/lib/spree/testing_support/factories/export_factory.rb
index e251f44518..da5afad794 100644
--- a/core/lib/spree/testing_support/factories/export_factory.rb
+++ b/core/lib/spree/testing_support/factories/export_factory.rb
@@ -28,5 +28,9 @@ FactoryBot.define do
factory :order_export, class: 'Spree::Exports::Orders', parent: :export do
type { 'Spree::Exports::Orders' }
end
+
+ factory :customer_export, class: 'Spree::Exports::Customers', parent: :export do
+ type { 'Spree::Exports::Customers' }
+ end
end
end
diff --git a/core/spec/models/spree/export_spec.rb b/core/spec/models/spree/export_spec.rb
index 5a98cef2d7..dfde622576 100644
--- a/core/spec/models/spree/export_spec.rb
+++ b/core/spec/models/spree/export_spec.rb
@@ -30,17 +30,26 @@ RSpec.describe Spree::Export, :job, type: :model do
end
describe '#generate' do
- before { export.save! }
-
it 'generates the export' do
+ export.save!
expect { export.generate }.to change(export.attachment, :attached?).from(false).to(true)
expect(export.attachment.content_type).to eq('text/csv')
end
it 'sends the export done email' do
+ export.save!
expect { export.generate }.to have_enqueued_job(ActionMailer::MailDeliveryJob)
end
+
+ context 'when the export type is Spree::Exports::Customers' do
+ let(:export) { build(:customer_export, store: store, user: user, format: 'csv') }
+
+ it 'generates the export' do
+ export.save!
+ expect { export.generate }.to change(export.attachment, :attached?).from(false).to(true)
+ end
+ end
end
describe '#records_to_export' do