From c5bcad10a6d5fe91b45e37ae7670e93745e9a870 Mon Sep 17 00:00:00 2001 From: Krzysztof Kotlarek Date: Tue, 29 Oct 2019 21:32:43 +1100 Subject: [PATCH] FIX: more flaky jobs_base_spec.rb (#8259) This commit is follow up of https://github.com/discourse/discourse/commit/417be323a214a39e9cf65fcb200c80ac52e0e7c4 We need more steps to properly switch from multi-site to single-site --- spec/lib/backup_restore/restorer_spec.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spec/lib/backup_restore/restorer_spec.rb b/spec/lib/backup_restore/restorer_spec.rb index b1e6e83ee96..cec9b157dcb 100644 --- a/spec/lib/backup_restore/restorer_spec.rb +++ b/spec/lib/backup_restore/restorer_spec.rb @@ -111,8 +111,10 @@ xdescribe BackupRestore::Restorer do described_class.any_instance.stubs(initialize_state: true) end after do + ActiveRecord::Base.clear_all_connections! + Rails.configuration.multisite = false RailsMultisite::ConnectionManagement.clear_settings! - conn.establish_connection(db: 'default') + ActiveRecord::Base.establish_connection end let(:conn) { RailsMultisite::ConnectionManagement } let(:restorer) { described_class.new(admin.id) }