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.

Additional database-cleaner CI improvements (#13527)

Damian Legawiece7abadfe99b4
diff --git a/core/lib/spree/testing_support/store.rb b/core/lib/spree/testing_support/store.rb
index 2011a05089..871ddac659 100644
--- a/core/lib/spree/testing_support/store.rb
+++ b/core/lib/spree/testing_support/store.rb
@@ -34,10 +34,6 @@ RSpec.configure do |config|
end
config.after(:all) do
- unless self.class.metadata[:without_global_store]
- DatabaseCleaner.strategy = :transaction
- DatabaseCleaner.clean_with(:truncation)
- clear_enqueued_jobs
- end
+ clear_enqueued_jobs
end
end
diff --git a/core/spec/models/spree/store_spec.rb b/core/spec/models/spree/store_spec.rb
index 725bf37619..02031d260b 100644
--- a/core/spec/models/spree/store_spec.rb
+++ b/core/spec/models/spree/store_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
describe Spree::Store, type: :model, without_global_store: true do
before(:all) do
- create(:country_us)
+ Spree::Country.find_by(iso: 'US') || create(:country_us)
end
before do
@@ -762,6 +762,7 @@ describe Spree::Store, type: :model, without_global_store: true do
let(:default_store) { create(:store, default: true) }
it 'cannot delete the only store' do
+ Spree::Store.where.not(id: default_store.id).delete_all
expect(default_store.can_be_deleted?).to eq(false)
end
@@ -777,7 +778,10 @@ describe Spree::Store, type: :model, without_global_store: true do
context 'default store' do
context 'with multiple stores' do
- before { another_store }
+ before do
+ Spree::Store.where.not(id: default_store.id).delete_all
+ another_store
+ end
it 'can be deleted' do
expect(default_store.deleted?).to eq(false)
@@ -795,6 +799,8 @@ describe Spree::Store, type: :model, without_global_store: true do
end
context 'single store' do
+ before { Spree::Store.where.not(id: default_store.id).delete_all }
+
it 'cannot be deleted' do
expect { default_store.destroy! }.to raise_error(ActiveRecord::RecordNotDestroyed)
expect(default_store.errors.full_messages.to_sentence).to eq('Cannot destroy the only Store.')