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.

Removed database_cleaner from test dependencies (#14946)

Damian Legawieca6ff3fd26028
diff --git a/packages/dashboard/e2e/global-setup.ts b/packages/dashboard/e2e/global-setup.ts
index ad9c8c6ec8..6fc0548ecc 100644
--- a/packages/dashboard/e2e/global-setup.ts
+++ b/packages/dashboard/e2e/global-setup.ts
@@ -56,10 +56,17 @@ import {
import { API_GEM_DIR, rmIfExists, runRailsBootstrap, startRails } from './rails'
const PORT = process.env.E2E_RAILS_PORT || '3010'
-// Mirrors `spec/dummy/config/database.yml`.
-const TEST_SQLITE = resolve(API_GEM_DIR, 'spec/dummy/db/spree_test.sqlite3')
+// A database of its own, so the seeded data left behind after a run never
+// reaches the API gem's RSpec suite, which shares the dummy app.
+const TEST_SQLITE = resolve(API_GEM_DIR, 'spec/dummy/db/spree_test_e2e.sqlite3')
-const RAILS_ENV = { ...process.env, RAILS_ENV: 'test', PORT, DASHBOARD_E2E: '1' }
+const RAILS_ENV = {
+ ...process.env,
+ RAILS_ENV: 'test',
+ PORT,
+ DASHBOARD_E2E: '1',
+ DATABASE_URL: `sqlite3:${TEST_SQLITE}`,
+}
// Customer's last name is derived from the full name so the seeder and the
// matching `full_name` assertion in promotions.spec stay in sync.
diff --git a/spree/api/spec/spec_helper.rb b/spree/api/spec/spec_helper.rb
index b03b6f42e6..6d9763f992 100644
--- a/spree/api/spec/spec_helper.rb
+++ b/spree/api/spec/spec_helper.rb
@@ -37,7 +37,6 @@ end
require 'spree/api/testing_support/always_register_type_hints'
require 'rspec/rails'
-require 'database_cleaner/active_record'
require 'ffaker'
require 'webmock/rspec'
require 'i18n/tasks'
@@ -85,8 +84,6 @@ RSpec.configure do |config|
config.before(:suite) do
Spree::Events.disable!
- # Clean out the database state before the tests run
- DatabaseCleaner.clean_with(:truncation)
end
# Re-enable events for specs that need them
diff --git a/spree/common_spree_dependencies.rb b/spree/common_spree_dependencies.rb
index e028837ebb..dc7d1f3e3e 100644
--- a/spree/common_spree_dependencies.rb
+++ b/spree/common_spree_dependencies.rb
@@ -25,7 +25,6 @@ end
group :test do
gem 'parallel_tests'
- gem 'database_cleaner-active_record'
gem 'email_spec'
gem 'factory_bot_rails', '~> 6.2.0'
gem 'rspec-rails'
diff --git a/spree/core/spec/services/spree/sample_data/loader_spec.rb b/spree/core/spec/services/spree/sample_data/loader_spec.rb
index 1fd231e448..e1dcf8f02a 100644
--- a/spree/core/spec/services/spree/sample_data/loader_spec.rb
+++ b/spree/core/spec/services/spree/sample_data/loader_spec.rb
@@ -1,8 +1,11 @@
require 'spec_helper'
RSpec.describe Spree::SampleData::Loader, type: :service, without_global_store: true do
+ # The catalog is loaded once for the whole group, outside the per-example
+ # transactions, so the group wraps it in a transaction of its own and rolls
+ # it back afterwards.
before(:all) do
- DatabaseCleaner.clean_with(:truncation)
+ ActiveRecord::Base.lease_connection.begin_transaction(joinable: false)
# The seed only mints an admin with explicit credentials (no dummy
# defaults since 6.0), and the sample-data imports need one as owner.
# ENV is process-global, so the originals are restored rather than
@@ -26,7 +29,7 @@ RSpec.describe Spree::SampleData::Loader, type: :service, without_global_store:
end
after(:all) do
- DatabaseCleaner.clean_with(:truncation)
+ ActiveRecord::Base.lease_connection.rollback_transaction
end
it 'creates products' do
diff --git a/spree/core/spec/spec_helper.rb b/spree/core/spec/spec_helper.rb
index 9401024228..0447a928b9 100644
--- a/spree/core/spec/spec_helper.rb
+++ b/spree/core/spec/spec_helper.rb
@@ -47,7 +47,6 @@ rescue LoadError
end
require 'rspec/rails'
-require 'database_cleaner/active_record'
require 'ffaker'
Dir['./spec/support/**/*.rb'].sort.each { |f| require f }
@@ -85,8 +84,6 @@ RSpec.configure do |config|
config.before(:suite) do
Spree::Events.disable!
- # Clean out the database state before the tests run
- DatabaseCleaner.clean_with(:truncation)
end
# Re-enable events for specs that need them
diff --git a/spree/dashboard/spec/spec_helper.rb b/spree/dashboard/spec/spec_helper.rb
index 4811e8fbb4..b5951d7245 100644
--- a/spree/dashboard/spec/spec_helper.rb
+++ b/spree/dashboard/spec/spec_helper.rb
@@ -38,7 +38,6 @@ rescue LoadError
end
require 'rspec/rails'
-require 'database_cleaner/active_record'
require 'ffaker'
Dir['./spec/support/**/*.rb'].sort.each { |f| require f }
@@ -67,8 +66,6 @@ RSpec.configure do |config|
config.before(:suite) do
Spree::Events.disable!
- # Clean out the database state before the tests run
- DatabaseCleaner.clean_with(:truncation)
end
# Re-enable events for specs that need them
diff --git a/spree/emails/spec/spec_helper.rb b/spree/emails/spec/spec_helper.rb
index 16267b3e56..73ec8b8023 100644
--- a/spree/emails/spec/spec_helper.rb
+++ b/spree/emails/spec/spec_helper.rb
@@ -38,7 +38,6 @@ rescue LoadError
end
require 'rspec/rails'
-require 'database_cleaner/active_record'
require 'ffaker'
Dir['./spec/support/**/*.rb'].sort.each { |f| require f }
@@ -68,8 +67,6 @@ RSpec.configure do |config|
config.before(:suite) do
Spree::Events.disable!
- # Clean out the database state before the tests run
- DatabaseCleaner.clean_with(:truncation)
end
# Re-enable events for specs that need them
diff --git a/spree/mcp/spec/spec_helper.rb b/spree/mcp/spec/spec_helper.rb
index 144d44429d..b62d509dc8 100644
--- a/spree/mcp/spec/spec_helper.rb
+++ b/spree/mcp/spec/spec_helper.rb
@@ -9,7 +9,6 @@ rescue LoadError
end
require 'rspec/rails'
-require 'database_cleaner/active_record'
require 'spree/testing_support/factories'
require 'spree/testing_support/jobs'
diff --git a/spree/opentelemetry/spec/spec_helper.rb b/spree/opentelemetry/spec/spec_helper.rb
index ad47d87bc9..1beb6064ab 100644
--- a/spree/opentelemetry/spec/spec_helper.rb
+++ b/spree/opentelemetry/spec/spec_helper.rb
@@ -12,7 +12,6 @@ rescue LoadError
end
require 'rspec/rails'
-require 'database_cleaner/active_record'
require 'spree/testing_support/factories'
require 'spree/testing_support/jobs'
diff --git a/spree/providers/easypost/spec/spec_helper.rb b/spree/providers/easypost/spec/spec_helper.rb
index 4a69e6eeaf..f2b6c2d554 100644
--- a/spree/providers/easypost/spec/spec_helper.rb
+++ b/spree/providers/easypost/spec/spec_helper.rb
@@ -23,7 +23,6 @@ rescue LoadError
end
require 'rspec/rails'
-require 'database_cleaner/active_record'
require 'ffaker'
Dir['./spec/support/**/*.rb'].sort.each { |f| require f }
diff --git a/spree/providers/meilisearch/spec/spec_helper.rb b/spree/providers/meilisearch/spec/spec_helper.rb
index ad012293fc..47969833c7 100644
--- a/spree/providers/meilisearch/spec/spec_helper.rb
+++ b/spree/providers/meilisearch/spec/spec_helper.rb
@@ -27,7 +27,6 @@ rescue LoadError
end
require 'rspec/rails'
-require 'database_cleaner/active_record'
require 'ffaker'
require 'webmock/rspec'
diff --git a/spree/providers/stripe/spec/spec_helper.rb b/spree/providers/stripe/spec/spec_helper.rb
index 765d07f1ad..9c8df67cfc 100644
--- a/spree/providers/stripe/spec/spec_helper.rb
+++ b/spree/providers/stripe/spec/spec_helper.rb
@@ -32,7 +32,6 @@ rescue LoadError
end
require 'rspec/rails'
-require 'database_cleaner/active_record'
require 'ffaker'
Dir['./spec/support/**/*.rb'].sort.each { |f| require f }
@@ -57,7 +56,6 @@ RSpec.configure do |config|
config.before(:suite) do
Spree::Events.disable!
- DatabaseCleaner.clean_with(:truncation)
end
config.around(:each, events: true) do |example|