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
Cover reviewed platform-auth fixes; migrate addresses service off alias
Łukasz Adamczyk7d9b74291636
diff --git a/spree/api/spec/controllers/spree/api/v3/admin/orders_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/orders_controller_spec.rbindex 98693f60b2..fa976e1849 100644--- a/spree/api/spec/controllers/spree/api/v3/admin/orders_controller_spec.rb+++ b/spree/api/spec/controllers/spree/api/v3/admin/orders_controller_spec.rb@@ -180,7 +180,16 @@ RSpec.describe Spree::Api::V3::Admin::OrdersController, type: :controller doexpect(response).to have_http_status(:created)created_order = Spree::Order.find_by_prefix_id(json_response['id'])- expect(created_order.user).to eq(customer)+ expect(created_order.customer).to eq(customer)+ end++ it 'refuses to attach a customer the principal is not allowed to see' do+ restricted = Spree::Ability.new(admin_user)+ restricted.cannot :show, Spree.customer_class, id: customer.id+ allow_any_instance_of(described_class).to receive(:current_ability).and_return(restricted)++ expect { subject }.not_to change(Spree::Order, :count)+ expect(response).to have_http_status(:not_found)endenddiff --git a/spree/api/spec/controllers/spree/api/v3/store/newsletter_subscribers_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/newsletter_subscribers_controller_spec.rbindex ba690b10c1..f372fb5f9b 100644--- a/spree/api/spec/controllers/spree/api/v3/store/newsletter_subscribers_controller_spec.rb+++ b/spree/api/spec/controllers/spree/api/v3/store/newsletter_subscribers_controller_spec.rb@@ -11,6 +11,26 @@ RSpec.describe Spree::Api::V3::Store::NewsletterSubscribersController, type: :corequest.headers['X-Spree-Api-Key'] = api_key.tokenend+ describe 'DELETE #destroy' do+ # Opt in via update_column, not the factory — setting accepts_email_marketing+ # at create time auto-subscribes the customer and collides with our subscriber.+ let(:marketing_customer) { create(:user) }+ let!(:subscriber) do+ create(:newsletter_subscriber, :verified, customer: marketing_customer, email: marketing_customer.email, store: store)+ end++ it 'destroys the subscription and clears the customer opt-in when none remain' do+ marketing_customer.update_column(:accepts_email_marketing, true)+ token = subscriber.generate_token_for(:unsubscribe)++ delete :destroy, params: { id: subscriber.prefixed_id, token: token }++ expect(response).to have_http_status(:no_content)+ expect(Spree::NewsletterSubscriber.exists?(subscriber.id)).to be(false)+ expect(marketing_customer.reload.accepts_email_marketing).to be(false)+ end+ end+describe 'POST #request_unsubscribe' docontext 'when the email matches a subscriber on the current store' dolet!(:subscriber) { create(:newsletter_subscriber, :verified, store: store) }diff --git a/spree/api/spec/serializers/spree/api/v3/admin/order_serializer_spec.rb b/spree/api/spec/serializers/spree/api/v3/admin/order_serializer_spec.rbindex ffcddf7619..c2cf4ea3dc 100644--- a/spree/api/spec/serializers/spree/api/v3/admin/order_serializer_spec.rb+++ b/spree/api/spec/serializers/spree/api/v3/admin/order_serializer_spec.rb@@ -35,4 +35,15 @@ RSpec.describe Spree::Api::V3::Admin::OrderSerializer doexpect(line_item_data['metadata']).to eq({ 'gift' => true })endend++ describe 'customer' do+ let(:order) { create(:order, store: store, customer: create(:user, email: '[email protected]')) }+ let(:base_params) { { store: store, currency: store.default_currency, expand: 'customer' } }++ it 'embeds the customer through the renamed association' do+ expect(subject['customer']).to be_present+ expect(subject['customer']['id']).to eq(order.customer.prefixed_id)+ expect(subject['customer']['email']).to eq('[email protected]')+ end+ endenddiff --git a/spree/core/app/services/spree/addresses/update.rb b/spree/core/app/services/spree/addresses/update.rbindex 98cf96627a..4ee848e971 100644--- a/spree/core/app/services/spree/addresses/update.rb+++ b/spree/core/app/services/spree/addresses/update.rb@@ -83,14 +83,14 @@ module Spreeenddef prepare_address_params!(address, address_params)- address_params[:user_id] = address&.customer_id+ address_params[:customer_id] = address&.customer_idaddress_params[:country_id] ||= address.country_idaddress_params = fill_country_and_state_ids(address_params)address_params.transform_values!(&:presence)enddef reassign_incomplete_orders(old_address_id, new_address)- orders = Spree::Order.incomplete.where(user_id: new_address.customer_id)+ orders = Spree::Order.incomplete.where(customer_id: new_address.customer_id)orders.where(ship_address_id: old_address_id).update_all(ship_address_id: new_address.id, state: 'address', updated_at: Time.current)orders.where(bill_address_id: old_address_id).update_all(bill_address_id: new_address.id, state: 'address', updated_at: Time.current)enddiff --git a/spree/core/spec/lib/tasks/migrate_users_to_customers_spec.rb b/spree/core/spec/lib/tasks/migrate_users_to_customers_spec.rbindex 58b5771947..6cc71525c6 100644--- a/spree/core/spec/lib/tasks/migrate_users_to_customers_spec.rb+++ b/spree/core/spec/lib/tasks/migrate_users_to_customers_spec.rb@@ -73,6 +73,8 @@ describe 'spree:upgrade:migrate_users_to_customers' doexpect(alice.password_digest).to eq('alice_digest')expect(Spree.customer_class.exists?(900_002)).to be(true)+ # accepts_email_marketing is NOT NULL — a legacy nil must land as false.+ expect(Spree.customer_class.find(900_002).accepts_email_marketing).to be(false)enddescribe 'invalid source rows' do