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: removed deprecated `stores=` usage from tests (#14318)

Damian Legawiec50e8edd3645f
diff --git a/packages/sdk/tests/integration/global-setup.ts b/packages/sdk/tests/integration/global-setup.ts
index b3630bd1bc..a7e658a69a 100644
--- a/packages/sdk/tests/integration/global-setup.ts
+++ b/packages/sdk/tests/integration/global-setup.ts
@@ -23,8 +23,8 @@ const CREDENTIALS_RUBY = [
'require "json"',
's = Spree::Store.default',
'k = s.api_keys.active.publishable.first',
- 'pm = Spree::Gateway::Bogus.where(name: "Credit Card (Test)").first_or_create!(stores: [s], active: true, display_on: "both")',
- 'check = Spree::PaymentMethod::Check.where(name: "Check (Test)").first_or_create!(stores: [s], active: true, display_on: "both")',
+ 'pm = Spree::Gateway::Bogus.where(name: "Credit Card (Test)").first_or_create!(store: s, active: true, display_on: "both")',
+ 'check = Spree::PaymentMethod::Check.where(name: "Check (Test)").first_or_create!(store: s, active: true, display_on: "both")',
'u = Spree.user_class.where.not(email: nil).where("email NOT LIKE ?", "%@spree.com").first',
'u.update!(password: "spree123", password_confirmation: "spree123")',
'sec = Spree::Api::Config[:jwt_secret_key].presence || Rails.application.credentials.jwt_secret_key || ENV["JWT_SECRET_KEY"] || Rails.application.secret_key_base',
diff --git a/spree/admin/spec/features/spree/admin/products/products_spec.rb b/spree/admin/spec/features/spree/admin/products/products_spec.rb
index 1fcca983de..f919b88f01 100644
--- a/spree/admin/spec/features/spree/admin/products/products_spec.rb
+++ b/spree/admin/spec/features/spree/admin/products/products_spec.rb
@@ -130,7 +130,7 @@ describe 'Products', type: :feature do
end
context 'updating a product' do
- let(:product) { create(:product, stores: Spree::Store.all) }
+ let(:product) { create(:product) }
let(:prototype) do
size = build_option_type_with_values('size', %w(Small Medium Large))
diff --git a/spree/admin/spec/helpers/spree/admin/navigation_helper_spec.rb b/spree/admin/spec/helpers/spree/admin/navigation_helper_spec.rb
index 5c977ce86b..1b5e47dbc8 100644
--- a/spree/admin/spec/helpers/spree/admin/navigation_helper_spec.rb
+++ b/spree/admin/spec/helpers/spree/admin/navigation_helper_spec.rb
@@ -91,7 +91,7 @@ describe Spree::Admin::NavigationHelper, type: :helper do
describe '#external_page_preview_link' do
let(:current_store) { create(:store) }
- let(:product) { create(:product, stores: [current_store]) }
+ let(:product) { create(:product, store: current_store) }
def spree_storefront_resource_url(*_args); end
def button_link_to(*_args); end
diff --git a/spree/api/spec/controllers/spree/api/v3/admin/categories/products_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/categories/products_controller_spec.rb
index ca6e31173e..ae96b29d42 100644
--- a/spree/api/spec/controllers/spree/api/v3/admin/categories/products_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/admin/categories/products_controller_spec.rb
@@ -59,7 +59,7 @@ RSpec.describe Spree::Api::V3::Admin::Categories::ProductsController, type: :con
end
it '404s for a product outside the store' do
- other = create(:product, stores: [create(:store)])
+ other = create(:product, store: create(:store))
post :create, params: { category_id: category.prefixed_id, product_id: other.prefixed_id }, as: :json
expect(response).to have_http_status(:not_found)
diff --git a/spree/api/spec/controllers/spree/api/v3/admin/coupon_codes_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/coupon_codes_controller_spec.rb
index 6af4f48f12..d89738e793 100644
--- a/spree/api/spec/controllers/spree/api/v3/admin/coupon_codes_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/admin/coupon_codes_controller_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe Spree::Api::V3::Admin::CouponCodesController, type: :controller d
include_context 'API v3 Admin authenticated'
def multi_code_promotion(promo_store)
- create(:promotion, stores: [promo_store], multi_codes: true, number_of_codes: 2, code_prefix: 'SAVE')
+ create(:promotion, store: promo_store, multi_codes: true, number_of_codes: 2, code_prefix: 'SAVE')
end
let!(:promotion) { multi_code_promotion(store) }
diff --git a/spree/api/spec/controllers/spree/api/v3/admin/customers/credit_cards_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/customers/credit_cards_controller_spec.rb
index 3859bbc101..62a1279212 100644
--- a/spree/api/spec/controllers/spree/api/v3/admin/customers/credit_cards_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/admin/customers/credit_cards_controller_spec.rb
@@ -85,7 +85,7 @@ RSpec.describe Spree::Api::V3::Admin::Customers::CreditCardsController, type: :c
describe 'cross-store isolation' do
let(:other_store) { create(:store) }
- let(:other_payment_method) { create(:credit_card_payment_method, stores: [other_store]) }
+ let(:other_payment_method) { create(:credit_card_payment_method, store: other_store) }
let!(:foreign_card) { create(:credit_card, user: customer, payment_method: other_payment_method) }
it 'excludes cards from other stores in the index' do
diff --git a/spree/api/spec/controllers/spree/api/v3/admin/orders/payments_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/orders/payments_controller_spec.rb
index 0ca45bb8dd..14fc26e7a4 100644
--- a/spree/api/spec/controllers/spree/api/v3/admin/orders/payments_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/admin/orders/payments_controller_spec.rb
@@ -64,7 +64,7 @@ RSpec.describe Spree::Api::V3::Admin::Orders::PaymentsController, type: :control
context 'when payment_method belongs to a different store' do
let(:other_store) { create(:store) }
let(:other_store_payment_method) do
- create(:check_payment_method, stores: [other_store])
+ create(:check_payment_method, store: other_store)
end
it 'returns 404 and does not attach the cross-store method' do
diff --git a/spree/api/spec/controllers/spree/api/v3/admin/payment_methods_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/payment_methods_controller_spec.rb
index 94e450de4b..362c9a3a68 100644
--- a/spree/api/spec/controllers/spree/api/v3/admin/payment_methods_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/admin/payment_methods_controller_spec.rb
@@ -20,7 +20,7 @@ RSpec.describe Spree::Api::V3::Admin::PaymentMethodsController, type: :controlle
context 'when payment method belongs to a different store' do
let!(:other_store) { create(:store) }
- let!(:other_payment_method) { create(:check_payment_method, stores: [other_store]) }
+ let!(:other_payment_method) { create(:check_payment_method, store: other_store) }
it 'is not returned' do
get :index, as: :json
@@ -117,7 +117,7 @@ RSpec.describe Spree::Api::V3::Admin::PaymentMethodsController, type: :controlle
expect(json_response['name']).to eq('Check on delivery')
created = Spree::PaymentMethod.find_by_prefix_id(json_response['id'])
- expect(created.stores).to include(store)
+ expect(created.store).to eq(store)
end
it 'rejects an unknown subclass' do
diff --git a/spree/api/spec/controllers/spree/api/v3/admin/promotion_actions_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/promotion_actions_controller_spec.rb
index 085cb35c11..e8d6c997c1 100644
--- a/spree/api/spec/controllers/spree/api/v3/admin/promotion_actions_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/admin/promotion_actions_controller_spec.rb
@@ -22,7 +22,7 @@ RSpec.describe Spree::Api::V3::Admin::PromotionActionsController, type: :control
end
it "404s for a promotion that belongs to another store" do
- foreign_promotion = create(:promotion, stores: [create(:store)])
+ foreign_promotion = create(:promotion, store: create(:store))
post :create, params: {
promotion_id: foreign_promotion.prefixed_id,
@@ -36,7 +36,7 @@ RSpec.describe Spree::Api::V3::Admin::PromotionActionsController, type: :control
describe 'GET #index' do
it "404s when listing actions of another store's promotion" do
- foreign_promotion = create(:promotion, stores: [create(:store)])
+ foreign_promotion = create(:promotion, store: create(:store))
create(:promotion_action_create_adjustment, promotion: foreign_promotion)
get :index, params: { promotion_id: foreign_promotion.prefixed_id }, as: :json
diff --git a/spree/api/spec/controllers/spree/api/v3/admin/promotion_rules_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/promotion_rules_controller_spec.rb
index d698efafe9..698621bb2a 100644
--- a/spree/api/spec/controllers/spree/api/v3/admin/promotion_rules_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/admin/promotion_rules_controller_spec.rb
@@ -51,7 +51,7 @@ RSpec.describe Spree::Api::V3::Admin::PromotionRulesController, type: :controlle
end
it "404s for a promotion that belongs to another store" do
- foreign_promotion = create(:promotion, stores: [create(:store)])
+ foreign_promotion = create(:promotion, store: create(:store))
post :create, params: {
promotion_id: foreign_promotion.prefixed_id,
@@ -65,7 +65,7 @@ RSpec.describe Spree::Api::V3::Admin::PromotionRulesController, type: :controlle
describe 'GET #index' do
it "404s when listing rules of another store's promotion" do
- foreign_promotion = create(:promotion, stores: [create(:store)])
+ foreign_promotion = create(:promotion, store: create(:store))
create(:promotion_rule_user, promotion: foreign_promotion)
get :index, params: { promotion_id: foreign_promotion.prefixed_id }, as: :json
diff --git a/spree/api/spec/controllers/spree/api/v3/webhooks/payments_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/webhooks/payments_controller_spec.rb
index 1acb2ffde1..93d3d38f8f 100644
--- a/spree/api/spec/controllers/spree/api/v3/webhooks/payments_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/webhooks/payments_controller_spec.rb
@@ -55,7 +55,7 @@ RSpec.describe Spree::Api::V3::Webhooks::PaymentsController, type: :controller d
context 'when payment method belongs to a different store' do
let(:other_store) { create(:store) }
- let(:other_payment_method) { create(:bogus_payment_method, stores: [other_store]) }
+ let(:other_payment_method) { create(:bogus_payment_method, store: other_store) }
it 'returns not found' do
post :create, params: { payment_method_id: other_payment_method.prefixed_id }
diff --git a/spree/core/lib/spree/testing_support/factories/order_factory.rb b/spree/core/lib/spree/testing_support/factories/order_factory.rb
index df2556a0f9..3ded3d33d1 100644
--- a/spree/core/lib/spree/testing_support/factories/order_factory.rb
+++ b/spree/core/lib/spree/testing_support/factories/order_factory.rb
@@ -94,7 +94,7 @@ FactoryBot.define do
factory :completed_order_with_store_credit_payment do
after(:create) do |order|
store_credit = create(:store_credit, amount: order.total, store: order.store, user: order.user)
- payment_method = create(:store_credit_payment_method, stores: [order.store])
+ payment_method = create(:store_credit_payment_method, store: order.store)
create(:store_credit_payment, amount: order.total, order: order, source: store_credit, payment_method: payment_method)
end
diff --git a/spree/core/lib/spree/testing_support/factories/payment_factory.rb b/spree/core/lib/spree/testing_support/factories/payment_factory.rb
index c7b91e558f..d376e70ab4 100644
--- a/spree/core/lib/spree/testing_support/factories/payment_factory.rb
+++ b/spree/core/lib/spree/testing_support/factories/payment_factory.rb
@@ -5,7 +5,7 @@ FactoryBot.define do
state { 'checkout' }
response_code { "BGS-#{SecureRandom.hex(6)}" }
- payment_method { create(:credit_card_payment_method, stores: [order.store]) }
+ payment_method { create(:credit_card_payment_method, store: order.store) }
association(:source, factory: :credit_card)
factory :payment_with_refund do
@@ -16,7 +16,7 @@ FactoryBot.define do
end
factory :custom_payment, class: Spree::Payment do
- payment_method { create(:custom_payment_method, stores: [order.store]) }
+ payment_method { create(:custom_payment_method, store: order.store) }
source { create(:payment_source, user: order.user, payment_method: payment_method) }
end
end
@@ -29,7 +29,7 @@ FactoryBot.define do
end
factory :store_credit_payment, class: Spree::Payment, parent: :payment do
- payment_method { create(:store_credit_payment_method, stores: [order.store]) }
+ payment_method { create(:store_credit_payment_method, store: order.store) }
source { create(:store_credit, store: order.store, user: order.user) }
end
end
diff --git a/spree/core/lib/spree/testing_support/factories/payment_session_factory.rb b/spree/core/lib/spree/testing_support/factories/payment_session_factory.rb
index c71a50d61f..2efcae8f74 100644
--- a/spree/core/lib/spree/testing_support/factories/payment_session_factory.rb
+++ b/spree/core/lib/spree/testing_support/factories/payment_session_factory.rb
@@ -1,7 +1,7 @@
FactoryBot.define do
factory :payment_session, class: 'Spree::PaymentSession' do
order
- payment_method { create(:credit_card_payment_method, stores: [order.store]) }
+ payment_method { create(:credit_card_payment_method, store: order.store) }
amount { order.total }
currency { order.currency }
status { 'pending' }
@@ -39,7 +39,7 @@ FactoryBot.define do
factory :bogus_payment_session, class: 'Spree::PaymentSessions::Bogus' do
type { 'Spree::PaymentSessions::Bogus' }
- payment_method { create(:bogus_payment_method, stores: [order.store]) }
+ payment_method { create(:bogus_payment_method, store: order.store) }
external_id { "bogus_#{SecureRandom.hex(12)}" }
external_data { { 'client_secret' => "bogus_secret_#{SecureRandom.hex(8)}" } }
end
diff --git a/spree/core/spec/models/spree/concerns/prefixed_id_spec.rb b/spree/core/spec/models/spree/concerns/prefixed_id_spec.rb
index e2907018b4..079e94ded8 100644
--- a/spree/core/spec/models/spree/concerns/prefixed_id_spec.rb
+++ b/spree/core/spec/models/spree/concerns/prefixed_id_spec.rb
@@ -51,7 +51,7 @@ RSpec.describe Spree::PrefixedId do
context 'with non-FK columns ending in _id' do
it 'preserves string values that look like prefixed IDs' do
- payment_method = create(:bogus_payment_method, stores: [Spree::Store.default])
+ payment_method = create(:bogus_payment_method, store: Spree::Store.default)
session = build(:payment_setup_session, payment_method: payment_method)
session.assign_attributes(external_id: 'seti_123abc')
@@ -70,7 +70,7 @@ RSpec.describe Spree::PrefixedId do
end
it 'passes through values for non-existent associations' do
- payment_method = create(:bogus_payment_method, stores: [Spree::Store.default])
+ payment_method = create(:bogus_payment_method, store: Spree::Store.default)
session = build(:payment_setup_session, payment_method: payment_method)
# external_ids doesn't map to any association — values should pass through unchanged
diff --git a/spree/core/spec/models/spree/order/payment_spec.rb b/spree/core/spec/models/spree/order/payment_spec.rb
index f0c910b7f5..748b236b22 100644
--- a/spree/core/spec/models/spree/order/payment_spec.rb
+++ b/spree/core/spec/models/spree/order/payment_spec.rb
@@ -47,7 +47,7 @@ module Spree
:store_credit_payment,
order: order,
amount: store_credit_amount,
- payment_method: create(:store_credit_payment_method, auto_capture: false, stores: [payment.order.store])
+ payment_method: create(:store_credit_payment_method, auto_capture: false, store: payment.order.store)
)
end
diff --git a/spree/core/spec/models/spree/order_spec.rb b/spree/core/spec/models/spree/order_spec.rb
index 48fd429494..b2945e46a1 100644
--- a/spree/core/spec/models/spree/order_spec.rb
+++ b/spree/core/spec/models/spree/order_spec.rb
@@ -604,7 +604,7 @@ describe Spree::Order, type: :model do
describe '#amount_due' do
let(:store_credit) { create(:store_credit, amount: 200, store: order.store, user: order.user) }
- let(:store_credit_payment_method) { create(:store_credit_payment_method, stores: [order.store]) }
+ let(:store_credit_payment_method) { create(:store_credit_payment_method, store: order.store) }
before { order.update_columns(total: 100, payment_total: 0) }
@@ -2585,7 +2585,7 @@ describe Spree::Order, type: :model do
context 'when order is fully paid by store credit' do
before do
- create(:store_credit_payment_method, stores: [order.store])
+ create(:store_credit_payment_method, store: order.store)
create(:store_credit_payment, amount: order.total, order: order)
end
diff --git a/spree/core/spec/models/spree/payment_spec.rb b/spree/core/spec/models/spree/payment_spec.rb
index 5c86768fc4..46abcd8d92 100644
--- a/spree/core/spec/models/spree/payment_spec.rb
+++ b/spree/core/spec/models/spree/payment_spec.rb
@@ -732,7 +732,7 @@ describe Spree::Payment, type: :model do
context 'with source optional' do
context 'when payment method does not require source' do
- let(:check_payment_method) { create(:check_payment_method, stores: [order.store], auto_capture: false) }
+ let(:check_payment_method) { create(:check_payment_method, store: order.store, auto_capture: false) }
before do
payment.source = nil
@@ -745,7 +745,7 @@ describe Spree::Payment, type: :model do
end
context 'with auto capture' do
- let(:check_payment_method) { create(:check_payment_method, stores: [order.store], auto_capture: true) }
+ let(:check_payment_method) { create(:check_payment_method, store: order.store, auto_capture: true) }
it 'processes successfully and transitions to completed' do
expect { payment.process! }.not_to raise_error
diff --git a/spree/core/spec/models/spree/promotion_handler/cart_spec.rb b/spree/core/spec/models/spree/promotion_handler/cart_spec.rb
index d21a9ac06a..4550566252 100644
--- a/spree/core/spec/models/spree/promotion_handler/cart_spec.rb
+++ b/spree/core/spec/models/spree/promotion_handler/cart_spec.rb
@@ -8,7 +8,7 @@ module Spree
let(:line_item) { create(:line_item) }
let(:order) { line_item.order }
- let(:promotion) { create(:promotion, name: 'At line items', stores: [order.store], kind: :automatic) }
+ let(:promotion) { create(:promotion, name: 'At line items', store: order.store, kind: :automatic) }
let(:calculator) { Calculator::FlatPercentItemTotal.new(preferred_flat_percent: 10) }
context 'activates in LineItem level' do
diff --git a/spree/core/spec/models/spree/promotion_handler/coupon_spec.rb b/spree/core/spec/models/spree/promotion_handler/coupon_spec.rb
index 90e2bb9383..3f50ae748a 100644
--- a/spree/core/spec/models/spree/promotion_handler/coupon_spec.rb
+++ b/spree/core/spec/models/spree/promotion_handler/coupon_spec.rb
@@ -126,7 +126,7 @@ module Spree
before do
allow(order).to receive_messages coupon_code: '10off'
calculator = Calculator::FlatRate.new(preferred_amount: 10)
- general_promo = create(:promotion, name: 'General Promo', stores: [order.store])
+ general_promo = create(:promotion, name: 'General Promo', store: order.store)
Promotion::Actions::CreateItemAdjustments.create(promotion: general_promo, calculator: calculator) # general_action
Spree::Cart::AddItem.call(order: order, variant: create(:variant))
diff --git a/spree/core/spec/models/spree/promotion_handler/free_shipping_spec.rb b/spree/core/spec/models/spree/promotion_handler/free_shipping_spec.rb
index 07ba6b07d9..57de6af8d4 100644
--- a/spree/core/spec/models/spree/promotion_handler/free_shipping_spec.rb
+++ b/spree/core/spec/models/spree/promotion_handler/free_shipping_spec.rb
@@ -11,7 +11,7 @@ module Spree
let(:calculator) { Calculator::FlatPercentItemTotal.new(preferred_flat_percent: 10) }
context 'activates in Shipment level' do
- let(:promotion) { create(:promotion, name: 'Free Shipping', stores: [order.store], kind: :automatic) }
+ let(:promotion) { create(:promotion, name: 'Free Shipping', store: order.store, kind: :automatic) }
let!(:action) { Promotion::Actions::FreeShipping.create(promotion: promotion) }
it 'creates the adjustment' do
@@ -20,7 +20,7 @@ module Spree
end
context 'if promo has a code' do
- let(:promotion) { create(:promotion, name: 'Free Shipping', stores: [order.store], code: 'code') }
+ let(:promotion) { create(:promotion, name: 'Free Shipping', store: order.store, code: 'code') }
let!(:action) { Spree::Promotion::Actions::FreeShipping.create(promotion: promotion) }
it 'does adjust the shipment when applied to order' do
@@ -35,7 +35,7 @@ module Spree
end
context 'if promo has multiple codes' do
- let(:promotion) { create(:promotion, name: 'Free Shipping', stores: [order.store], multi_codes: true, number_of_codes: 1) }
+ let(:promotion) { create(:promotion, name: 'Free Shipping', store: order.store, multi_codes: true, number_of_codes: 1) }
let!(:action) { Spree::Promotion::Actions::FreeShipping.create(promotion: promotion) }
it 'does adjust the shipment when applied to order' do
@@ -50,7 +50,7 @@ module Spree
end
context 'if promo has a path' do
- let(:promotion) { create(:promotion, name: 'Free Shipping', stores: [order.store], kind: :automatic, path: 'path') }
+ let(:promotion) { create(:promotion, name: 'Free Shipping', store: order.store, kind: :automatic, path: 'path') }
let!(:action) { Promotion::Actions::FreeShipping.create(promotion: promotion) }
it 'does not adjust the shipment' do
diff --git a/spree/core/spec/models/spree/promotion_handler/page_spec.rb b/spree/core/spec/models/spree/promotion_handler/page_spec.rb
index 25e8c21a4e..0342277349 100644
--- a/spree/core/spec/models/spree/promotion_handler/page_spec.rb
+++ b/spree/core/spec/models/spree/promotion_handler/page_spec.rb
@@ -5,7 +5,7 @@ module Spree
describe Page, type: :model do
let(:order) { create(:order_with_line_items, line_items_count: 1) }
- let(:promotion) { create(:promotion, name: '10% off', path: '10off', stores: [order.store]) }
+ let(:promotion) { create(:promotion, name: '10% off', path: '10off', store: order.store) }
before do
calculator = Calculator::FlatPercentItemTotal.new(preferred_flat_percent: 10)
diff --git a/spree/core/spec/models/spree/promotion_handler/promotion_duplicator_spec.rb b/spree/core/spec/models/spree/promotion_handler/promotion_duplicator_spec.rb
index cf4a21bf83..8e75e967e4 100644
--- a/spree/core/spec/models/spree/promotion_handler/promotion_duplicator_spec.rb
+++ b/spree/core/spec/models/spree/promotion_handler/promotion_duplicator_spec.rb
@@ -7,7 +7,6 @@ describe Spree::PromotionHandler::PromotionDuplicator do
let!(:calculator) { create(:calculator) }
let(:store) { @default_store }
- let(:store_2) { create(:store) }
let!(:promotion) do
create(:promotion_with_item_total_rule,
description: 'Test description',
@@ -19,7 +18,7 @@ describe Spree::PromotionHandler::PromotionDuplicator do
advertise: true,
path: 'test1',
promotion_category: promo_category,
- stores: [store, store_2])
+ store: store)
end
before do
@@ -73,8 +72,8 @@ describe Spree::PromotionHandler::PromotionDuplicator do
expect(promotion.promotion_actions.size).to eq new_promotion.promotion_actions.size
end
- it 'copies promotion stores' do
- expect(promotion.store_ids).to eq new_promotion.store_ids
+ it 'copies promotion store' do
+ expect(promotion.store_id).to eq new_promotion.store_id
end
it "promotion action's fields (except promotion_id) are the same" do
diff --git a/spree/core/spec/models/spree/store_spec.rb b/spree/core/spec/models/spree/store_spec.rb
index 3776cb864f..022916da63 100644
--- a/spree/core/spec/models/spree/store_spec.rb
+++ b/spree/core/spec/models/spree/store_spec.rb
@@ -34,8 +34,8 @@ describe Spree::Store, type: :model, without_global_store: true do
end
describe '#payment_methods' do
- let!(:payment_method) { create(:payment_method, stores: [subject]) }
- let!(:payment_method_2) { create(:payment_method, stores: [create(:store)]) }
+ let!(:payment_method) { create(:payment_method, store: subject) }
+ let!(:payment_method_2) { create(:payment_method, store: create(:store)) }
it { expect(subject.payment_methods).to eq([payment_method]) }
end
@@ -103,8 +103,8 @@ describe Spree::Store, type: :model, without_global_store: true do
end
describe '#promotions' do
- let!(:promotion) { create(:promotion, stores: [subject, create(:store)]) }
- let!(:promotion_2) { create(:promotion, stores: [create(:store)]) }
+ let!(:promotion) { create(:promotion, store: subject) }
+ let!(:promotion_2) { create(:promotion, store: create(:store)) }
it { expect(subject.promotions).to eq([promotion]) }
end
diff --git a/spree/core/spec/services/spree/gift_cards/apply_spec.rb b/spree/core/spec/services/spree/gift_cards/apply_spec.rb
index acff6f432c..50bb8e183d 100644
--- a/spree/core/spec/services/spree/gift_cards/apply_spec.rb
+++ b/spree/core/spec/services/spree/gift_cards/apply_spec.rb
@@ -175,12 +175,12 @@ RSpec.describe Spree::GiftCards::Apply do
expect(subject).to be_success
payment_method = order.payments.store_credits.last.payment_method
- expect(payment_method.stores).to contain_exactly(other_store)
+ expect(payment_method.store).to eq(other_store)
expect(payment_method.available_for_store?(other_store)).to be true
end
context 'when a StoreCredit payment method already exists for the order store' do
- let!(:existing_payment_method) { create(:store_credit_payment_method, stores: [other_store]) }
+ let!(:existing_payment_method) { create(:store_credit_payment_method, store: other_store) }
it 'reuses the existing payment method without creating a duplicate' do
expect { subject }.not_to change(Spree::PaymentMethod::StoreCredit, :count)