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
Test Suite Cleanup (#13473)
Damian Legawieccbec923c1bca
diff --git a/admin/spec/presenters/spree/admin/order_summary_presenter_spec.rb b/admin/spec/presenters/spree/admin/order_summary_presenter_spec.rbindex b6fd9fa076..ba79f3f66d 100644--- a/admin/spec/presenters/spree/admin/order_summary_presenter_spec.rb+++ b/admin/spec/presenters/spree/admin/order_summary_presenter_spec.rb@@ -117,7 +117,7 @@ RSpec.describe Spree::Admin::OrderSummaryPresenter dolet(:order) { create(:order_with_line_items, store: store) }before do- order.shipments.destroy_all+ order.shipments.delete_allallow(order).to receive(:checkout_steps).and_return([])enddiff --git a/admin/spec/subscribers/spree/admin/import_row_subscriber_spec.rb b/admin/spec/subscribers/spree/admin/import_row_subscriber_spec.rbindex b8d192edbe..a375e778ba 100644--- a/admin/spec/subscribers/spree/admin/import_row_subscriber_spec.rb+++ b/admin/spec/subscribers/spree/admin/import_row_subscriber_spec.rb@@ -24,7 +24,7 @@ RSpec.describe Spree::Admin::ImportRowSubscriber doenddescribe '#update_import_view' do- let(:store) { create(:store) }+ let(:store) { @default_store }let(:user) { create(:admin_user) }let(:import) { create(:import, owner: store, user: user) }let(:import_row) { create(:import_row, import: import) }diff --git a/admin/spec/subscribers/spree/admin/import_subscriber_spec.rb b/admin/spec/subscribers/spree/admin/import_subscriber_spec.rbindex e3ea5c58fd..240b69386f 100644--- a/admin/spec/subscribers/spree/admin/import_subscriber_spec.rb+++ b/admin/spec/subscribers/spree/admin/import_subscriber_spec.rb@@ -16,7 +16,7 @@ RSpec.describe Spree::Admin::ImportSubscriber doenddescribe '#update_loader_in_import_view' do- let(:store) { create(:store) }+ let(:store) { @default_store }let(:user) { create(:admin_user) }let(:import) { create(:import, owner: store, user: user) }diff --git a/api/spec/jobs/spree/webhook_delivery_job_spec.rb b/api/spec/jobs/spree/webhook_delivery_job_spec.rbindex cf96afb2db..dd129c5fd8 100644--- a/api/spec/jobs/spree/webhook_delivery_job_spec.rb+++ b/api/spec/jobs/spree/webhook_delivery_job_spec.rb@@ -4,7 +4,7 @@ require 'spec_helper'module Spreedescribe WebhookDeliveryJob, type: :job do- let(:store) { create(:store) }+ let(:store) { @default_store }let(:webhook_endpoint) { create(:webhook_endpoint, store: store) }let(:delivery) { create(:webhook_delivery, :pending, webhook_endpoint: webhook_endpoint) }let(:secret_key) { webhook_endpoint.secret_key }diff --git a/api/spec/requests/spree/api/v2/storefront/checkout_spec.rb b/api/spec/requests/spree/api/v2/storefront/checkout_spec.rbindex a0eadade16..0c4184b539 100644--- a/api/spec/requests/spree/api/v2/storefront/checkout_spec.rb+++ b/api/spec/requests/spree/api/v2/storefront/checkout_spec.rb@@ -58,7 +58,7 @@ describe 'API V2 Storefront Checkout Spec', type: :request doshared_examples 'perform next' docontext 'without line items' dobefore do- order.line_items.destroy_all+ order.line_items.delete_allexecuteenddiff --git a/api/spec/requests/spree/api/v2/storefront/wishlists_spec.rb b/api/spec/requests/spree/api/v2/storefront/wishlists_spec.rbindex 20efca9b2e..ffe495af81 100644--- a/api/spec/requests/spree/api/v2/storefront/wishlists_spec.rb+++ b/api/spec/requests/spree/api/v2/storefront/wishlists_spec.rb@@ -1,7 +1,7 @@require 'spec_helper'RSpec.describe Spree::Api::V2::Storefront::WishlistsController, type: :request do- let(:store) { create(:store) }+ let(:store) { @default_store }let(:other_store) { create(:store) }let(:wishlist) { create(:wishlist, store: store) }diff --git a/api/spec/serializers/spree/api/v2/platform/address_serializer_spec.rb b/api/spec/serializers/spree/api/v2/platform/address_serializer_spec.rbindex a35e9c2410..7c2015bd73 100644--- a/api/spec/serializers/spree/api/v2/platform/address_serializer_spec.rb+++ b/api/spec/serializers/spree/api/v2/platform/address_serializer_spec.rb@@ -3,7 +3,8 @@ require 'spec_helper'describe Spree::Api::V2::Platform::AddressSerializer dosubject { described_class.new(address).serializable_hash }- let(:address) { create(:address, user: create(:user)) }+ let(:user) { create(:user) }+ let(:address) { create(:address, user: user) }it doexpect(subject).to eq(@@ -35,19 +36,19 @@ describe Spree::Api::V2::Platform::AddressSerializer dorelationships: {country: {data: {- id: address.country.id.to_s,+ id: address.country_id.to_s,type: :country}},state: {data: {- id: address.state.id.to_s,+ id: address.state_id.to_s,type: :state}},user: {data: {- id: address.user.id.to_s,+ id: user.id.to_s,type: :user}},diff --git a/api/spec/serializers/spree/v2/storefront/cart_serializer_spec.rb b/api/spec/serializers/spree/v2/storefront/cart_serializer_spec.rbindex 0a1983ba2e..b342e063ce 100644--- a/api/spec/serializers/spree/v2/storefront/cart_serializer_spec.rb+++ b/api/spec/serializers/spree/v2/storefront/cart_serializer_spec.rb@@ -5,7 +5,7 @@ RSpec.describe Spree::V2::Storefront::CartSerializer doinclude_context 'API v2 serializers params'- let!(:order) { create(:order) }+ let!(:order) { build(:order) }describe '#promo_total_cents' docontext 'without any promo applied' do@@ -16,7 +16,7 @@ RSpec.describe Spree::V2::Storefront::CartSerializer docontext 'with a promo applied' dobefore do- order.update_column(:promo_total, 10)+ order.promo_total = 10endit 'returns the promo total in cents' dodiff --git a/api/spec/serializers/spree/v2/storefront/line_item_serializer_spec.rb b/api/spec/serializers/spree/v2/storefront/line_item_serializer_spec.rbindex d7b6667ebc..75d7c35977 100644--- a/api/spec/serializers/spree/v2/storefront/line_item_serializer_spec.rb+++ b/api/spec/serializers/spree/v2/storefront/line_item_serializer_spec.rb@@ -5,7 +5,7 @@ RSpec.describe Spree::V2::Storefront::LineItemSerializer doinclude_context 'API v2 serializers params'- let!(:line_item) { create(:line_item) }+ let!(:line_item) { build(:line_item) }it { expect(subject).to be_kind_of(Hash) }diff --git a/api/spec/serializers/spree/v2/storefront/taxon_serializer_spec.rb b/api/spec/serializers/spree/v2/storefront/taxon_serializer_spec.rbindex 8183daaa6c..806e4a33c9 100644--- a/api/spec/serializers/spree/v2/storefront/taxon_serializer_spec.rb+++ b/api/spec/serializers/spree/v2/storefront/taxon_serializer_spec.rb@@ -6,7 +6,7 @@ describe Spree::V2::Storefront::TaxonSerializer doinclude_context 'API v2 serializers params'let(:taxonomy) { create(:taxonomy, store: store) }- let(:taxon) { create(:taxon, :with_description, taxonomy: taxonomy, products: create_list(:product, 2, stores: [store])) }+ let(:taxon) { create(:taxon, :with_description, taxonomy: taxonomy, products: build_list(:product, 2, stores: [store])) }let!(:children) { create_list(:taxon, 2, taxonomy: taxonomy, parent: taxon) }let(:url_helpers) { Rails.application.routes.url_helpers }@@ -49,13 +49,13 @@ describe Spree::V2::Storefront::TaxonSerializer dorelationships: {parent: {data: {- id: taxon.parent.id.to_s,+ id: taxon.parent_id.to_s,type: :taxon}},taxonomy: {data: {- id: taxon.taxonomy.id.to_s,+ id: taxonomy.id.to_s,type: :taxonomy}},@@ -125,13 +125,13 @@ describe Spree::V2::Storefront::TaxonSerializer dorelationships: {parent: {data: {- id: taxon.parent.id.to_s,+ id: taxon.parent_id.to_s,type: :taxon}},taxonomy: {data: {- id: taxon.taxonomy.id.to_s,+ id: taxonomy.id.to_s,type: :taxonomy}},diff --git a/api/spec/serializers/spree/v2/storefront/wished_item_serializer_spec.rb b/api/spec/serializers/spree/v2/storefront/wished_item_serializer_spec.rbindex 69998a7d13..04e3ad5032 100644--- a/api/spec/serializers/spree/v2/storefront/wished_item_serializer_spec.rb+++ b/api/spec/serializers/spree/v2/storefront/wished_item_serializer_spec.rb@@ -22,7 +22,7 @@ describe Spree::V2::Storefront::WishedItemSerializer dorelationships: {variant: {data: {- id: wished_item.variant.id.to_s,+ id: wished_item.variant_id.to_s,type: :variant}}diff --git a/api/spec/services/spree/webhooks/deliver_webhook_spec.rb b/api/spec/services/spree/webhooks/deliver_webhook_spec.rbindex 55c307b73a..ba3cac8c79 100644--- a/api/spec/services/spree/webhooks/deliver_webhook_spec.rb+++ b/api/spec/services/spree/webhooks/deliver_webhook_spec.rb@@ -5,7 +5,7 @@ require 'spec_helper'module Spreemodule Webhooksdescribe DeliverWebhook do- let(:store) { create(:store) }+ let(:store) { @default_store }let(:webhook_endpoint) { create(:webhook_endpoint, store: store) }let(:delivery) { create(:webhook_delivery, :pending, webhook_endpoint: webhook_endpoint) }let(:secret_key) { webhook_endpoint.secret_key }diff --git a/api/spec/subscribers/spree/webhook_event_subscriber_spec.rb b/api/spec/subscribers/spree/webhook_event_subscriber_spec.rbindex 8e7e900009..1b3283eb7d 100644--- a/api/spec/subscribers/spree/webhook_event_subscriber_spec.rb+++ b/api/spec/subscribers/spree/webhook_event_subscriber_spec.rb@@ -4,7 +4,7 @@ require 'spec_helper'module Spreedescribe WebhookEventSubscriber do- let(:store) { create(:store) }+ let(:store) { @default_store }let!(:webhook_endpoint) { create(:webhook_endpoint, store: store, subscriptions: ['order.created']) }let(:event_name) { 'order.created' }let(:event_payload) { { id: 1, number: 'R123456' } }diff --git a/core/app/helpers/spree/addresses_helper.rb b/core/app/helpers/spree/addresses_helper.rbindex 536b950f24..f734ee5e0d 100644--- a/core/app/helpers/spree/addresses_helper.rb+++ b/core/app/helpers/spree/addresses_helper.rb@@ -74,28 +74,6 @@ module Spreeendend- def current_store_countries_with_states_ids- Spree::Deprecation.warn('current_store_countries_with_states_ids is deprecated and will be removed in Spree 5.3')-- @current_store_countries_with_states_ids ||= current_store.countries_available_for_checkout.find_all { |country| country.states_required? }.each_with_object([]) do |country, memo|- memo << current_store.states_available_for_checkout(country)- end.flatten.pluck(:country_id)- end-- def current_store_countries_without_states_ids- Spree::Deprecation.warn('current_store_countries_without_states_ids is deprecated and will be removed in Spree 5.3')-- @current_store_countries_without_states_ids ||= current_store.countries_available_for_checkout.find_all { |country| !country.states_required? }.pluck(:id)- end-- def current_store_supported_countries_ids- Spree::Deprecation.warn('current_store_supported_countries_ids is deprecated and will be removed in Spree 5.3')-- @current_store_supported_countries_ids ||= Rails.cache.fetch(['current_store_supported_countries_ids', current_store]) do- (current_store_countries_with_states_ids + current_store_countries_without_states_ids).uniq- end- end-def user_available_addressesreturn [] unless try_spree_current_userdiff --git a/core/app/models/spree/order.rb b/core/app/models/spree/order.rbindex b134cf2002..c44d860d11 100644--- a/core/app/models/spree/order.rb+++ b/core/app/models/spree/order.rb@@ -546,9 +546,6 @@ module Spreedef available_payment_methods(store = nil)Spree::Deprecation.warn('`Order#available_payment_methods` is deprecated and will be removed in Spree 5.5. Use `collect_frontend_payment_methods` instead.')- if store.present?- Spree::Deprecation.warn('The `store` parameter is deprecated and will be removed in Spree 5. Order is already associated with Store')- end@available_payment_methods ||= collect_payment_methods(store)enddiff --git a/core/app/models/spree/store.rb b/core/app/models/spree/store.rbindex 0042c84cf0..ede067e8ca 100644--- a/core/app/models/spree/store.rb+++ b/core/app/models/spree/store.rb@@ -331,12 +331,6 @@ module Spreeendend- def checkout_zone_or_default- Spree::Deprecation.warn('Store#checkout_zone_or_default is deprecated and will be removed in Spree 5')-- @checkout_zone_or_default ||= checkout_zone || Spree::Zone.default_checkout_zone- end-def supported_shipping_zones@supported_shipping_zones ||= if checkout_zone.present?[checkout_zone]diff --git a/core/app/models/spree/zone.rb b/core/app/models/spree/zone.rbindex b55f7c93c7..092ce1c264 100644--- a/core/app/models/spree/zone.rb+++ b/core/app/models/spree/zone.rb@@ -71,12 +71,6 @@ module Spreematches.firstend- def self.default_checkout_zone- Spree::Deprecation.warn('Spree::Zone.default_checkout_zone is deprecated and will be removed in Spree 5')-- first- end-def kindif self[:kind].present?self[:kind]diff --git a/core/lib/spree/core/controller_helpers/auth.rb b/core/lib/spree/core/controller_helpers/auth.rbindex e151b4877d..21bdd3714d 100644--- a/core/lib/spree/core/controller_helpers/auth.rb+++ b/core/lib/spree/core/controller_helpers/auth.rb@@ -20,21 +20,6 @@ module Spree@current_ability ||= Spree.ability_class.new(try_spree_current_user, { store: current_store })end- def redirect_back_or_default(default)- Spree::Deprecation.warn('redirect_back_or_default is deprecated and will be removed in Spree 5.2. Please use redirect_back(fallback_location: default) instead.')- redirect_back(fallback_location: default)- end-- def set_token- Spree::Deprecation.warn('set_token is deprecated and will be removed in Spree 5.2. Please use create_token_cookie(token) instead.')- cookies.permanent.signed[:token] ||= cookies.signed[:guest_token]- cookies.permanent.signed[:token] ||= {- value: generate_token,- httponly: true- }- cookies.permanent.signed[:guest_token] ||= cookies.permanent.signed[:token]- end-def current_oauth_tokenget_last_access_token = ->(user) { Spree::OauthAccessToken.active_for(user).where(expires_in: nil).last }create_access_token = ->(user) { Spree::OauthAccessToken.create!(resource_owner: user) }diff --git a/core/spec/jobs/spree/products/refresh_metrics_job_spec.rb b/core/spec/jobs/spree/products/refresh_metrics_job_spec.rbindex 5ff64b852d..6617edd179 100644--- a/core/spec/jobs/spree/products/refresh_metrics_job_spec.rb+++ b/core/spec/jobs/spree/products/refresh_metrics_job_spec.rb@@ -2,7 +2,7 @@ require 'spec_helper'RSpec.describe Spree::Products::RefreshMetricsJob, type: :job dodescribe '#perform' do- let(:store) { create(:store) }+ let(:store) { @default_store }let(:product) { create(:product, stores: [store]) }let(:store_product) { product.store_products.find_by(store: store) }diff --git a/core/spec/lib/spree/core/controller_helpers/auth_spec.rb b/core/spec/lib/spree/core/controller_helpers/auth_spec.rbindex 8a49af583a..15f14c7914 100644--- a/core/spec/lib/spree/core/controller_helpers/auth_spec.rb+++ b/core/spec/lib/spree/core/controller_helpers/auth_spec.rb@@ -25,29 +25,6 @@ describe Spree::Core::ControllerHelpers::Auth, type: :controller doendend- describe '#set_token' do- controller(FakesController) do- def index- set_token- render plain: 'index'- end- end-- it 'sends cookie header' do- get :index- expect(response.cookies['token']).not_to be_nil- end- it 'sets httponly flag' do- get :index- if Rails::VERSION::STRING >= '7.1.0'- token_header = response.headers['Set-Cookie'].find { |e| e.starts_with?('token=') }- expect(token_header).to include('httponly')- else- expect(response['Set-Cookie']).to include('HttpOnly')- end- end- end-describe '#store_location' doit 'sets session return url' doallow(controller).to receive_messages(request: double(fullpath: '/redirect'))diff --git a/core/spec/lib/spree/core/controller_helpers/search_spec.rb b/core/spec/lib/spree/core/controller_helpers/search_spec.rbindex 7888cc015b..6f33338309 100644--- a/core/spec/lib/spree/core/controller_helpers/search_spec.rb+++ b/core/spec/lib/spree/core/controller_helpers/search_spec.rb@@ -11,7 +11,7 @@ describe Spree::Core::ControllerHelpers::Search, type: :controller dodescribe '#build_searcher' doit 'returns Spree::Core::Search::Base instance' do- allow(controller).to receive_messages(try_spree_current_user: create(:user),+ allow(controller).to receive_messages(try_spree_current_user: build(:user),current_currency: 'USD', current_store: store)expect(controller.build_searcher({}).class).to eq Spree::Core::Search::Baseenddiff --git a/core/spec/lib/spree/core/pricing/context_spec.rb b/core/spec/lib/spree/core/pricing/context_spec.rbindex eaf3161dd4..265f8175f1 100644--- a/core/spec/lib/spree/core/pricing/context_spec.rb+++ b/core/spec/lib/spree/core/pricing/context_spec.rb@@ -5,7 +5,7 @@ module SpreeRSpec.describe Context dolet(:variant) { create(:variant) }let(:currency) { 'USD' }- let(:store) { create(:store) }+ let(:store) { @default_store }let(:zone) { create(:zone) }let(:user) { create(:user) }let(:quantity) { 5 }diff --git a/core/spec/lib/spree/pricing/resolver_spec.rb b/core/spec/lib/spree/pricing/resolver_spec.rbindex dd9d079327..0d845bb536 100644--- a/core/spec/lib/spree/pricing/resolver_spec.rb+++ b/core/spec/lib/spree/pricing/resolver_spec.rb@@ -128,7 +128,7 @@ describe Spree::Pricing::Resolver docontext 'when no base price exists' dobefore do- variant.prices.destroy_all+ variant.prices.delete_allendit 'returns a new unpersisted price object' dodiff --git a/core/spec/models/spree/calculator_spec.rb b/core/spec/models/spree/calculator_spec.rbindex ac6d8d149b..d5c18d1364 100644--- a/core/spec/models/spree/calculator_spec.rb+++ b/core/spec/models/spree/calculator_spec.rb@@ -1,9 +1,9 @@require 'spec_helper'describe Spree::Calculator, type: :model do- let(:order) { create(:order) }- let!(:line_item) { create(:line_item, order: order) }- let(:shipment) { create(:shipment, order: order, stock_location: create(:stock_location_with_items)) }+ let(:order) { build(:order) }+ let(:line_item) { build(:line_item, order: order) }+ let(:shipment) { build(:shipment, order: order) }context 'with computable' docontext 'and compute methods stubbed out' dodiff --git a/core/spec/models/spree/concerns/user_methods_spec.rb b/core/spec/models/spree/concerns/user_methods_spec.rbindex 4964ab6d4d..a2ff2197cf 100644--- a/core/spec/models/spree/concerns/user_methods_spec.rb+++ b/core/spec/models/spree/concerns/user_methods_spec.rb@@ -166,7 +166,7 @@ describe Spree::UserMethods doendit 'returns false if user is the last with a role on the store' do- current_store.role_users.destroy_all+ current_store.role_users.delete_alltest_user.add_role(role.name, current_store)expect(subject).to be(false)diff --git a/core/spec/models/spree/customer_group_spec.rb b/core/spec/models/spree/customer_group_spec.rbindex bfe38d29ff..1d6ce092da 100644--- a/core/spec/models/spree/customer_group_spec.rb+++ b/core/spec/models/spree/customer_group_spec.rb@@ -1,7 +1,7 @@require 'spec_helper'RSpec.describe Spree::CustomerGroup, type: :model do- let(:store) { create(:store) }+ let(:store) { @default_store }let(:customer_group) { create(:customer_group, store: store) }describe 'associations' dodiff --git a/core/spec/models/spree/event_spec.rb b/core/spec/models/spree/event_spec.rbindex 7549eeb612..e848173d0c 100644--- a/core/spec/models/spree/event_spec.rb+++ b/core/spec/models/spree/event_spec.rb@@ -3,7 +3,7 @@require 'spec_helper'RSpec.describe Spree::Event do- let(:store) { create(:store) }+ let(:store) { @default_store }before doallow(Spree::Current).to receive(:store).and_return(store)diff --git a/core/spec/models/spree/exchange_spec.rb b/core/spec/models/spree/exchange_spec.rbindex 96ce30c879..3932621089 100644--- a/core/spec/models/spree/exchange_spec.rb+++ b/core/spec/models/spree/exchange_spec.rb@@ -50,7 +50,7 @@ module Spreecontext 'when it cannot create shipments for all items' dobefore do- StockItem.where(variant_id: return_item.exchange_variant_id).destroy_all+ StockItem.where(variant_id: return_item.exchange_variant_id).delete_allendit 'raises an UnableToCreateShipments error' dodiff --git a/core/spec/models/spree/exports/customers_spec.rb b/core/spec/models/spree/exports/customers_spec.rbindex 29909ea9fc..5d1e05894f 100644--- a/core/spec/models/spree/exports/customers_spec.rb+++ b/core/spec/models/spree/exports/customers_spec.rb@@ -1,7 +1,7 @@require 'spec_helper'RSpec.describe Spree::Exports::Customers, type: :model do- let(:store) { create(:store) }+ let(:store) { @default_store }let(:export) { described_class.new(store: store) }describe '#csv_headers' dodiff --git a/core/spec/models/spree/exports/newsletter_subscribers_spec.rb b/core/spec/models/spree/exports/newsletter_subscribers_spec.rbindex d9f697f8fb..ac6cd3004f 100644--- a/core/spec/models/spree/exports/newsletter_subscribers_spec.rb+++ b/core/spec/models/spree/exports/newsletter_subscribers_spec.rb@@ -1,7 +1,7 @@require 'spec_helper'RSpec.describe Spree::Exports::NewsletterSubscribers, type: :model do- let(:store) { create(:store) }+ let(:store) { @default_store }let(:export) { described_class.new(store: store) }describe '#csv_headers' dodiff --git a/core/spec/models/spree/exports/orders_spec.rb b/core/spec/models/spree/exports/orders_spec.rbindex ff2a3e1905..c98dd4b620 100644--- a/core/spec/models/spree/exports/orders_spec.rb+++ b/core/spec/models/spree/exports/orders_spec.rb@@ -1,7 +1,7 @@require 'spec_helper'RSpec.describe Spree::Exports::Orders, type: :model do- let(:store) { create(:store) }+ let(:store) { @default_store }let(:export) { described_class.new(store: store) }describe '#csv_headers' dodiff --git a/core/spec/models/spree/exports/products_spec.rb b/core/spec/models/spree/exports/products_spec.rbindex 0c39e3359d..224c24fd89 100644--- a/core/spec/models/spree/exports/products_spec.rb+++ b/core/spec/models/spree/exports/products_spec.rb@@ -1,7 +1,7 @@require 'spec_helper'RSpec.describe Spree::Exports::Products, type: :model do- let(:store) { create(:store) }+ let(:store) { @default_store }let(:export) { described_class.new(store: store) }describe '#scope' dodiff --git a/core/spec/models/spree/import_spec.rb b/core/spec/models/spree/import_spec.rbindex 26582acb8b..ac3cd410a7 100644--- a/core/spec/models/spree/import_spec.rb+++ b/core/spec/models/spree/import_spec.rb@@ -274,7 +274,7 @@ RSpec.describe Spree::Import, :job, type: :model dobefore doimport.type = 'Spree::Imports::Products'# Ensure no metafield definitions exist- Spree::MetafieldDefinition.where(resource_type: 'Spree::Product').destroy_all+ Spree::MetafieldDefinition.where(resource_type: 'Spree::Product').delete_allendit 'returns only base fields' dodiff --git a/core/spec/models/spree/order_inventory_spec.rb b/core/spec/models/spree/order_inventory_spec.rbindex c177a54b5d..b15a0c5314 100644--- a/core/spec/models/spree/order_inventory_spec.rb+++ b/core/spec/models/spree/order_inventory_spec.rb@@ -28,7 +28,7 @@ describe Spree::OrderInventory, type: :model doendcontext 'inventory units state' do- before { shipment.inventory_units.destroy_all }+ before { shipment.inventory_units.delete_all }it 'sets inventory_units state as per stock location availability' doexpect(shipment.stock_location).to receive(:fill_status).with(subject.variant, 5).and_return([3, 2])@@ -47,7 +47,7 @@ describe Spree::OrderInventory, type: :model dobefore { Spree::Config.track_inventory_levels = false }it 'creates only on hand inventory units' do- variant.stock_items.destroy_all+ variant.stock_items.delete_allexpect_any_instance_of(Spree::StockLocation).not_to receive(:unstock)@@ -66,7 +66,7 @@ describe Spree::OrderInventory, type: :model dobefore { variant.update(track_inventory: false) }it 'creates only on hand inventory units' do- variant.stock_items.destroy_all+ variant.stock_items.delete_allexpect_any_instance_of(Spree::StockLocation).not_to receive(:unstock)@@ -114,7 +114,7 @@ describe Spree::OrderInventory, type: :model docontext 'when no shipments already contain this varint' dobefore dosubject.line_item.reload- subject.inventory_units.destroy_all+ subject.inventory_units.delete_allendit 'selects first non-shipped shipment that leaves from same stock_location' dodiff --git a/core/spec/models/spree/order_spec.rb b/core/spec/models/spree/order_spec.rbindex 4c39d57f69..d21930a6cb 100644--- a/core/spec/models/spree/order_spec.rb+++ b/core/spec/models/spree/order_spec.rb@@ -13,7 +13,7 @@ describe Spree::Order, type: :model dolet!(:store) { @default_store }let(:order) { create(:order, user: user, store: store) }- before { allow(Spree::LegacyUser).to receive_messages(current: create(:user)) }+ before { allow(Spree::LegacyUser).to receive_messages(current: build(:user)) }it_behaves_like 'metadata'@@ -2381,7 +2381,7 @@ describe Spree::Order, type: :model docontext 'when order has shipments with no shipping rates' dobefore do- shipment.shipping_rates.destroy_all+ shipment.shipping_rates.delete_allendit 'returns the line items without shipping rates' do@@ -2407,7 +2407,7 @@ describe Spree::Order, type: :model docontext 'when order has no shipments' dobefore do- order.shipments.destroy_all+ order.shipments.delete_allendit 'returns false and adds an error to the order' do@@ -2418,7 +2418,7 @@ describe Spree::Order, type: :model docontext 'when order has shipments with no shipping rates' dobefore do- shipment.shipping_rates.destroy_all+ shipment.shipping_rates.delete_allendit 'returns false and adds an error to the order' dodiff --git a/core/spec/models/spree/permission_sets/ability_integration_spec.rb b/core/spec/models/spree/permission_sets/ability_integration_spec.rbindex 6484a460d9..8526fa7668 100644--- a/core/spec/models/spree/permission_sets/ability_integration_spec.rb+++ b/core/spec/models/spree/permission_sets/ability_integration_spec.rb@@ -2,7 +2,7 @@ require 'spec_helper'require 'cancan/matchers'RSpec.describe 'Permission Sets Integration with Ability', type: :model do- let(:store) { create(:store) }+ let(:store) { @default_store }before do# Reset permissions before each testdiff --git a/core/spec/models/spree/permission_sets/base_spec.rb b/core/spec/models/spree/permission_sets/base_spec.rbindex b25c9f9050..c258e5d0dc 100644--- a/core/spec/models/spree/permission_sets/base_spec.rb+++ b/core/spec/models/spree/permission_sets/base_spec.rb@@ -3,7 +3,7 @@ require 'cancan/matchers'RSpec.describe Spree::PermissionSets::Base dolet(:user) { build(:user) }- let(:store) { create(:store) }+ let(:store) { @default_store }let(:ability) { Spree::Ability.new(user, store: store) }describe '#initialize' dodiff --git a/core/spec/models/spree/price_list_spec.rb b/core/spec/models/spree/price_list_spec.rbindex 238912f224..b3bdc2468c 100644--- a/core/spec/models/spree/price_list_spec.rb+++ b/core/spec/models/spree/price_list_spec.rb@@ -42,7 +42,7 @@ describe Spree::PriceList, type: :model doenddescribe 'scopes' do- let(:store) { create(:store) }+ let(:store) { @default_store }let!(:active_price_list) { create(:price_list, :active, store: store) }let!(:inactive_price_list) { create(:price_list, :inactive, store: store) }let!(:scheduled_price_list) { create(:price_list, :scheduled, store: store) }@@ -107,7 +107,7 @@ describe Spree::PriceList, type: :model doenddescribe '#applicable?' do- let(:store) { create(:store) }+ let(:store) { @default_store }let(:price_list) { create(:price_list, :active, store: store) }let(:variant) { create(:variant) }let(:context) { Spree::Pricing::Context.new(variant: variant, currency: 'USD', store: store) }diff --git a/core/spec/models/spree/price_rules/customer_group_rule_spec.rb b/core/spec/models/spree/price_rules/customer_group_rule_spec.rbindex 3a7ef14ca0..2384c14c50 100644--- a/core/spec/models/spree/price_rules/customer_group_rule_spec.rb+++ b/core/spec/models/spree/price_rules/customer_group_rule_spec.rb@@ -1,7 +1,7 @@require 'spec_helper'describe Spree::PriceRules::CustomerGroupRule, type: :model do- let(:store) { create(:store) }+ let(:store) { @default_store }let(:price_list) { create(:price_list, store: store) }let(:rule) { create(:customer_group_price_rule, price_list: price_list) }let(:customer_group) { create(:customer_group, store: store) }diff --git a/core/spec/models/spree/product_spec.rb b/core/spec/models/spree/product_spec.rbindex 1805324ac2..1acaa3b1a4 100644--- a/core/spec/models/spree/product_spec.rb+++ b/core/spec/models/spree/product_spec.rb@@ -113,7 +113,7 @@ describe Spree::Product, type: :model dodescribe '#duplicate' dobefore do- allow(product).to receive_messages taxons: [create(:taxon)], stores: [store]+ allow(product).to receive_messages taxons: [build(:taxon)], stores: [store]endit 'duplicates product' do@@ -276,7 +276,7 @@ describe Spree::Product, type: :model dolet!(:high) { create(:variant, product: product) }let!(:low) { create(:variant, product: product) }- before { high.option_values.destroy_all }+ before { high.option_values.delete_all }it 'returns only variants with option values' doexpect(product.variants_and_option_values).to eq([low])diff --git a/core/spec/models/spree/promotion/rules/customer_group_spec.rb b/core/spec/models/spree/promotion/rules/customer_group_spec.rbindex 58bc01e917..d2e1441674 100644--- a/core/spec/models/spree/promotion/rules/customer_group_spec.rb+++ b/core/spec/models/spree/promotion/rules/customer_group_spec.rb@@ -1,7 +1,7 @@require 'spec_helper'describe Spree::Promotion::Rules::CustomerGroup, type: :model do- let(:store) { create(:store) }+ let(:store) { @default_store }let(:rule) { Spree::Promotion::Rules::CustomerGroup.new }let(:customer_group) { create(:customer_group, store: store) }let(:other_customer_group) { create(:customer_group, store: store) }diff --git a/core/spec/models/spree/return_item_spec.rb b/core/spec/models/spree/return_item_spec.rbindex 3fe4be4e38..581aaf10a7 100644--- a/core/spec/models/spree/return_item_spec.rb+++ b/core/spec/models/spree/return_item_spec.rb@@ -420,7 +420,7 @@ describe Spree::ReturnItem, type: :model dodescribe '#exchange_requested?' docontext 'exchange variant exists' do- before { allow(subject).to receive(:exchange_variant) { create(:variant) } }+ before { allow(subject).to receive(:exchange_variant) { build(:variant) } }it { expect(subject.exchange_requested?).to eq true }end@@ -434,7 +434,7 @@ describe Spree::ReturnItem, type: :model dodescribe '#exchange_processed?' docontext 'exchange inventory unit exists' do- before { allow(subject).to receive(:exchange_inventory_units) { create_list(:inventory_unit, 1) } }+ before { allow(subject).to receive(:exchange_inventory_units) { build_list(:inventory_unit, 1) } }it { expect(subject.exchange_processed?).to eq true }end@@ -517,11 +517,11 @@ describe Spree::ReturnItem, type: :model dolet(:return_item) { build(:return_item) }context 'the return item is intended to be exchanged' do- before { allow(return_item).to receive(:exchange_variant).and_return(create(:variant)) }+ before { allow(return_item).to receive(:exchange_variant).and_return(build(:variant)) }context 'an exchange inventory unit already exists' dobefore do- allow(return_item).to receive(:exchange_inventory_units).and_return(create_list(:inventory_unit, 1))+ allow(return_item).to receive(:exchange_inventory_units).and_return(build_list(:inventory_unit, 1))endit { expect(subject).to be_nil }diff --git a/core/spec/models/spree/shipment_spec.rb b/core/spec/models/spree/shipment_spec.rbindex 76178de5b9..0c4d377c89 100644--- a/core/spec/models/spree/shipment_spec.rb+++ b/core/spec/models/spree/shipment_spec.rb@@ -238,12 +238,12 @@ describe Spree::Shipment, type: :model do# First shipment for line_item1shipment1 = create(:shipment, order: order)- shipment1.inventory_units.destroy_all+ shipment1.inventory_units.delete_allshipment1.set_up_inventory('on_hand', variant1, order, line_item1, 2)# Second shipment for line_item2shipment2 = create(:shipment, order: order)- shipment2.inventory_units.destroy_all+ shipment2.inventory_units.delete_allshipment2.set_up_inventory('on_hand', variant2, order, line_item2, 4)expect(shipment1.item_quantity).to eq(2)diff --git a/core/spec/models/spree/stock/quantifier_spec.rb b/core/spec/models/spree/stock/quantifier_spec.rbindex 61eada4dbe..e84e3fe078 100644--- a/core/spec/models/spree/stock/quantifier_spec.rb+++ b/core/spec/models/spree/stock/quantifier_spec.rb@@ -13,7 +13,7 @@ module Spreedescribe Quantifier, type: :model dosubject { described_class.new(stock_item.variant) }- before(:all) { Spree::StockLocation.destroy_all } # FIXME: leaky database+ before(:all) { Spree::StockLocation.delete_all } # FIXME: leaky databaselet!(:stock_location) { create :stock_location_with_items }let!(:stock_item) { stock_location.stock_items.order(:id).first }diff --git a/core/spec/models/spree/stock_location_spec.rb b/core/spec/models/spree/stock_location_spec.rbindex d3fc39590b..55b8715dd7 100644--- a/core/spec/models/spree/stock_location_spec.rb+++ b/core/spec/models/spree/stock_location_spec.rb@@ -10,7 +10,10 @@ module Spreecontext 'handling the stock items creation after create' dolet!(:variant) { create(:variant) }- before { described_class.destroy_all }+ before do+ Spree::StockItem.delete_all+ described_class.delete_all+ endit 'creates stock_items for all variants' doexpect do@@ -122,7 +125,7 @@ module Spreecontext 'without stock item' dolet!(:variant) { create(:variant) }- before { variant.stock_items.destroy_all }+ before { variant.stock_items.delete_all }context 'variant instance passed' doit 'creates a stock_item if not found for a variant' do@@ -268,7 +271,7 @@ module Spreeit 'zero on_hand and one backordered' dosubject- variant.stock_items.destroy_all+ variant.stock_items.delete_allon_hand, backordered = subject.fill_status(variant, 1)expect(on_hand).to eq 0expect(backordered).to eq 1diff --git a/core/spec/models/spree/store_product_spec.rb b/core/spec/models/spree/store_product_spec.rbindex 8ed1f55c26..81ffafe12a 100644--- a/core/spec/models/spree/store_product_spec.rb+++ b/core/spec/models/spree/store_product_spec.rb@@ -1,21 +1,8 @@require 'spec_helper'RSpec.describe Spree::StoreProduct, type: :model do- describe 'associations' do- it { is_expected.to belong_to(:store).class_name('Spree::Store').without_validating_presence }- it { is_expected.to belong_to(:product).class_name('Spree::Product').without_validating_presence }- end-- describe 'validations' do- subject { build(:store_product) }-- it { is_expected.to validate_presence_of(:store) }- it { is_expected.to validate_presence_of(:product) }- it { is_expected.to validate_uniqueness_of(:store_id).scoped_to(:product_id) }- end-describe '#refresh_metrics!' do- let(:store) { create(:store) }+ let(:store) { @default_store }let(:product) { create(:product, stores: [store]) }let(:store_product) { product.store_products.find_by(store: store) }diff --git a/core/spec/models/spree/store_spec.rb b/core/spec/models/spree/store_spec.rbindex 1455aa3f3e..725bf37619 100644--- a/core/spec/models/spree/store_spec.rb+++ b/core/spec/models/spree/store_spec.rb@@ -500,24 +500,6 @@ describe Spree::Store, type: :model, without_global_store: true dobefore { subject.update(checkout_zone: nil) }end- shared_context 'with default checkout zone set' do- let!(:country3) { create(:country) }-- let!(:state3) { create(:state, country: country3) }-- let(:default_zone) do- Spree::Zone.first || create(:zone, kind: 'country').tap do |zone|- zone.members.create(zoneable: country3)- end- end-- before { allow(Spree::Zone).to receive(:default_checkout_zone) { default_zone } }- end-- shared_context 'with default checkout zone not set' do- before { allow(Spree::Zone).to receive(:default_checkout_zone) { nil } }- end-describe '#countries_available_for_checkout' dosubject { create(:store) }@@ -555,16 +537,6 @@ describe Spree::Store, type: :model, without_global_store: true doinclude_context 'with checkout zone not set'context do- include_context 'with default checkout zone set'-- it 'returns states list for default checkout zone' do- expect(subject.states_available_for_checkout(country3)).to eq [state3]- end- end-- context do- include_context 'with default checkout zone not set'-let(:country_with_states) docreate(:country).tap do |country|country.states << create(:state)@@ -581,38 +553,6 @@ describe Spree::Store, type: :model, without_global_store: true doendend- describe '#checkout_zone_or_default' do- subject { build(:store) }-- context do- include_context 'with checkout zone set'-- it 'returns checkout zone' do- expect(subject.checkout_zone_or_default).to eq zone- end- end-- context do- include_context 'with checkout zone not set'-- context do- include_context 'with default checkout zone set'-- it 'returns default checkout zone' do- expect(subject.checkout_zone_or_default).to eq default_zone- end- end-- context do- include_context 'with default checkout zone not set'-- it 'returns nil' do- expect(subject.checkout_zone_or_default).to be_nil- end- end- end- end-describe '#ensure_default_country' dosubject { build(:store) }diff --git a/core/spec/models/spree/tax_rate_spec.rb b/core/spec/models/spree/tax_rate_spec.rbindex d3470fd5d0..7aa1a9e60b 100644--- a/core/spec/models/spree/tax_rate_spec.rb+++ b/core/spec/models/spree/tax_rate_spec.rb@@ -118,7 +118,7 @@ describe Spree::TaxRate, type: :model docontext 'when the order has a different tax zone' dobefore do- allow(order).to receive_messages tax_zone: create(:zone, kind: 'country', name: 'Other Zone')+ allow(order).to receive_messages tax_zone: build(:zone, kind: 'country', name: 'Other Zone')endcontext 'when the tax is a VAT' dodiff --git a/core/spec/models/spree/webhook_delivery_spec.rb b/core/spec/models/spree/webhook_delivery_spec.rbindex 8104b9604e..5d8785996b 100644--- a/core/spec/models/spree/webhook_delivery_spec.rb+++ b/core/spec/models/spree/webhook_delivery_spec.rb@@ -3,7 +3,7 @@require 'spec_helper'describe Spree::WebhookDelivery, type: :model do- let(:store) { create(:store) }+ let(:store) { @default_store }let(:webhook_endpoint) { create(:webhook_endpoint, store: store) }let(:webhook_delivery) { build(:webhook_delivery, webhook_endpoint: webhook_endpoint) }diff --git a/core/spec/models/spree/webhook_endpoint_spec.rb b/core/spec/models/spree/webhook_endpoint_spec.rbindex a25d1fc490..8cbc892912 100644--- a/core/spec/models/spree/webhook_endpoint_spec.rb+++ b/core/spec/models/spree/webhook_endpoint_spec.rb@@ -3,7 +3,7 @@require 'spec_helper'describe Spree::WebhookEndpoint, type: :model do- let(:store) { create(:store) }+ let(:store) { @default_store }let(:webhook_endpoint) { build(:webhook_endpoint, store: store) }describe 'validations' dodiff --git a/core/spec/presenters/spree/csv/gift_card_presenter_spec.rb b/core/spec/presenters/spree/csv/gift_card_presenter_spec.rbindex afb32acaac..94db222b3f 100644--- a/core/spec/presenters/spree/csv/gift_card_presenter_spec.rb+++ b/core/spec/presenters/spree/csv/gift_card_presenter_spec.rb@@ -1,7 +1,7 @@require 'spec_helper'RSpec.describe Spree::CSV::GiftCardPresenter, type: :model do- let(:store) { create(:store) }+ let(:store) { @default_store }let(:user) { create(:user, first_name: 'John', last_name: 'Doe', email: '[email protected]') }let(:gift_card) docreate(:gift_card,diff --git a/core/spec/serializers/spree/events/export_serializer_spec.rb b/core/spec/serializers/spree/events/export_serializer_spec.rbindex 462d2eab40..ebd8c6f2cd 100644--- a/core/spec/serializers/spree/events/export_serializer_spec.rb+++ b/core/spec/serializers/spree/events/export_serializer_spec.rb@@ -3,7 +3,7 @@require 'spec_helper'RSpec.describe Spree::Events::ExportSerializer do- let(:store) { create(:store) }+ let(:store) { @default_store }let(:admin_user) { create(:admin_user) }let(:export) { create(:export, store: store, user: admin_user) }diff --git a/core/spec/serializers/spree/events/gift_card_batch_serializer_spec.rb b/core/spec/serializers/spree/events/gift_card_batch_serializer_spec.rbindex e88acc64d4..0461ea9585 100644--- a/core/spec/serializers/spree/events/gift_card_batch_serializer_spec.rb+++ b/core/spec/serializers/spree/events/gift_card_batch_serializer_spec.rb@@ -3,7 +3,7 @@require 'spec_helper'RSpec.describe Spree::Events::GiftCardBatchSerializer do- let(:store) { create(:store) }+ let(:store) { @default_store }let(:admin_user) { create(:admin_user) }let(:gift_card_batch) docreate(:gift_card_batch,diff --git a/core/spec/serializers/spree/events/gift_card_serializer_spec.rb b/core/spec/serializers/spree/events/gift_card_serializer_spec.rbindex 5984750c3a..a8cb3c638d 100644--- a/core/spec/serializers/spree/events/gift_card_serializer_spec.rb+++ b/core/spec/serializers/spree/events/gift_card_serializer_spec.rb@@ -3,7 +3,7 @@require 'spec_helper'RSpec.describe Spree::Events::GiftCardSerializer do- let(:store) { create(:store) }+ let(:store) { @default_store }let(:gift_card) docreate(:gift_card,store: store,diff --git a/core/spec/serializers/spree/events/import_row_serializer_spec.rb b/core/spec/serializers/spree/events/import_row_serializer_spec.rbindex 45c87ca5bf..6a6b1e8b09 100644--- a/core/spec/serializers/spree/events/import_row_serializer_spec.rb+++ b/core/spec/serializers/spree/events/import_row_serializer_spec.rb@@ -5,7 +5,7 @@ require 'spec_helper'RSpec.describe Spree::Events::ImportRowSerializer dosubject { described_class.serialize(import_row) }- let(:store) { create(:store) }+ let(:store) { @default_store }let(:user) { create(:admin_user) }let(:import) { create(:import, owner: store, user: user) }let(:product) { create(:product) }diff --git a/core/spec/serializers/spree/events/import_serializer_spec.rb b/core/spec/serializers/spree/events/import_serializer_spec.rbindex e5f3b69bd1..307c9314eb 100644--- a/core/spec/serializers/spree/events/import_serializer_spec.rb+++ b/core/spec/serializers/spree/events/import_serializer_spec.rb@@ -3,7 +3,7 @@require 'spec_helper'RSpec.describe Spree::Events::ImportSerializer do- let(:store) { create(:store) }+ let(:store) { @default_store }let(:admin_user) { create(:admin_user) }let(:import) { create(:import, owner: store, user: admin_user) }diff --git a/core/spec/serializers/spree/events/order_serializer_spec.rb b/core/spec/serializers/spree/events/order_serializer_spec.rbindex 2521676c34..51498713d6 100644--- a/core/spec/serializers/spree/events/order_serializer_spec.rb+++ b/core/spec/serializers/spree/events/order_serializer_spec.rb@@ -3,7 +3,7 @@require 'spec_helper'RSpec.describe Spree::Events::OrderSerializer do- let(:store) { create(:store) }+ let(:store) { @default_store }let(:user) { create(:user) }let(:order) docreate(:completed_order_with_totals,diff --git a/core/spec/serializers/spree/events/post_category_serializer_spec.rb b/core/spec/serializers/spree/events/post_category_serializer_spec.rbindex 7a398543b3..9025f7253f 100644--- a/core/spec/serializers/spree/events/post_category_serializer_spec.rb+++ b/core/spec/serializers/spree/events/post_category_serializer_spec.rb@@ -3,7 +3,7 @@require 'spec_helper'RSpec.describe Spree::Events::PostCategorySerializer do- let(:store) { create(:store) }+ let(:store) { @default_store }let(:post_category) { create(:post_category, store: store, title: 'News') }subject { described_class.serialize(post_category) }diff --git a/core/spec/serializers/spree/events/post_serializer_spec.rb b/core/spec/serializers/spree/events/post_serializer_spec.rbindex 2d24a8d722..6424a7bd61 100644--- a/core/spec/serializers/spree/events/post_serializer_spec.rb+++ b/core/spec/serializers/spree/events/post_serializer_spec.rb@@ -3,7 +3,7 @@require 'spec_helper'RSpec.describe Spree::Events::PostSerializer do- let(:store) { create(:store) }+ let(:store) { @default_store }let(:post_category) { create(:post_category, store: store) }let(:author) { create(:admin_user) }let(:post) dodiff --git a/core/spec/serializers/spree/events/product_serializer_spec.rb b/core/spec/serializers/spree/events/product_serializer_spec.rbindex b78ccbcec6..31fda92639 100644--- a/core/spec/serializers/spree/events/product_serializer_spec.rb+++ b/core/spec/serializers/spree/events/product_serializer_spec.rb@@ -3,7 +3,7 @@require 'spec_helper'RSpec.describe Spree::Events::ProductSerializer do- let(:store) { create(:store) }+ let(:store) { @default_store }let(:product) docreate(:product,name: 'Test Product',diff --git a/core/spec/serializers/spree/events/report_serializer_spec.rb b/core/spec/serializers/spree/events/report_serializer_spec.rbindex 345ae650fd..74bb4f1fb9 100644--- a/core/spec/serializers/spree/events/report_serializer_spec.rb+++ b/core/spec/serializers/spree/events/report_serializer_spec.rb@@ -5,7 +5,7 @@ require 'spec_helper'RSpec.describe Spree::Events::ReportSerializer dosubject { described_class.serialize(report) }- let(:store) { create(:store) }+ let(:store) { @default_store }let(:user) { create(:admin_user) }let(:report) docreate(:report,diff --git a/core/spec/serializers/spree/events/store_credit_serializer_spec.rb b/core/spec/serializers/spree/events/store_credit_serializer_spec.rbindex baf3c6a6d5..9c2398d091 100644--- a/core/spec/serializers/spree/events/store_credit_serializer_spec.rb+++ b/core/spec/serializers/spree/events/store_credit_serializer_spec.rb@@ -3,7 +3,7 @@require 'spec_helper'RSpec.describe Spree::Events::StoreCreditSerializer do- let(:store) { create(:store) }+ let(:store) { @default_store }let(:user) { create(:user) }let(:admin_user) { create(:admin_user) }let(:store_credit) dodiff --git a/core/spec/serializers/spree/events/wishlist_serializer_spec.rb b/core/spec/serializers/spree/events/wishlist_serializer_spec.rbindex dbd2c73d18..02b12a6b94 100644--- a/core/spec/serializers/spree/events/wishlist_serializer_spec.rb+++ b/core/spec/serializers/spree/events/wishlist_serializer_spec.rb@@ -3,7 +3,7 @@require 'spec_helper'RSpec.describe Spree::Events::WishlistSerializer do- let(:store) { create(:store) }+ let(:store) { @default_store }let(:user) { create(:user) }let(:wishlist) docreate(:wishlist,diff --git a/core/spec/services/spree/checkout/advance_spec.rb b/core/spec/services/spree/checkout/advance_spec.rbindex c9d46a2c7a..29b26c25b2 100644--- a/core/spec/services/spree/checkout/advance_spec.rb+++ b/core/spec/services/spree/checkout/advance_spec.rb@@ -35,7 +35,7 @@ RSpec.describe Spree::Checkout::Advance docontext 'when no transition has been made' dobefore do- order.payments.destroy_all+ order.payments.delete_allorder.update_column(:state, 'payment')end@@ -75,7 +75,7 @@ RSpec.describe Spree::Checkout::Advance docontext 'when unable to reach the targeted state' dobefore do- order.payments.destroy_all+ order.payments.delete_allendit 'responds with an error' dodiff --git a/core/spec/services/spree/checkout/get_shipping_rates_spec.rb b/core/spec/services/spree/checkout/get_shipping_rates_spec.rbindex a068bdf530..2e583c7ee3 100644--- a/core/spec/services/spree/checkout/get_shipping_rates_spec.rb+++ b/core/spec/services/spree/checkout/get_shipping_rates_spec.rb@@ -96,7 +96,7 @@ module Spreeendcontext 'without shipments' do- before { order.shipments.destroy_all }+ before { order.shipments.delete_all }it_behaves_like 'generates shipping rates'it_behaves_like 'applies standard shipping costs'diff --git a/core/spec/services/spree/products/prepare_nested_attributes_spec.rb b/core/spec/services/spree/products/prepare_nested_attributes_spec.rbindex 61c17a0ac4..4977fcb11b 100644--- a/core/spec/services/spree/products/prepare_nested_attributes_spec.rb+++ b/core/spec/services/spree/products/prepare_nested_attributes_spec.rb@@ -4,7 +4,7 @@ RSpec.describe Spree::Products::PrepareNestedAttributes dosubject(:prepared_params) { described_class.new(product, store, params, ability).call }let(:ability) { Spree::Ability.new(nil) }- let(:store) { create(:store) }+ let(:store) { @default_store }let(:other_store) { create(:store) }let(:product) { create(:product, stores: [store, other_store]) }let(:params) { ActionController::Parameters.new(raw_params) }diff --git a/core/spec/services/spree/stock_locations/stock_items/create_spec.rb b/core/spec/services/spree/stock_locations/stock_items/create_spec.rbindex b25e486bbf..9abe59760c 100644--- a/core/spec/services/spree/stock_locations/stock_items/create_spec.rb+++ b/core/spec/services/spree/stock_locations/stock_items/create_spec.rb@@ -64,7 +64,7 @@ module Spreeendcontext 'without prepared stock items' do- before { Spree::Variant.destroy_all }+ before { Spree::Variant.delete_all }it 'does not insert stock items' doexpect(stock_location.stock_items).not_to receive(:insert_all)diff --git a/core/spec/subscribers/spree/export_subscriber_spec.rb b/core/spec/subscribers/spree/export_subscriber_spec.rbindex 27788b8227..573e4f0c59 100644--- a/core/spec/subscribers/spree/export_subscriber_spec.rb+++ b/core/spec/subscribers/spree/export_subscriber_spec.rb@@ -16,7 +16,7 @@ RSpec.describe Spree::ExportSubscriber doenddescribe '#generate_export_async' do- let(:store) { create(:store) }+ let(:store) { @default_store }let(:user) { create(:admin_user) }let(:subscriber) { described_class.new }let(:export) { create(:export, store: store, user: user) }diff --git a/core/spec/subscribers/spree/product_metrics_subscriber_spec.rb b/core/spec/subscribers/spree/product_metrics_subscriber_spec.rbindex e540a17c10..b9b13c79eb 100644--- a/core/spec/subscribers/spree/product_metrics_subscriber_spec.rb+++ b/core/spec/subscribers/spree/product_metrics_subscriber_spec.rb@@ -18,7 +18,7 @@ RSpec.describe Spree::ProductMetricsSubscriber doenddescribe '#refresh_product_metrics' do- let(:store) { create(:store) }+ let(:store) { @default_store }let(:product_1) { create(:product, stores: [store]) }let(:product_2) { create(:product, stores: [store]) }let(:subscriber) { described_class.new }diff --git a/core/spec/subscribers/spree/report_subscriber_spec.rb b/core/spec/subscribers/spree/report_subscriber_spec.rbindex 9bc22a8e8c..95164c44d5 100644--- a/core/spec/subscribers/spree/report_subscriber_spec.rb+++ b/core/spec/subscribers/spree/report_subscriber_spec.rb@@ -16,7 +16,7 @@ RSpec.describe Spree::ReportSubscriber doenddescribe '#generate_report_async' do- let(:store) { create(:store) }+ let(:store) { @default_store }let(:user) { create(:admin_user) }let(:subscriber) { described_class.new }diff --git a/emails/spec/helpers/spree/mail_helper_spec.rb b/emails/spec/helpers/spree/mail_helper_spec.rbindex 8079e59431..f2df80bae3 100644--- a/emails/spec/helpers/spree/mail_helper_spec.rb+++ b/emails/spec/helpers/spree/mail_helper_spec.rb@@ -2,7 +2,7 @@ require 'spec_helper'module Spreedescribe MailHelper, type: :helper do- let(:store) { create(:store) }+ let(:store) { @default_store }before doallow(helper).to receive(:current_store) { store }diff --git a/packages/legacy_webhooks/spec/models/spree/shipment_webhooks_spec.rb b/packages/legacy_webhooks/spec/models/spree/shipment_webhooks_spec.rbindex 052ab2bf54..a4ae93910d 100644--- a/packages/legacy_webhooks/spec/models/spree/shipment_webhooks_spec.rb+++ b/packages/legacy_webhooks/spec/models/spree/shipment_webhooks_spec.rb@@ -75,7 +75,7 @@ describe Spree::Shipment::Webhooks dobefore doshipments[0].shipshipments[1].ready- shipments.each { |s| s.state_changes.destroy_all }+ shipments.each { |s| s.state_changes.delete_all }endit { expect { shipments[1].ship }.to emit_webhook_event(event_name, order) }@@ -93,7 +93,7 @@ describe Spree::Shipment::Webhooks dobefore doshipments[0].shipshipments[1].cancel- shipments.each { |s| s.state_changes.destroy_all }+ shipments.each { |s| s.state_changes.delete_all }endit { expect { shipments[1].ship }.to emit_webhook_event(event_name, order) }diff --git a/packages/page_builder/spec/models/spree/page_section_spec.rb b/packages/page_builder/spec/models/spree/page_section_spec.rbindex ea2b74d2a6..76681e9661 100644--- a/packages/page_builder/spec/models/spree/page_section_spec.rb+++ b/packages/page_builder/spec/models/spree/page_section_spec.rb@@ -6,7 +6,7 @@ RSpec.describe Spree::PageSection, type: :model dodescribe 'position' doit 'assigns position number in scope of non-deleted page sections' doexpect(homepage.sections.pluck(:position)).to match_array([1, 2, 3, 4])- homepage.sections.destroy_all+ homepage.sections.destroy_all # this needs to be destroy_allexpect(homepage.sections).to be_blankexpect(homepage.sections.with_deleted).to be_presentdiff --git a/storefront/app/controllers/spree/store_controller.rb b/storefront/app/controllers/spree/store_controller.rbindex e2b58ad41b..48f92fc314 100644--- a/storefront/app/controllers/spree/store_controller.rb+++ b/storefront/app/controllers/spree/store_controller.rb@@ -210,11 +210,6 @@ module Spreeendend- def redirect_back_or_default(default)- Spree::Deprecation.warn('redirect_back_or_default is deprecated and will be removed in Spree 5.2. Please use redirect_back(fallback_location: default) instead.')- redirect_back(fallback_location: default)- end-def require_user(return_to: nil, redirect_path: nil)return if try_spree_current_userdiff --git a/storefront/app/helpers/spree/products_helper.rb b/storefront/app/helpers/spree/products_helper.rbindex 4070d87125..4886227c7d 100644--- a/storefront/app/helpers/spree/products_helper.rb+++ b/storefront/app/helpers/spree/products_helper.rb@@ -49,12 +49,6 @@ module Spreeprice.compare_at_amount.present? && (price.compare_at_amount > price.amount)end- def weeks_online(product)- Spree::Deprecation.warn('weeks_online is deprecated and will be removed in Spree 5.2')-- (Time.current - product.activated_at.in_time_zone(current_store.preferred_timezone)).seconds.in_weeks.to_i.abs- end-def product_not_selected_options(product, selected_variant, options_param_name: :options)product.option_types.map do |option_type|if product_selected_option_for_option(diff --git a/storefront/app/views/themes/default/spree/page_sections/_featured_product.html.erb b/storefront/app/views/themes/default/spree/page_sections/_featured_product.html.erbindex e3e0ccf4d7..da78dadef8 100644--- a/storefront/app/views/themes/default/spree/page_sections/_featured_product.html.erb+++ b/storefront/app/views/themes/default/spree/page_sections/_featured_product.html.erb@@ -47,15 +47,15 @@<div <%= block_attributes(block) %>><% case block.type %><% when 'Spree::PageBlocks::Products::Brand' %>- <% if presenter.product&.brand&.page_builder_url %>- <%= link_to spree_storefront_resource_url(presenter.product&.brand), title: strip_tags(presenter.product&.brand&.name).strip, data: { turbo_frame: '_top' } do %>+ <% if presenter.product&.brand_taxon&.page_builder_url %>+ <%= link_to spree_storefront_resource_url(presenter.product&.brand_taxon), title: strip_tags(presenter.product&.brand_taxon&.name).strip, data: { turbo_frame: '_top' } do %><h3 class="text-sm uppercase font-semibold">- <%= presenter.product&.brand&.name %>+ <%= presenter.product&.brand_taxon&.name %></h3><% end %><% else %><h3 class="text-sm uppercase font-semibold">- <%= presenter.product&.brand&.name %>+ <%= presenter.product&.brand_taxon&.name %></h3><% end %><% when 'Spree::PageBlocks::Products::Title' %>diff --git a/storefront/app/views/themes/default/spree/page_sections/_product_details.html.erb b/storefront/app/views/themes/default/spree/page_sections/_product_details.html.erbindex c0f9a2af40..ae572991a5 100644--- a/storefront/app/views/themes/default/spree/page_sections/_product_details.html.erb+++ b/storefront/app/views/themes/default/spree/page_sections/_product_details.html.erb@@ -47,9 +47,9 @@</h1><% when 'Spree::PageBlocks::Products::Brand' %><% if product.brand_taxon %>- <%= link_to spree.nested_taxons_path(product.brand_taxon), title: product.brand_name do %>+ <%= link_to spree.nested_taxons_path(product.brand_taxon), title: product.brand_taxon.name do %><h3 class="text-sm lg:mt-0 inline-block mb-1">- <%= product.brand_name %>+ <%= product.brand_taxon.name %></h3><% end %><% end %>diff --git a/storefront/app/views/themes/default/spree/products/_json_ld.html.erb b/storefront/app/views/themes/default/spree/products/_json_ld.html.erbindex 3dadec1ea7..56994a6c37 100644--- a/storefront/app/views/themes/default/spree/products/_json_ld.html.erb+++ b/storefront/app/views/themes/default/spree/products/_json_ld.html.erb@@ -18,10 +18,10 @@<% elsif selected_variant %><% if selected_variant.sku.present? %>"sku": <%= selected_variant.sku.to_json.html_safe %>,<% end %><% end %>- <% if product.brand_name %>+ <% if product.brand_taxon %>"brand": {"@type": "Brand",- "name": <%= product.brand_name.to_json.html_safe %>+ "name": <%= product.brand_taxon.name.to_json.html_safe %>},<% end %>"offers": [diff --git a/storefront/app/views/themes/default/spree/products/_product.html.erb b/storefront/app/views/themes/default/spree/products/_product.html.erbindex 8646dfc1a1..5a843aeac6 100644--- a/storefront/app/views/themes/default/spree/products/_product.html.erb+++ b/storefront/app/views/themes/default/spree/products/_product.html.erb@@ -24,9 +24,9 @@<%= render 'spree/products/label', product: product %></div><div class="product-card-inner">- <% if product.brand_name.present? %>+ <% if product.brand_taxon.present? %><h3 class="text-xs font-semibold uppercase inline-block product-card-brand">- <%= product.brand_name %>+ <%= product.brand_taxon.name %></h3><% end %><h3 class="line-clamp-1 product-card-title">diff --git a/storefront/spec/controllers/spree/newsletter_subscribers_controller_spec.rb b/storefront/spec/controllers/spree/newsletter_subscribers_controller_spec.rbindex 9956110931..c39d2a81bf 100644--- a/storefront/spec/controllers/spree/newsletter_subscribers_controller_spec.rb+++ b/storefront/spec/controllers/spree/newsletter_subscribers_controller_spec.rb@@ -6,7 +6,7 @@ RSpec.describe Spree::NewsletterSubscribersController, type: :controller, newslelet(:store) { @default_store }before do- allow(controller).to receive(:current_store).and_return(create(:store))+ allow(controller).to receive(:current_store).and_return(store)enddescribe 'POST #create' dodiff --git a/storefront/spec/features/product_details_page_spec.rb b/storefront/spec/features/product_details_page_spec.rbindex 692d6f272e..f0acf30600 100644--- a/storefront/spec/features/product_details_page_spec.rb+++ b/storefront/spec/features/product_details_page_spec.rb@@ -162,7 +162,7 @@ RSpec.describe 'Product detail page', type: :feature docontext 'when product has no price' dobefore do- product.master.prices.destroy_all+ product.master.prices.delete_allproduct.stock_items.update_all(count_on_hand: 10, backorderable: false)visit spree.product_path(product)@@ -250,7 +250,7 @@ RSpec.describe 'Product detail page', type: :feature docontext 'when variant has no price' dobefore do- variant1.prices.destroy_all+ variant1.prices.delete_allvariant1.stock_items.update_all(count_on_hand: 10, backorderable: false)visit spree.product_path(product)@@ -549,9 +549,9 @@ RSpec.describe 'Product detail page', type: :feature docontext 'when all variants have no price' dobefore do- variant1.prices.destroy_all- variant2.prices.destroy_all- variant3.prices.destroy_all+ variant1.prices.delete_all+ variant2.prices.delete_all+ variant3.prices.delete_allvariant1.stock_items.update_all(count_on_hand: 10, backorderable: false)variant2.stock_items.update_all(count_on_hand: 10, backorderable: false)diff --git a/storefront/spec/helpers/spree/products_helper_spec.rb b/storefront/spec/helpers/spree/products_helper_spec.rbindex 540ce6b08e..8885f59d6a 100644--- a/storefront/spec/helpers/spree/products_helper_spec.rb+++ b/storefront/spec/helpers/spree/products_helper_spec.rb@@ -1,7 +1,7 @@require 'spec_helper'describe Spree::ProductsHelper, type: :helper do- let(:store) { create(:store) }+ let(:store) { @default_store }let(:zone) { create(:zone) }let(:user) { create(:user) }let(:variant) { create(:variant) }