From 1a72a61822f78578c79e6f5ab1ffaef2b052826b Mon Sep 17 00:00:00 2001 From: Daniel Waterworth Date: Wed, 23 Oct 2019 09:43:00 +0100 Subject: [PATCH] FIX: Fixed testsuite The backup restorer tests weren't cleaning up after themselves and playing poorly with prefabrication. --- spec/lib/backup_restore/restorer_spec.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/spec/lib/backup_restore/restorer_spec.rb b/spec/lib/backup_restore/restorer_spec.rb index 3ae24d76c7d..8bd311580f4 100644 --- a/spec/lib/backup_restore/restorer_spec.rb +++ b/spec/lib/backup_restore/restorer_spec.rb @@ -21,7 +21,7 @@ describe BackupRestore::Restorer do end describe 'Decompressing a backup' do - fab!(:admin) { Fabricate(:admin) } + let!(:admin) { Fabricate(:admin) } before do SiteSetting.allow_restore = true @@ -102,13 +102,16 @@ describe BackupRestore::Restorer do end context 'Database connection' do - fab!(:admin) { Fabricate(:admin) } + let!(:admin) { Fabricate(:admin) } before do SiteSetting.allow_restore = true @restore_path = File.join(Rails.root, 'public', 'backups', RailsMultisite::ConnectionManagement.current_db) described_class.any_instance.stubs(ensure_we_have_a_filename: true) described_class.any_instance.stubs(initialize_state: true) end + after do + conn.establish_connection(db: 'default') + end let(:conn) { RailsMultisite::ConnectionManagement } let(:restorer) { described_class.new(admin.id) }