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
Standarize specs, speed up with default store (#12249)
Damian Legawiec3a444ae3285f
diff --git a/admin/spec/spec_helper.rb b/admin/spec/spec_helper.rbindex e9df6fe1c5..2ba61f2644 100644--- a/admin/spec/spec_helper.rb+++ b/admin/spec/spec_helper.rb@@ -39,6 +39,7 @@ require 'spree/testing_support/authorization_helpers'require 'spree/testing_support/factories'require 'spree/testing_support/preferences'require 'spree/testing_support/jobs'+require 'spree/testing_support/store'require 'spree/testing_support/controller_requests'require 'spree/testing_support/url_helpers'require 'spree/testing_support/order_walkthrough'@@ -62,46 +63,34 @@ RSpec.configure do |config|# instead of true.config.use_transactional_fixtures = false- config.before :suite do+ config.before(:suite) doCapybara.match = :smartCapybara.javascript_driver = :selenium_chromeCapybara.default_max_wait_time = 10Capybara.raise_server_errors = false- DatabaseCleaner.clean_with :truncation+ # Clean out the database state before the tests run+ DatabaseCleaner.strategy = :transaction+ DatabaseCleaner.clean_with(:truncation)end- config.before do- Rails.cache.clear- WebMock.disable!- DatabaseCleaner.strategy = if RSpec.current_example.metadata[:js]- :truncation- else- :transaction- end- # TODO: Find out why open_transactions ever gets below 0- # See issue #3428- ApplicationRecord.connection.increment_open_transactions if ApplicationRecord.connection.open_transactions < 0-- DatabaseCleaner.start- reset_spree_preferences-- country = create(:country, name: 'United States of America', iso_name: 'UNITED STATES', iso: 'US', states_required: true)-- create(:store, default_country: country, default: true)+ config.around(:each) do |example|+ DatabaseCleaner.cleaning do+ example.run+ endend- config.after(:each, type: :feature) do |example|- if page&.body&.present?- missing_translations = page.body.scan(/translation missing: #{I18n.locale}\.(.*?)[\s<\"&]/)- if missing_translations.any?- puts "Found missing translations: #{missing_translations.inspect}"- puts "In spec: #{example.location}"- end+ config.before(:each) do+ begin+ Rails.cache.clear+ reset_spree_preferences+ rescue Errno::ENOTEMPTYendend- config.append_after do- DatabaseCleaner.clean+ config.around(:each) do |example|+ DatabaseCleaner.cleaning do+ example.run+ endendconfig.include FactoryBot::Syntax::Methodsdiff --git a/api/spec/models/spree/order_webhooks_spec.rb b/api/spec/models/spree/order_webhooks_spec.rbindex 492480b260..e9e4787005 100644--- a/api/spec/models/spree/order_webhooks_spec.rb+++ b/api/spec/models/spree/order_webhooks_spec.rb@@ -1,7 +1,7 @@require 'spec_helper'describe Spree::Order::Webhooks do- let(:store) { create(:store, default: true) }+ let(:store) { Spree::Store.default }let(:webhook_payload_body) doSpree::Api::V2::Platform::OrderSerializer.new(order,diff --git a/api/spec/models/spree/stock_movement_webhooks_spec.rb b/api/spec/models/spree/stock_movement_webhooks_spec.rbindex e8d9b7ea18..337a2d722f 100644--- a/api/spec/models/spree/stock_movement_webhooks_spec.rb+++ b/api/spec/models/spree/stock_movement_webhooks_spec.rb@@ -11,7 +11,7 @@ describe Spree::StockMovement::Webhooks dolet(:stock_location) { variant.stock_locations.first }describe 'emitting product events' do- let!(:store) { create(:store) }+ let!(:store) { Spree::Store.default }let!(:product) { create(:product, stores: [store]) }let!(:variant) { create(:variant, product: product) }let!(:variant2) { create(:variant, product: product) }diff --git a/api/spec/serializers/spree/v2/storefront/cms_section_serializer_spec.rb b/api/spec/serializers/spree/v2/storefront/cms_section_serializer_spec.rbindex 768eb8a233..318d1aed1e 100644--- a/api/spec/serializers/spree/v2/storefront/cms_section_serializer_spec.rb+++ b/api/spec/serializers/spree/v2/storefront/cms_section_serializer_spec.rb@@ -48,7 +48,7 @@ describe Spree::V2::Storefront::CmsSectionSerializer doendcontext 'cms_hero_image_section' do- let!(:store) { create(:store) }+ let!(:store) { Spree::Store.default }let!(:homepage) { create(:cms_homepage, store: store) }let!(:cms_section) dosection = create(:cms_hero_image_section, cms_page: homepage)@@ -69,7 +69,7 @@ describe Spree::V2::Storefront::CmsSectionSerializer doendcontext 'cms_side_by_side_images_section' do- let!(:store) { create(:store) }+ let!(:store) { Spree::Store.default }let!(:homepage) { create(:cms_homepage, store: store) }let!(:cms_section) dosection = create(:cms_side_by_side_images_section, cms_page: homepage)@@ -83,7 +83,7 @@ describe Spree::V2::Storefront::CmsSectionSerializer doendcontext 'cms_image_gallery_section' do- let!(:store) { create(:store) }+ let!(:store) { Spree::Store.default }let!(:homepage) { create(:cms_homepage, store: store) }let!(:cms_section) dosection = create(:cms_image_gallery_section, cms_page: homepage)diff --git a/api/spec/spec_helper.rb b/api/spec/spec_helper.rbindex 4adde95705..e0dfa39543 100644--- a/api/spec/spec_helper.rb+++ b/api/spec/spec_helper.rb@@ -38,6 +38,7 @@ Dir[File.dirname(__FILE__) + '/support/**/*.rb'].each { |f| require f }require 'spree/testing_support/factories'require 'spree/testing_support/jobs'+require 'spree/testing_support/store'require 'spree/testing_support/preferences'require 'spree/testing_support/image_helpers'require 'spree/testing_support/next_instance_of'@@ -81,9 +82,6 @@ RSpec.configure do |config|Rails.cache.clearreset_spree_preferences- country = create(:country, name: 'United States of America', iso_name: 'UNITED STATES', iso: 'US', iso3: 'USA', states_required: true)- create(:store, default: true, default_country: country, default_currency: 'USD')-# Request specs to paths with ?locale=xx don't reset the locale afterwards# Some tests assume that the current locale is :en, so we ensure it hereI18n.locale = :endiff --git a/core/lib/spree/testing_support/order_walkthrough.rb b/core/lib/spree/testing_support/order_walkthrough.rbindex 80eff06067..bcd7ee96d4 100644--- a/core/lib/spree/testing_support/order_walkthrough.rb+++ b/core/lib/spree/testing_support/order_walkthrough.rb@@ -1,12 +1,6 @@class OrderWalkthroughdef self.up_to(state, store = nil)- store ||= if Spree::Store.exists?- # Ensure the default store is used- Spree::Store.default || FactoryBot.create(:store, default: true)- else- # Create a default store- FactoryBot.create(:store, default: true)- end+ store ||= Spree::Store.default# A payment method must exist for an order to proceed through the Address stateunless Spree::PaymentMethod.exists?diff --git a/core/lib/spree/testing_support/store.rb b/core/lib/spree/testing_support/store.rbnew file mode 100644index 0000000000..6a36823620--- /dev/null+++ b/core/lib/spree/testing_support/store.rb@@ -0,0 +1,7 @@+# setup default store, to be always present+RSpec.configure do |config|+ config.before(:each) do+ country = create(:country, name: 'United States of America', iso_name: 'UNITED STATES', iso: 'US', iso3: 'USA', states_required: true)+ create(:store, default: true, default_country: country, default_currency: 'USD')+ end+enddiff --git a/core/spec/finders/spree/stores/find_current_spec.rb b/core/spec/finders/spree/stores/find_current_spec.rbindex 6bb493fff1..dcadae992d 100644--- a/core/spec/finders/spree/stores/find_current_spec.rb+++ b/core/spec/finders/spree/stores/find_current_spec.rb@@ -4,7 +4,7 @@ module Spreedescribe Stores::FindCurrent dosubject { described_class.new(scope: scope, url: url).execute }- let!(:store) { create(:store, default: true) }+ let!(:store) { Spree::Store.default }let!(:store_2) { create(:store, url: 'another.com', default_currency: 'GBP') }let(:scope) { nil }diff --git a/core/spec/helpers/base_helper_spec.rb b/core/spec/helpers/base_helper_spec.rbindex 2164fc45c0..3da9abf551 100644--- a/core/spec/helpers/base_helper_spec.rb+++ b/core/spec/helpers/base_helper_spec.rb@@ -41,7 +41,7 @@ describe Spree::BaseHelper, type: :helper doenddescribe '#spree_storefront_resource_url' do- let!(:store) { create(:store) }+ let!(:store) { Spree::Store.default }let!(:taxon) { create(:taxon) }let!(:product) { create(:product) }diff --git a/core/spec/lib/spree/core/controller_helpers/order_spec.rb b/core/spec/lib/spree/core/controller_helpers/order_spec.rbindex 4efd80b9da..df750c0774 100644--- a/core/spec/lib/spree/core/controller_helpers/order_spec.rb+++ b/core/spec/lib/spree/core/controller_helpers/order_spec.rb@@ -12,7 +12,7 @@ describe Spree::Core::ControllerHelpers::Order, type: :controller dolet(:user) { create(:user) }let(:order) { create(:order, user: user, store: store) }- let!(:store) { create(:store, default: true, default_currency: 'USD') }+ let!(:store) { Spree::Store.default }describe '#simple_current_order' dobefore { allow(controller).to receive_messages(try_spree_current_user: user) }diff --git a/core/spec/models/spree/cms/sections/featured_article_spec.rb b/core/spec/models/spree/cms/sections/featured_article_spec.rbindex de0ac74a2f..d428f5e2d4 100644--- a/core/spec/models/spree/cms/sections/featured_article_spec.rb+++ b/core/spec/models/spree/cms/sections/featured_article_spec.rb@@ -1,7 +1,7 @@require 'spec_helper'describe Spree::Cms::Sections::FeaturedArticle, type: :model do- let!(:store) { create(:store) }+ let!(:store) { Spree::Store.default }let!(:homepage) { create(:cms_homepage, store: store) }it 'validates presence of name' dodiff --git a/core/spec/models/spree/cms/sections/hero_image_spec.rb b/core/spec/models/spree/cms/sections/hero_image_spec.rbindex ab5784de21..cc97b74d88 100644--- a/core/spec/models/spree/cms/sections/hero_image_spec.rb+++ b/core/spec/models/spree/cms/sections/hero_image_spec.rb@@ -1,7 +1,7 @@require 'spec_helper'describe Spree::Cms::Sections::HeroImage, type: :model do- let!(:store) { create(:store) }+ let!(:store) { Spree::Store.default }let!(:homepage) { create(:cms_homepage, store: store) }it 'validates presence of name' dodiff --git a/core/spec/models/spree/cms/sections/image_gallery_spec.rb b/core/spec/models/spree/cms/sections/image_gallery_spec.rbindex 8b920fc410..840a00fc69 100644--- a/core/spec/models/spree/cms/sections/image_gallery_spec.rb+++ b/core/spec/models/spree/cms/sections/image_gallery_spec.rb@@ -1,7 +1,7 @@require 'spec_helper'describe Spree::Cms::Sections::ImageGallery, type: :model do- let!(:store) { create(:store) }+ let!(:store) { Spree::Store.default }let!(:homepage) { create(:cms_homepage, store: store) }it 'validates presence of name' dodiff --git a/core/spec/models/spree/cms/sections/product_carousel_spec.rb b/core/spec/models/spree/cms/sections/product_carousel_spec.rbindex 8617d964d6..72e9e0ece7 100644--- a/core/spec/models/spree/cms/sections/product_carousel_spec.rb+++ b/core/spec/models/spree/cms/sections/product_carousel_spec.rb@@ -1,7 +1,7 @@require 'spec_helper'describe Spree::Cms::Sections::ProductCarousel, type: :model do- let!(:store) { create(:store) }+ let!(:store) { Spree::Store.default }let!(:homepage) { create(:cms_homepage, store: store) }it 'validates presence of name' dodiff --git a/core/spec/models/spree/cms/sections/rich_text_content_spec.rb b/core/spec/models/spree/cms/sections/rich_text_content_spec.rbindex a8a927a892..c0abd0f570 100644--- a/core/spec/models/spree/cms/sections/rich_text_content_spec.rb+++ b/core/spec/models/spree/cms/sections/rich_text_content_spec.rb@@ -1,7 +1,7 @@require 'spec_helper'describe Spree::Cms::Sections::RichTextContent, type: :model do- let!(:store) { create(:store) }+ let!(:store) { Spree::Store.default }let!(:homepage) { create(:cms_homepage, store: store) }it 'validates presence of name' dodiff --git a/core/spec/models/spree/cms/sections/side_by_side_images_spec.rb b/core/spec/models/spree/cms/sections/side_by_side_images_spec.rbindex d33115b5e8..b450f9b755 100644--- a/core/spec/models/spree/cms/sections/side_by_side_images_spec.rb+++ b/core/spec/models/spree/cms/sections/side_by_side_images_spec.rb@@ -1,7 +1,7 @@require 'spec_helper'describe Spree::Cms::Sections::SideBySideImages, type: :model do- let!(:store) { create(:store) }+ let!(:store) { Spree::Store.default }let!(:homepage) { create(:cms_homepage, store: store) }it 'validates presence of name' dodiff --git a/core/spec/models/spree/country_spec.rb b/core/spec/models/spree/country_spec.rbindex 2428d54b0b..f7decba482 100644--- a/core/spec/models/spree/country_spec.rb+++ b/core/spec/models/spree/country_spec.rb@@ -1,8 +1,8 @@require 'spec_helper'describe Spree::Country, type: :model do- let(:store) { create(:store, default: true, default_country: america) }- let(:america) { create :country }+ let(:store) { Spree::Store.default }+ let(:america) { store.default_country }let(:canada) { create :country, name: 'Canada', iso_name: 'CANADA', iso: 'CA', iso3: 'CAN', numcode: '124' }it 'validates uniqueness' dodiff --git a/core/spec/models/spree/line_item_spec.rb b/core/spec/models/spree/line_item_spec.rbindex 4c78917743..01f8765bca 100644--- a/core/spec/models/spree/line_item_spec.rb+++ b/core/spec/models/spree/line_item_spec.rb@@ -1,7 +1,7 @@require 'spec_helper'describe Spree::LineItem, type: :model do- let!(:store) { create(:store) }+ let!(:store) { Spree::Store.default }let(:order) { create :order_with_line_items, line_items_count: 1, store: store }let(:line_item) { order.line_items.first }diff --git a/core/spec/models/spree/menu_spec.rb b/core/spec/models/spree/menu_spec.rbindex e3aa8b2097..10e8856500 100644--- a/core/spec/models/spree/menu_spec.rb+++ b/core/spec/models/spree/menu_spec.rb@@ -10,7 +10,7 @@ describe Spree::Menu, type: :model doenddescribe '.for_store' do- let!(:store) { create(:store) }+ let!(:store) { Spree::Store.default }let!(:store_b) { create(:store) }let!(:menu_a) { create(:menu, store: store) }@@ -22,7 +22,7 @@ describe Spree::Menu, type: :model doenddescribe '.by_locale' do- let!(:store_milti) { create(:store) }+ let!(:store_milti) { Spree::Store.default }let!(:menu_en) { create(:menu, store: store_milti, locale: 'en') }let!(:menu_fr) { create(:menu, store: store_milti, locale: 'fr') }@@ -56,7 +56,7 @@ describe Spree::Menu, type: :model doenddescribe 'creating new menu' do- let(:store_1) { create(:store) }+ let(:store_1) { Spree::Store.default }let(:store_2) { create(:store) }let(:store_3) { create(:store) }let!(:menu) { create(:menu, name: 'Footer Menu', location: 'Footer', store: store_1) }@@ -92,7 +92,7 @@ describe Spree::Menu, type: :model doenddescribe 'updating the menu name' do- let(:store_a) { create(:store) }+ let(:store_a) { Spree::Store.default }let(:m_x) { create(:menu, name: 'Main Menu', location: 'Header', store: store_a) }before do@@ -105,7 +105,7 @@ describe Spree::Menu, type: :model doenddescribe 'touch store' do- let!(:store) { create(:store) }+ let!(:store) { Spree::Store.default }let(:menu) { build(:menu, store: store) }it { expect { menu.save! }.to change(store, :updated_at) }diff --git a/core/spec/models/spree/order/checkout_spec.rb b/core/spec/models/spree/order/checkout_spec.rbindex c3429e907d..bb4a91863f 100644--- a/core/spec/models/spree/order/checkout_spec.rb+++ b/core/spec/models/spree/order/checkout_spec.rb@@ -2,9 +2,9 @@ require 'spec_helper'require 'spree/testing_support/order_walkthrough'describe Spree::Order, type: :model do- let!(:store) { create(:store, default: true) }+ let!(:store) { Spree::Store.default }let(:order) { build(:order, store: store) }- let(:country) { create(:country) }+ let(:country) { store.default_country }let!(:state) { country.states.first || create(:state, country: country) }def assert_state_changed(order, from, to)diff --git a/core/spec/models/spree/order/store_credit_spec.rb b/core/spec/models/spree/order/store_credit_spec.rbindex 0bc69afe5b..bbcd777c2c 100644--- a/core/spec/models/spree/order/store_credit_spec.rb+++ b/core/spec/models/spree/order/store_credit_spec.rb@@ -210,7 +210,7 @@ describe 'Order' doendcontext 'when store is provided' do- let!(:store) { create(:store) }+ let!(:store) { Spree::Store.default }let!(:second_store) { create(:store) }let!(:store_credit) { create(:store_credit, amount: '100', user: user, store: store) }diff --git a/core/spec/models/spree/order_spec.rb b/core/spec/models/spree/order_spec.rbindex 75f6ddb2ff..3fbeecd384 100644--- a/core/spec/models/spree/order_spec.rb+++ b/core/spec/models/spree/order_spec.rb@@ -8,7 +8,7 @@ enddescribe Spree::Order, type: :model dolet(:user) { create(:user) }- let!(:store) { create(:store, default: true) }+ let!(:store) { Spree::Store.default }let(:order) { create(:order, user: user, store: store) }before { allow(Spree::LegacyUser).to receive_messages(current: create(:user)) }diff --git a/core/spec/models/spree/promotion/rules/item_total_spec.rb b/core/spec/models/spree/promotion/rules/item_total_spec.rbindex ee9e8fcb3b..e0769fcc5b 100644--- a/core/spec/models/spree/promotion/rules/item_total_spec.rb+++ b/core/spec/models/spree/promotion/rules/item_total_spec.rb@@ -1,7 +1,7 @@require 'spec_helper'describe Spree::Promotion::Rules::ItemTotal, type: :model do- let!(:store) { create(:store, default: true) }+ let!(:store) { Spree::Store.default }let(:rule) { Spree::Promotion::Rules::ItemTotal.new }let(:order) { double(:order) }diff --git a/core/spec/models/spree/user_spec.rb b/core/spec/models/spree/user_spec.rbindex 3c5608facd..7ab023e739 100644--- a/core/spec/models/spree/user_spec.rb+++ b/core/spec/models/spree/user_spec.rb@@ -170,7 +170,7 @@ describe Spree.user_class, type: :model docontext 'user has several associated store credits' dosubject { user }- let!(:store) { create(:store, default: true) }+ let!(:store) { Spree::Store.default }let!(:user) { create(:user) }let(:amount) { 120.25 }let(:additional_amount) { 55.75 }diff --git a/core/spec/spec_helper.rb b/core/spec/spec_helper.rbindex a3f559d3e6..419d34bddc 100644--- a/core/spec/spec_helper.rb+++ b/core/spec/spec_helper.rb@@ -42,6 +42,7 @@ require 'spree/testing_support/i18n' if ENV['CHECK_TRANSLATIONS']require 'spree/testing_support/factories'require 'spree/testing_support/jobs'+require 'spree/testing_support/store'require 'spree/testing_support/metadata'require 'spree/testing_support/preferences'require 'spree/testing_support/url_helpers'@@ -78,9 +79,6 @@ RSpec.configure do |config|beginRails.cache.clearreset_spree_preferences-- country = create(:country, name: 'United States of America', iso_name: 'UNITED STATES', iso: 'US', iso3: 'USA', states_required: true)- create(:store, default: true, default_country: country, default_currency: 'USD')rescue Errno::ENOTEMPTYendenddiff --git a/emails/spec/helpers/spree/mail_helper_spec.rb b/emails/spec/helpers/spree/mail_helper_spec.rbindex f19a94a66b..59dfa47424 100644--- a/emails/spec/helpers/spree/mail_helper_spec.rb+++ b/emails/spec/helpers/spree/mail_helper_spec.rb@@ -52,7 +52,7 @@ module Spreedescribe '#logo_path' dosubject { helper.logo_path }- let(:store) { create(:store) }+ let(:store) { Spree::Store.default }before doallow(helper).to receive(:current_store) { store }diff --git a/emails/spec/mailers/spree/shipment_mailer_spec.rb b/emails/spec/mailers/spree/shipment_mailer_spec.rbindex 4cbeb2df5d..46457d5656 100644--- a/emails/spec/mailers/spree/shipment_mailer_spec.rb+++ b/emails/spec/mailers/spree/shipment_mailer_spec.rb@@ -5,7 +5,7 @@ describe Spree::ShipmentMailer, type: :mailer doinclude EmailSpec::Helpersinclude EmailSpec::Matchers- let(:store) { create(:store) }+ let(:store) { Spree::Store.default }let(:order) { create(:shipped_order, store: store, email: '[email protected]', user: nil) }let(:shipment) { order.shipments.first }diff --git a/emails/spec/mailers/spree/test_mailer_spec.rb b/emails/spec/mailers/spree/test_mailer_spec.rbindex d42f092b12..66e33b3c0e 100644--- a/emails/spec/mailers/spree/test_mailer_spec.rb+++ b/emails/spec/mailers/spree/test_mailer_spec.rb@@ -5,8 +5,6 @@ describe Spree::TestMailer, type: :mailer doinclude EmailSpec::Helpersinclude EmailSpec::Matchers- before { create(:store) }-let(:user) { create(:user) }context ':from not set explicitly' dodiff --git a/emails/spec/spec_helper.rb b/emails/spec/spec_helper.rbindex cffe05c147..4dfbf20dd3 100644--- a/emails/spec/spec_helper.rb+++ b/emails/spec/spec_helper.rb@@ -15,8 +15,6 @@ if ENV['COVERAGE']coverage_dir "#{ENV['COVERAGE_DIR']}/emails_" + ENV.fetch('CIRCLE_NODE_INDEX', 0) if ENV['COVERAGE_DIR']command_name "test_" + ENV.fetch('CIRCLE_NODE_INDEX', 0)--endend@@ -39,6 +37,8 @@ Dir['./spec/support/**/*.rb'].sort.each { |f| require f }require 'spree/testing_support/i18n' if ENV['CHECK_TRANSLATIONS']require 'spree/testing_support/factories'+require 'spree/testing_support/jobs'+require 'spree/testing_support/store'require 'spree/testing_support/preferences'require 'spree/testing_support/url_helpers'require 'spree/testing_support/kernel'@@ -58,27 +58,30 @@ RSpec.configure do |config|# instead of true.config.use_transactional_fixtures = true- config.before do- Rails.cache.clear- WebMock.disable!+ config.before(:suite) do+ # Clean out the database state before the tests runDatabaseCleaner.strategy = :transaction- DatabaseCleaner.start- reset_spree_preferences+ DatabaseCleaner.clean_with(:truncation)+ end- country = create(:country, name: 'United States of America', iso_name: 'UNITED STATES', iso: 'US', states_required: true)+ config.around(:each) do |example|+ DatabaseCleaner.cleaning do+ example.run+ end+ end- create(:store, default_country: country, default: true)+ config.before(:each) do+ begin+ Rails.cache.clear+ reset_spree_preferences+ rescue Errno::ENOTEMPTY+ endendconfig.include FactoryBot::Syntax::Methodsconfig.include Spree::TestingSupport::Preferencesconfig.include Spree::TestingSupport::Kernel- # Clean out the database state before the tests run- config.before(:suite) do- DatabaseCleaner.clean_with(:truncation)- end-config.order = :randomKernel.srand config.seedend