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.

Improve Circle CI setup (#12250)

Damian Legawieca493b175bb5c
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 38ec1daaa2..e189ea590f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -20,18 +20,17 @@ defaults: &defaults
type: boolean
default: false
environment: &environment
- CIRCLE_TEST_REPORTS: /tmp/test-results
- CIRCLE_ARTIFACTS: /tmp/test-artifacts
- BUNDLE_JOBS: 4
- BUNDLE_RETRY: 3
- BUNDLE_PATH: ~/spree/vendor/bundle
- RAILS_VERSION: << parameters.rails_version >>
- DB: postgres # default value, this will speed up bundle install for all postgres builds
+ CIRCLE_TEST_REPORTS: /tmp/test-results
+ CIRCLE_ARTIFACTS: /tmp/test-artifacts
+ BUNDLE_JOBS: 4
+ BUNDLE_RETRY: 3
+ BUNDLE_PATH: ~/spree/vendor/bundle
+ RAILS_VERSION: << parameters.rails_version >>
+ DB: postgres # default value, this will speed up bundle install for all postgres builds
working_directory: ~/spree
docker:
- image: &ruby_image cimg/ruby:3.3.0-browsers
-
jobs:
run_test: &run_test
<<: *defaults
@@ -52,30 +51,30 @@ jobs:
- when:
condition: << parameters.save_cache_key >>
steps:
- - save_cache:
- key: << parameters.save_cache_key >>
- paths:
- - ~/spree/vendor/bundle
+ - save_cache:
+ key: << parameters.save_cache_key >>
+ paths:
+ - ~/spree/vendor/bundle
- when:
condition: << parameters.store_artefacts >>
steps:
- - store_artifacts:
- path: /tmp/test-artifacts
- destination: test-artifacts
- - store_artifacts:
- path: /tmp/failed_tests
- destination: failed_tests
- - store_artifacts:
- path: /tmp/test-results
- destination: raw-test-output
- - store_test_results:
- path: /tmp/test-results
+ - store_artifacts:
+ path: /tmp/test-artifacts
+ destination: test-artifacts
+ - store_artifacts:
+ path: /tmp/failed_tests
+ destination: failed_tests
+ - store_artifacts:
+ path: /tmp/test-results
+ destination: raw-test-output
+ - store_test_results:
+ path: /tmp/test-results
tests_postgres:
<<: *run_test
- parallelism: 8
+ parallelism: 12
parameters:
- <<: *default_parameters
+ <<: *default_parameters
environment:
<<: *environment
DB_HOST: localhost
@@ -88,9 +87,9 @@ jobs:
tests_mysql:
<<: *run_test
- parallelism: 8
+ parallelism: 12
parameters:
- <<: *default_parameters
+ <<: *default_parameters
environment:
<<: *environment
DB: mysql
@@ -103,7 +102,6 @@ jobs:
- image: cimg/mysql:8.0
command: [--default-authentication-plugin=mysql_native_password]
-
workflows:
main:
jobs:
@@ -115,38 +113,38 @@ workflows:
store_artefacts: true
run_file_path: ./bin/tests_database_ci.sh
requires:
- - build
+ - build
- tests_postgres:
name: tests_rails_7_1_postgres
rails_version: '~> 7.1.0'
store_artefacts: true
run_file_path: ./bin/tests_database_ci.sh
requires:
- - build
- - tests_rails_postgres
+ - build
+ - tests_rails_postgres
- tests_postgres:
name: tests_rails_7_0_postgres
rails_version: '~> 7.0.0'
store_artefacts: true
run_file_path: ./bin/tests_database_ci.sh
requires:
- - build
- - tests_rails_postgres
+ - build
+ - tests_rails_postgres
- tests_postgres:
name: tests_rails_6_1_postgres
rails_version: '~> 6.1.0'
store_artefacts: true
run_file_path: ./bin/tests_database_ci.sh
requires:
- - build
- - tests_rails_postgres
+ - build
+ - tests_rails_postgres
- tests_mysql:
name: tests_rails_mysql
store_artefacts: true
run_file_path: ./bin/tests_database_ci.sh
requires:
- - build
- - tests_rails_postgres
+ - build
+ - tests_rails_postgres
- run_test:
name: brakeman
restore_cache_key_1: spree-brakeman-{{ .Branch }}
@@ -154,6 +152,5 @@ workflows:
save_cache_key: spree-brakeman-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
run_file_path: ./bin/brakeman.sh
requires:
- - build
- - tests_rails_postgres
-
+ - build
+ - tests_rails_postgres
diff --git a/api/spec/controllers/doorkeeper/tokens_controller_spec.rb b/api/spec/controllers/doorkeeper/tokens_controller_spec.rb
index 6257ab7389..c9a565c3c2 100644
--- a/api/spec/controllers/doorkeeper/tokens_controller_spec.rb
+++ b/api/spec/controllers/doorkeeper/tokens_controller_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
describe Doorkeeper::TokensController, type: :controller do
describe '#current_store' do
- let!(:store) { create :store, default: true }
+ let!(:store) { Spree::Store.default }
it 'returns current store' do
expect(controller.current_store).to eq(store)
diff --git a/api/spec/models/concerns/spree/webhooks/has_webhooks_spec.rb b/api/spec/models/concerns/spree/webhooks/has_webhooks_spec.rb
index 413b6e532b..924d735e3d 100644
--- a/api/spec/models/concerns/spree/webhooks/has_webhooks_spec.rb
+++ b/api/spec/models/concerns/spree/webhooks/has_webhooks_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
describe Spree::Webhooks::HasWebhooks do
let(:images) { create_list(:image, 2) }
- let(:store) { create(:store) }
+ let(:store) { Spree::Store.default }
let(:variant_with_images) { create(:variant, images: images) }
let(:variant) { build(:variant) }
let(:product) do
@@ -12,7 +12,6 @@ describe Spree::Webhooks::HasWebhooks do
stores: [store]
)
end
- let(:store) { create(:store) }
let!(:webhook_subscriber) { create(:webhook_subscriber, :active, subscriptions: ['*']) }
context 'with DISABLE_SPREE_WEBHOOKS equals "true" (set in spec_helper)' do
diff --git a/bin/build-ci.rb b/bin/build-ci.rb
index 4071add928..40a4772aa0 100755
--- a/bin/build-ci.rb
+++ b/bin/build-ci.rb
@@ -106,7 +106,7 @@ class Project
# @return [Boolean]
# the success of the tests
def run_tests
- system("circleci tests glob \"**/*_spec.rb\" | circleci tests run --command=\"xargs bundle exec rspec #{rspec_arguments.join(' ')}\"")
+ system("circleci tests glob \"spec/**/*_spec.rb\" | circleci tests run --command=\"xargs bundle exec rspec #{rspec_arguments.join(' ')}\" --split-by=timings")
end
def rspec_arguments(custom_name = name)
diff --git a/core/lib/spree/testing_support/factories/product_property_factory.rb b/core/lib/spree/testing_support/factories/product_property_factory.rb
index eb1f34e1c9..2fd514f85a 100644
--- a/core/lib/spree/testing_support/factories/product_property_factory.rb
+++ b/core/lib/spree/testing_support/factories/product_property_factory.rb
@@ -1,6 +1,6 @@
FactoryBot.define do
factory :product_property, class: Spree::ProductProperty do
- product { create(:product, stores: [create(:store)]) }
+ product { create(:product, stores: [Spree::Store.default]) }
value { "val-#{rand(50)}" }
property
end
diff --git a/core/lib/spree/testing_support/factories/variant_factory.rb b/core/lib/spree/testing_support/factories/variant_factory.rb
index 01f66c4961..c543757b44 100644
--- a/core/lib/spree/testing_support/factories/variant_factory.rb
+++ b/core/lib/spree/testing_support/factories/variant_factory.rb
@@ -12,7 +12,7 @@ FactoryBot.define do
is_master { 0 }
track_inventory { true }
- product { |p| p.association(:base_product, stores: [create(:store)]) }
+ product { |p| p.association(:base_product, stores: [Spree::Store.default]) }
option_values { [create(:option_value)] }
# ensure stock item will be created for this variant
@@ -28,7 +28,7 @@ FactoryBot.define do
factory :variant do
# on_hand 5
- product { |p| p.association(:product, stores: [create(:store)]) }
+ product { |p| p.association(:product, stores: [Spree::Store.default]) }
factory :with_image_variant do
images { create_list(:image, 1) }
diff --git a/core/spec/finders/spree/products/find_spec.rb b/core/spec/finders/spree/products/find_spec.rb
index 38babe9996..6c567f6323 100644
--- a/core/spec/finders/spree/products/find_spec.rb
+++ b/core/spec/finders/spree/products/find_spec.rb
@@ -339,21 +339,6 @@ module Spree
it { expect(products).to match_array [product_2, product_3] }
end
-
- context 'products scope is another store' do
- let!(:scope) { store.products }
-
- context 'passed store has no taxons' do
- let(:store) { create(:store) }
- let(:params) { { store: store, filter: { taxons: parent_taxon.id } } }
-
- before do
- parent_taxon.products << product
- end
-
- it { expect(products).to be_empty }
- end
- end
end
describe 'filter by prices' do
diff --git a/core/spec/finders/spree/variants/option_types_finder_spec.rb b/core/spec/finders/spree/variants/option_types_finder_spec.rb
index da5f83d347..17fa6a5d0c 100644
--- a/core/spec/finders/spree/variants/option_types_finder_spec.rb
+++ b/core/spec/finders/spree/variants/option_types_finder_spec.rb
@@ -5,7 +5,7 @@ describe Spree::Variants::OptionTypesFinder do
let(:option_type_1) { create :option_type, position: 2 }
let(:option_type_2) { create :option_type, position: 1 }
- let(:product) { create :product, option_types: [option_type_1, option_type_2], stores: [create(:store)] }
+ let(:product) { create :product, option_types: [option_type_1, option_type_2], stores: [Spree::Store.default] }
let!(:variant_1) { create :variant, product: product, option_values: [option_value_1_1, option_value_2_2] }
let!(:variant_2) { create :variant, product: product, option_values: [option_value_1_2, option_value_2_1] }
diff --git a/core/spec/helpers/base_helper_spec.rb b/core/spec/helpers/base_helper_spec.rb
index 3da9abf551..c43680ae90 100644
--- a/core/spec/helpers/base_helper_spec.rb
+++ b/core/spec/helpers/base_helper_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
describe Spree::BaseHelper, type: :helper do
include described_class
- let(:current_store) { create :store }
+ let(:current_store) { Spree::Store.default }
before do
allow(controller).to receive(:controller_name).and_return('test')
diff --git a/core/spec/helpers/products_helper_spec.rb b/core/spec/helpers/products_helper_spec.rb
index c35697a31a..35d15761c6 100644
--- a/core/spec/helpers/products_helper_spec.rb
+++ b/core/spec/helpers/products_helper_spec.rb
@@ -4,7 +4,7 @@ module Spree
describe ProductsHelper, type: :helper do
include ProductsHelper
- let(:store) { create(:store) }
+ let(:store) { Spree::Store.default }
let(:product) { create(:product, stores: [store]) }
let(:currency) { 'USD' }
diff --git a/core/spec/jobs/spree/exports/generate_job_spec.rb b/core/spec/jobs/spree/exports/generate_job_spec.rb
index b9070ed5e5..63483ded24 100644
--- a/core/spec/jobs/spree/exports/generate_job_spec.rb
+++ b/core/spec/jobs/spree/exports/generate_job_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
RSpec.describe Spree::Exports::GenerateJob, type: :job do
- let(:store) { create(:store) }
+ let(:store) { Spree::Store.default }
let(:user) { create(:admin_user) }
let!(:export) { create(:product_export, store: store, user: user, format: 'csv') }
diff --git a/core/spec/mailers/spree/export_mailer_spec.rb b/core/spec/mailers/spree/export_mailer_spec.rb
index f1c358fa60..2ea05d7c59 100644
--- a/core/spec/mailers/spree/export_mailer_spec.rb
+++ b/core/spec/mailers/spree/export_mailer_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
RSpec.describe Spree::ExportMailer, type: :mailer do
- let(:store) { create(:store) }
+ let(:store) { Spree::Store.default }
let(:user) { create(:admin_user) }
let(:export) { create(:product_export, store: store, user: user) }
let(:spree) { Spree::Core::Engine.routes.url_helpers }
diff --git a/core/spec/models/spree/ability_spec.rb b/core/spec/models/spree/ability_spec.rb
index 8ea02dedc8..65b2bbf7da 100644
--- a/core/spec/models/spree/ability_spec.rb
+++ b/core/spec/models/spree/ability_spec.rb
@@ -20,7 +20,7 @@ class FooAbility
end
describe Spree::Ability, type: :model do
- let(:store) { create(:store) }
+ let(:store) { Spree::Store.default }
let(:user) { build(:user) }
let(:ability) { Spree::Ability.new(user) }
let(:token) { nil }
diff --git a/core/spec/models/spree/classification_spec.rb b/core/spec/models/spree/classification_spec.rb
index 7517d84ce3..aeb48efa0f 100644
--- a/core/spec/models/spree/classification_spec.rb
+++ b/core/spec/models/spree/classification_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
module Spree
describe Classification, type: :model do
- let(:store) { create(:store) }
+ let(:store) { Spree::Store.default }
# Regression test for #3494
let(:taxon_with_5_products) do
diff --git a/core/spec/models/spree/concerns/user_methods_spec.rb b/core/spec/models/spree/concerns/user_methods_spec.rb
index 9c5da24b06..4b3301bd76 100644
--- a/core/spec/models/spree/concerns/user_methods_spec.rb
+++ b/core/spec/models/spree/concerns/user_methods_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
describe Spree::UserMethods do
let(:test_user) { create :user }
- let(:current_store) { create :store }
+ let(:current_store) { Spree::Store.default }
describe '#has_spree_role?' do
subject { test_user.has_spree_role? name }
diff --git a/core/spec/models/spree/order/totals_spec.rb b/core/spec/models/spree/order/totals_spec.rb
index 912c73f583..c986f914b6 100644
--- a/core/spec/models/spree/order/totals_spec.rb
+++ b/core/spec/models/spree/order/totals_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
module Spree
describe Order, type: :model do
- let(:store) { create(:store) }
+ let(:store) { Spree::Store.default }
let(:order) { create(:order, store: store) }
let(:shirt) { create(:variant) }
diff --git a/core/spec/models/spree/payment/store_credit_spec.rb b/core/spec/models/spree/payment/store_credit_spec.rb
index ecf6420587..534f11bfc7 100644
--- a/core/spec/models/spree/payment/store_credit_spec.rb
+++ b/core/spec/models/spree/payment/store_credit_spec.rb
@@ -4,7 +4,7 @@ describe 'Payment' do
context '#cancel!' do
subject { payment.cancel! }
- let(:store) { create(:store) }
+ let(:store) { Spree::Store.default }
context 'a store credit' do
let(:store_credit) { create(:store_credit, amount_used: captured_amount, store: store) }
diff --git a/core/spec/models/spree/payment_method/store_credit_spec.rb b/core/spec/models/spree/payment_method/store_credit_spec.rb
index 66d0ed9699..90b1cb496d 100644
--- a/core/spec/models/spree/payment_method/store_credit_spec.rb
+++ b/core/spec/models/spree/payment_method/store_credit_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
describe Spree::PaymentMethod::StoreCredit do
- let(:store) { create(:store) }
+ let(:store) { Spree::Store.default }
let(:order) { create(:order, store: store) }
let(:payment) { create(:payment, order: order) }
let(:gateway_options) { payment.gateway_options }
@@ -294,7 +294,7 @@ describe Spree::PaymentMethod::StoreCredit do
let!(:store_credit_payment_method) { create(:store_credit_payment_method, display_on: 'both') }
context 'when user have store credits' do
- let(:store) { create(:store) }
+ let(:store) { Spree::Store.default }
let!(:user_with_store_credits) { create(:user) }
let!(:store_credit) { create(:store_credit, user: user_with_store_credits, store: store) }
let!(:order_with_store_credit) { create(:order, user: user_with_store_credits, store: store) }
diff --git a/core/spec/models/spree/payment_spec.rb b/core/spec/models/spree/payment_spec.rb
index 96ef539732..62f3747f17 100644
--- a/core/spec/models/spree/payment_spec.rb
+++ b/core/spec/models/spree/payment_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
describe Spree::Payment, type: :model do
- let(:store) { create(:store) }
+ let(:store) { Spree::Store.default }
let(:order) { store.orders.create }
let(:refund_reason) { create(:refund_reason) }
diff --git a/core/spec/models/spree/product/scopes_spec.rb b/core/spec/models/spree/product/scopes_spec.rb
index 0ecd2bacca..84091bf5f1 100644
--- a/core/spec/models/spree/product/scopes_spec.rb
+++ b/core/spec/models/spree/product/scopes_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
describe 'Product scopes', type: :model do
- let(:store) { create(:store) }
+ let(:store) { Spree::Store.default }
let!(:product) { create(:product, stores: [store]) }
describe '#available' do
@@ -309,9 +309,10 @@ describe 'Product scopes', type: :model do
describe '#for_store' do
subject(:products_by_store) { Spree::Product.for_store(store) }
+ let(:another_store) { create(:store) }
before do
- create_list(:product, 3, stores: [create(:store)])
+ create_list(:product, 3, stores: [another_store])
end
it 'returns products assigned to a store' do
diff --git a/core/spec/models/spree/product_filter_spec.rb b/core/spec/models/spree/product_filter_spec.rb
index e30a6fad84..2a5b84b9c9 100644
--- a/core/spec/models/spree/product_filter_spec.rb
+++ b/core/spec/models/spree/product_filter_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
require 'spree/core/product_filters'
describe 'product filters', type: :model do
- let(:store) { create(:store) }
+ let(:store) { Spree::Store.default }
# Regression test for #1709
context 'finds products filtered by brand' do
diff --git a/core/spec/models/spree/product_spec.rb b/core/spec/models/spree/product_spec.rb
index 14c1936b4f..bada43593d 100644
--- a/core/spec/models/spree/product_spec.rb
+++ b/core/spec/models/spree/product_spec.rb
@@ -866,7 +866,7 @@ describe Spree::Product, type: :model do
end
context 'store passed' do
- let(:store) { create(:store) }
+ let(:store) { Spree::Store.default }
let(:product) { create(:product, stores: [store]) }
it 'does not auto-assign store' do
@@ -1062,7 +1062,7 @@ describe Spree::Product, type: :model do
end
describe '#to_csv' do
- let(:store) { create(:store) }
+ let(:store) { Spree::Store.default }
let(:product) { create(:product, stores: [store]) }
let(:property) { create(:property, name: 'my-property', position: 1) }
let(:product_property) { create(:product_property, property: property, product: product, value: 'MyValue') }
diff --git a/core/spec/models/spree/promotion/rules/first_order_spec.rb b/core/spec/models/spree/promotion/rules/first_order_spec.rb
index 70d0e0d244..7f368ab828 100644
--- a/core/spec/models/spree/promotion/rules/first_order_spec.rb
+++ b/core/spec/models/spree/promotion/rules/first_order_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
describe Spree::Promotion::Rules::FirstOrder, type: :model do
- let(:store) { create(:store) }
+ let(:store) { Spree::Store.default }
let(:rule) { described_class.new }
let(:user) { create(:user) }
diff --git a/core/spec/models/spree/promotion/rules/taxon_spec.rb b/core/spec/models/spree/promotion/rules/taxon_spec.rb
index aa7b8c18c6..0339ca83a1 100644
--- a/core/spec/models/spree/promotion/rules/taxon_spec.rb
+++ b/core/spec/models/spree/promotion/rules/taxon_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
describe Spree::Promotion::Rules::Taxon, type: :model do
let(:rule) { subject }
- let(:store) { create(:store) }
+ let(:store) { Spree::Store.default }
context '#eligible?(order)' do
let(:taxonomy) { create(:taxonomy, store: store) }
diff --git a/core/spec/models/spree/promotion_handler/promotion_duplicator_spec.rb b/core/spec/models/spree/promotion_handler/promotion_duplicator_spec.rb
index 12854d05de..7e3e193545 100644
--- a/core/spec/models/spree/promotion_handler/promotion_duplicator_spec.rb
+++ b/core/spec/models/spree/promotion_handler/promotion_duplicator_spec.rb
@@ -6,7 +6,7 @@ describe Spree::PromotionHandler::PromotionDuplicator do
let!(:promo_category) { create(:promotion_category) }
let!(:calculator) { create(:calculator) }
- let(:store) { create(:store) }
+ let(:store) { Spree::Store.default }
let(:store_2) { create(:store) }
let!(:promotion) do
create(:promotion_with_item_total_rule,
diff --git a/core/spec/models/spree/promotion_spec.rb b/core/spec/models/spree/promotion_spec.rb
index 9dcd58de88..65cf5551b0 100644
--- a/core/spec/models/spree/promotion_spec.rb
+++ b/core/spec/models/spree/promotion_spec.rb
@@ -3,11 +3,11 @@ require 'spec_helper'
describe Spree::Promotion, type: :model do
it_behaves_like 'metadata'
- let(:store) { create(:store) }
+ let(:store) { Spree::Store.default }
let(:promotion) { create(:promotion, kind: :automatic) }
describe 'validations' do
- let!(:valid_promotion) { build(:promotion, name: 'A promotion', stores: [create(:store)], kind: :automatic) }
+ let!(:valid_promotion) { build(:promotion, name: 'A promotion', stores: [store], kind: :automatic) }
it 'valid_promotion is valid' do
expect(valid_promotion).to be_valid
diff --git a/core/spec/models/spree/property_spec.rb b/core/spec/models/spree/property_spec.rb
index 6207a57332..692e8d784d 100644
--- a/core/spec/models/spree/property_spec.rb
+++ b/core/spec/models/spree/property_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
describe Spree::Property, type: :model do
- let(:store) { create(:store) }
+ let(:store) { Spree::Store.default }
it_behaves_like 'metadata'
diff --git a/core/spec/models/spree/reimbursement_spec.rb b/core/spec/models/spree/reimbursement_spec.rb
index f58301e70d..c07c2f8595 100644
--- a/core/spec/models/spree/reimbursement_spec.rb
+++ b/core/spec/models/spree/reimbursement_spec.rb
@@ -40,7 +40,7 @@ describe Spree::Reimbursement, type: :model do
let!(:tax_rate) { nil }
let!(:tax_zone) { create(:zone_with_country, default_tax: true) }
- let(:store) { create(:store) }
+ let(:store) { Spree::Store.default }
let(:order) { create(:shipped_order, line_items_count: 1, line_items_price: line_items_price, shipment_cost: 0, store: store) }
let(:line_items_price) { BigDecimal(10) }
let(:line_item) { order.line_items.first }
diff --git a/core/spec/models/spree/return_item/exchange_variant_eligibility/same_product_spec.rb b/core/spec/models/spree/return_item/exchange_variant_eligibility/same_product_spec.rb
index 481f32b367..9207629e66 100644
--- a/core/spec/models/spree/return_item/exchange_variant_eligibility/same_product_spec.rb
+++ b/core/spec/models/spree/return_item/exchange_variant_eligibility/same_product_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
module Spree
module ReturnItem::ExchangeVariantEligibility
describe SameProduct, type: :model do
- let(:store) { create(:store) }
+ let(:store) { Spree::Store.default }
describe '.eligible_variants' do
context 'product has no variants' do
diff --git a/core/spec/models/spree/shipment_spec.rb b/core/spec/models/spree/shipment_spec.rb
index 326e3dd342..19443126c4 100644
--- a/core/spec/models/spree/shipment_spec.rb
+++ b/core/spec/models/spree/shipment_spec.rb
@@ -234,7 +234,7 @@ describe Spree::Shipment, type: :model do
end
context '#store' do
- let(:store) { create(:store) }
+ let(:store) { Spree::Store.default }
let!(:order) { create(:order, store: store) }
let!(:shipment) { create(:shipment, cost: 10, order: order) }
diff --git a/core/spec/models/spree/stock/coordinator_spec.rb b/core/spec/models/spree/stock/coordinator_spec.rb
index 901ba84c60..e151a3952c 100644
--- a/core/spec/models/spree/stock/coordinator_spec.rb
+++ b/core/spec/models/spree/stock/coordinator_spec.rb
@@ -5,7 +5,7 @@ module Spree
describe Coordinator, type: :model do
subject { Coordinator.new(order) }
- let(:store) { create(:store) }
+ let(:store) { Spree::Store.default }
let(:order) { create(:order_with_line_items, store: store) }
context 'packages' do
diff --git a/core/spec/models/spree/store_credit_event_spec.rb b/core/spec/models/spree/store_credit_event_spec.rb
index cbc095eec8..39aa9f037e 100644
--- a/core/spec/models/spree/store_credit_event_spec.rb
+++ b/core/spec/models/spree/store_credit_event_spec.rb
@@ -75,7 +75,7 @@ describe 'StoreCreditEvent' do
end
describe '#order' do
- let(:store) { create(:store) }
+ let(:store) { Spree::Store.default }
let(:store_credit) { create(:store_credit, store: store) }
context 'there is no associated payment with the event' do
@@ -104,7 +104,7 @@ describe 'StoreCreditEvent' do
end
describe '#store' do
- let(:store) { create(:store) }
+ let(:store) { Spree::Store.default }
let(:store_credit) { create(:store_credit, store: store) }
subject { build(:store_credit_auth_event, store_credit: store_credit) }
diff --git a/core/spec/models/spree/store_spec.rb b/core/spec/models/spree/store_spec.rb
index be1a356a9a..975281fb2d 100644
--- a/core/spec/models/spree/store_spec.rb
+++ b/core/spec/models/spree/store_spec.rb
@@ -603,7 +603,7 @@ describe Spree::Store, type: :model do
end
context 'without an attached favicon image' do
- let(:store) { create(:store) }
+ let(:store) { Spree::Store.default }
it 'returns a blank favicon' do
expect(favicon).to be(nil)
diff --git a/core/spec/models/spree/user_spec.rb b/core/spec/models/spree/user_spec.rb
index 7ab023e739..1b84c7e07c 100644
--- a/core/spec/models/spree/user_spec.rb
+++ b/core/spec/models/spree/user_spec.rb
@@ -4,8 +4,8 @@ describe Spree::LegacyUser, type: :model do # rubocop:disable RSpec/MultipleDesc
# Regression test for #2844 + #3346
context '#last_incomplete_order' do
let!(:user) { create(:user) }
- let!(:order) { create(:order, bill_address: create(:address), ship_address: create(:address)) }
- let(:store) { create :store }
+ let!(:order) { create(:order, store: store, bill_address: create(:address), ship_address: create(:address)) }
+ let(:store) { Spree::Store.default }
let(:order_1) { create(:order, created_at: 1.day.ago, user: user, created_by: user, store: store) }
let(:order_2) { create(:order, user: user, created_by: user, store: store) }
@@ -73,7 +73,7 @@ describe Spree.user_class, type: :model do
context 'reporting' do
let!(:orders) { create_list(:order, order_count, user: subject, store: store, total: order_value, completed_at: Date.today, currency: currency) }
let(:currency) { 'USD' }
- let(:store) { create :store }
+ let(:store) { Spree::Store.default }
let(:order_value) { BigDecimal('80.94') }
let(:order_count) { 4 }
@@ -227,7 +227,7 @@ describe Spree.user_class, type: :model do
end
describe '#available_store_credits' do
- let(:store) { create(:store) }
+ let(:store) { Spree::Store.default }
context 'user does not have any associated store credits' do
subject { create(:user) }
diff --git a/core/spec/presenters/spree/csv/order_line_items_presenter_spec.rb b/core/spec/presenters/spree/csv/order_line_items_presenter_spec.rb
index efd955e532..d280fea9e1 100644
--- a/core/spec/presenters/spree/csv/order_line_items_presenter_spec.rb
+++ b/core/spec/presenters/spree/csv/order_line_items_presenter_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
RSpec.describe Spree::CSV::OrderLineItemPresenter do
- let(:store) { create(:store) }
+ let(:store) { Spree::Store.default }
let(:order) { create(:completed_order_with_totals, store: store) }
let(:line_item) { order.line_items.first }
let(:index) { 0 }
diff --git a/core/spec/presenters/spree/csv/product_variant_presenter_spec.rb b/core/spec/presenters/spree/csv/product_variant_presenter_spec.rb
index 4ac5acb59e..4082e21359 100644
--- a/core/spec/presenters/spree/csv/product_variant_presenter_spec.rb
+++ b/core/spec/presenters/spree/csv/product_variant_presenter_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
RSpec.describe Spree::CSV::ProductVariantPresenter do
- let(:store) { create(:store) }
+ let(:store) { Spree::Store.default }
let(:product) { create(:product, stores: [store]) }
let(:variant) { product.master }
let(:properties) { [] }
diff --git a/core/spec/presenters/spree/variants/option_types_presenter_spec.rb b/core/spec/presenters/spree/variants/option_types_presenter_spec.rb
index 1deaf40edc..e055eeb806 100644
--- a/core/spec/presenters/spree/variants/option_types_presenter_spec.rb
+++ b/core/spec/presenters/spree/variants/option_types_presenter_spec.rb
@@ -4,7 +4,7 @@ describe Spree::Variants::OptionTypesPresenter do
let(:option_type_1) { create :option_type, position: 2 }
let(:option_type_2) { create :option_type, position: 1 }
- let(:product) { create :product, option_types: [option_type_1, option_type_2], stores: [create(:store)] }
+ let(:product) { create :product, option_types: [option_type_1, option_type_2] }
let(:product_2) { create :product, option_types: [option_type_1, option_type_2] }
let!(:variant_0) { create :variant, product: product, option_values: [option_value_1_0, option_value_2_0] }
diff --git a/core/spec/services/spree/cart/set_quantity_spec.rb b/core/spec/services/spree/cart/set_quantity_spec.rb
index fdfdb653c3..c1e6fab31e 100644
--- a/core/spec/services/spree/cart/set_quantity_spec.rb
+++ b/core/spec/services/spree/cart/set_quantity_spec.rb
@@ -4,7 +4,7 @@ module Spree
describe Cart::SetQuantity do
subject { described_class }
- let(:store) { create(:store) }
+ let(:store) { Spree::Store.default }
let(:order) { create(:order, store: store) }
let(:line_item) { create(:line_item, order: order) }
diff --git a/core/spec/services/spree/checkout/add_store_credit_spec.rb b/core/spec/services/spree/checkout/add_store_credit_spec.rb
index 7150b3c7e1..a31771dece 100644
--- a/core/spec/services/spree/checkout/add_store_credit_spec.rb
+++ b/core/spec/services/spree/checkout/add_store_credit_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
describe Spree::Checkout::AddStoreCredit, type: :service do
- let(:store) { create(:store) }
+ let(:store) { Spree::Store.default }
describe '#call' do
subject { described_class.call(order: order) }
diff --git a/core/spec/services/spree/checkout/remove_store_credit_spec.rb b/core/spec/services/spree/checkout/remove_store_credit_spec.rb
index 25ff4fe04c..dc8803b666 100644
--- a/core/spec/services/spree/checkout/remove_store_credit_spec.rb
+++ b/core/spec/services/spree/checkout/remove_store_credit_spec.rb
@@ -4,7 +4,7 @@ describe Spree::Checkout::RemoveStoreCredit, type: :service do
describe '#call' do
subject { described_class.call(order: order) }
- let(:store) { create(:store) }
+ let(:store) { Spree::Store.default }
let(:order_total) { 500.00 }
let(:order) { create(:order, user: store_credit.user, total: order_total, store: store) }
diff --git a/core/spec/services/spree/data_feeds/google/rss_spec.rb b/core/spec/services/spree/data_feeds/google/rss_spec.rb
index 2f0dc297c1..6ba8df473f 100644
--- a/core/spec/services/spree/data_feeds/google/rss_spec.rb
+++ b/core/spec/services/spree/data_feeds/google/rss_spec.rb
@@ -4,7 +4,7 @@ module Spree
describe DataFeeds::Google::Rss do
subject { described_class.new }
- let(:store) { create(:store) }
+ let(:store) { Spree::Store.default }
let(:data_feed) { create(:google_data_feed, store: store) }
let(:product) { create(:product, stores: [store]) }
let!(:variant) { create(:with_image_variant, product: product) }
diff --git a/core/spec/services/spree/payments/create_spec.rb b/core/spec/services/spree/payments/create_spec.rb
index 4acd76c225..288ec2b92f 100644
--- a/core/spec/services/spree/payments/create_spec.rb
+++ b/core/spec/services/spree/payments/create_spec.rb
@@ -4,7 +4,7 @@ module Spree
describe Payments::Create do
subject { described_class }
- let(:store) { create(:store) }
+ let(:store) { Spree::Store.default }
let(:order) { create(:order_with_totals, store: store, user: nil, email: '[email protected]') }
let(:execute) { subject.call(order: order, params: params) }
diff --git a/core/spec/services/spree/products/duplicator_spec.rb b/core/spec/services/spree/products/duplicator_spec.rb
index 71cec17eca..c8904faa0b 100644
--- a/core/spec/services/spree/products/duplicator_spec.rb
+++ b/core/spec/services/spree/products/duplicator_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
RSpec.describe Spree::Products::Duplicator do
subject(:duplicate) { described_class.call(product: product) }
- let(:store) { create(:store) }
+ let(:store) { Spree::Store.default }
let!(:product_property) { create(:product_property, product: product) }
let!(:product) { create(:product, stores: [store], tag_list: ['tag1', 'tag2'], status: :active) }
diff --git a/core/spec/services/spree/shipments/add_item_spec.rb b/core/spec/services/spree/shipments/add_item_spec.rb
index f43e3f141f..22aed96a73 100644
--- a/core/spec/services/spree/shipments/add_item_spec.rb
+++ b/core/spec/services/spree/shipments/add_item_spec.rb
@@ -4,7 +4,7 @@ module Spree
describe Shipments::AddItem do
subject { described_class }
- let(:store) { create(:store) }
+ let(:store) { Spree::Store.default }
let(:order) { create(:order_with_totals, store: store, user: nil, email: '[email protected]') }
let(:product) { create(:product_in_stock, stores: [store]) }
let(:variant) { product.master }
diff --git a/core/spec/services/spree/shipments/create_spec.rb b/core/spec/services/spree/shipments/create_spec.rb
index 1bd111bcf2..b4e7ec4f0e 100644
--- a/core/spec/services/spree/shipments/create_spec.rb
+++ b/core/spec/services/spree/shipments/create_spec.rb
@@ -4,7 +4,7 @@ module Spree
describe Shipments::Create do
subject { described_class }
- let(:store) { create(:store) }
+ let(:store) { Spree::Store.default }
let(:order) { create(:order_with_totals, store: store, user: nil, email: '[email protected]') }
let(:product) { create(:product_in_stock, stores: [store]) }
let(:variant) { product.master }
diff --git a/core/spec/services/spree/shipments/remove_item_spec.rb b/core/spec/services/spree/shipments/remove_item_spec.rb
index 055592c43b..a15b8bb9e9 100644
--- a/core/spec/services/spree/shipments/remove_item_spec.rb
+++ b/core/spec/services/spree/shipments/remove_item_spec.rb
@@ -4,7 +4,7 @@ module Spree
describe Shipments::RemoveItem do
subject { described_class }
- let(:store) { create(:store) }
+ let(:store) { Spree::Store.default }
let(:order) { create(:order_ready_to_ship, store: store, user: nil, email: '[email protected]') }
let(:variant) { shipment.line_items.first.variant }
let(:shipment) { order.shipments.first }
diff --git a/core/spec/services/spree/wallet/create_payment_source_spec.rb b/core/spec/services/spree/wallet/create_payment_source_spec.rb
index b56bd0d81a..baa09a5c5a 100644
--- a/core/spec/services/spree/wallet/create_payment_source_spec.rb
+++ b/core/spec/services/spree/wallet/create_payment_source_spec.rb
@@ -4,7 +4,7 @@ module Spree
describe Wallet::CreatePaymentSource do
subject { described_class }
- let(:store) { create(:store) }
+ let(:store) { Spree::Store.default }
let(:execute) { subject.call(payment_method: payment_method, params: params) }
let(:value) { execute.value }
diff --git a/emails/spec/models/spree/reimbursement_spec.rb b/emails/spec/models/spree/reimbursement_spec.rb
index ce7a9a73cc..b22047f5c7 100644
--- a/emails/spec/models/spree/reimbursement_spec.rb
+++ b/emails/spec/models/spree/reimbursement_spec.rb
@@ -9,7 +9,7 @@ describe Spree::Reimbursement, type: :model do
let!(:tax_rate) { nil }
let!(:tax_zone) { create(:zone_with_country, default_tax: true) }
- let(:store) { create(:store) }
+ let(:store) { Spree::Store.default }
let(:order) { create(:shipped_order, line_items_count: 1, line_items_price: line_items_price, shipment_cost: 0, store: store) }
let(:line_items_price) { BigDecimal(10) }
let(:line_item) { order.line_items.first }