Merge branch 'rc/backport-ee-fix' into 'master'

Truncate the DB in after(:all) test for Gitlab::ImportExport::ProjectTreeRestorer

See merge request !9339

spec/lib/gitlab/import_export/project_tree_restorer_spec.rb

@@ -3,7 +3,7 @@ include ImportExport::CommonUtil
 
 describe Gitlab::ImportExport::ProjectTreeRestorer, services: true do
   describe 'restore project tree' do
-    before(:all) do
+    before(:context) do
       @user = create(:user)
 
       RSpec::Mocks.with_temporary_scope do
@@ -15,10 +15,6 @@ describe Gitlab::ImportExport::ProjectTreeRestorer, services: true do
       end
     end
 
-    after(:all) do
-      @user.destroy!
-    end
-
     context 'JSON' do
       it 'restores models based on JSON' do
         expect(@restored_project_json).to be true

spec/support/db_cleaner.rb

@@ -3,6 +3,10 @@ RSpec.configure do |config|
     DatabaseCleaner.clean_with(:truncation)
   end
 
+  config.append_after(:context) do
+    DatabaseCleaner.clean_with(:truncation)
+  end
+
   config.before(:each) do
     DatabaseCleaner.strategy = :transaction
   end