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.

Set Circle CI parallelism to 3 (#11378)

Damian Legawiec9b2b70c99c40
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6b3be75cb7..1332179dca 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -20,7 +20,7 @@ defaults_3_0: &defaults_3_0
run_tests: &run_tests
<<: *defaults
- parallelism: 2
+ parallelism: 3
steps:
- checkout
- restore_cache:
@@ -41,7 +41,7 @@ run_tests: &run_tests
run_tests_3_0: &run_tests_3_0
<<: *defaults_3_0
- parallelism: 2
+ parallelism: 3
steps:
- checkout
- restore_cache:
diff --git a/bin/build-ci.rb b/bin/build-ci.rb
index c036ffaffa..9e90bbb1a1 100755
--- a/bin/build-ci.rb
+++ b/bin/build-ci.rb
@@ -21,7 +21,7 @@ class Project
@name = name
end
- ALL = %w[api core emails sample].map(&method(:new)).freeze
+ ALL = %w[emails api core sample].map(&method(:new)).freeze
CORE_GEMS = %w[api core].freeze
# Install subproject
diff --git a/sample/db/samples/payment_methods.rb b/sample/db/samples/payment_methods.rb
index 2395389f16..2eb8dc9b10 100644
--- a/sample/db/samples/payment_methods.rb
+++ b/sample/db/samples/payment_methods.rb
@@ -1,3 +1,5 @@
+Spree::Sample.load_sample('stores')
+
cc_payment_method = Spree::Gateway::Bogus.where(
name: 'Credit Card',
description: 'Bogus payment gateway.',
@@ -5,7 +7,7 @@ cc_payment_method = Spree::Gateway::Bogus.where(
).first_or_initialize
cc_payment_method.stores = Spree::Store.all
-cc_payment_method.save
+cc_payment_method.save!
check_paymemt_method = Spree::PaymentMethod::Check.where(
name: 'Check',
@@ -14,4 +16,4 @@ check_paymemt_method = Spree::PaymentMethod::Check.where(
).first_or_initialize
check_paymemt_method.stores = Spree::Store.all
-check_paymemt_method.save
+check_paymemt_method.save!
diff --git a/sample/spec/lib/load_sample_spec.rb b/sample/spec/lib/load_sample_spec.rb
index ddc443517f..67749dcf93 100644
--- a/sample/spec/lib/load_sample_spec.rb
+++ b/sample/spec/lib/load_sample_spec.rb
@@ -1,17 +1,9 @@
require 'spec_helper'
describe 'Load samples' do
- before do
- # Seeds are only run for rake test_app so to allow this spec to pass without
- # rerunning rake test_app every time we must load them in if not already.
- unless Spree::Zone.find_by(name: 'North America')
- load Rails.root + 'Rakefile'
- load Rails.root + 'db/seeds.rb'
- end
- end
-
it 'doesnt raise any error' do
expect do
+ Spree::Seeds::All.call
SpreeSample::Engine.load_samples
end.not_to raise_error
end
diff --git a/sample/spec/spec_helper.rb b/sample/spec/spec_helper.rb
index 9249ccea92..93001e01fd 100644
--- a/sample/spec/spec_helper.rb
+++ b/sample/spec/spec_helper.rb
@@ -7,6 +7,8 @@ require 'rspec/rails'
require 'ffaker'
require 'spree_sample'
+require 'spree/testing_support/preferences'
+
RSpec.configure do |config|
config.color = true
config.default_formatter = 'doc'
@@ -25,7 +27,26 @@ RSpec.configure do |config|
config.order = :random
Kernel.srand config.seed
+ config.include Spree::TestingSupport::Preferences
+
config.before do
- Spree::Seeds::All.call
+ begin
+ Rails.cache.clear
+ reset_spree_preferences
+ rescue Errno::ENOTEMPTY
+ end
+ end
+
+ config.before(:suite) do
+ DatabaseCleaner.strategy = :transaction
+ DatabaseCleaner.clean_with(:truncation)
+ end
+
+ config.before(:suite) do
+ DatabaseCleaner.start
+ end
+
+ config.append_after do
+ DatabaseCleaner.clean
end
end
diff --git a/sample/spec/support/database_cleaner.rb b/sample/spec/support/database_cleaner.rb
deleted file mode 100644
index 2c2d42763e..0000000000
--- a/sample/spec/support/database_cleaner.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-RSpec.configure do |config|
- config.before(:suite) do
- DatabaseCleaner.strategy = :transaction
- DatabaseCleaner.clean_with(:truncation)
- end
-
- config.before do
- DatabaseCleaner.start
- end
-
- config.append_after do
- DatabaseCleaner.clean
- end
-end