From c9856e53ea05374dcab0a591bd0352d321120b68 Mon Sep 17 00:00:00 2001 From: Nick Thomas Date: Thu, 17 Aug 2017 11:36:58 +0100 Subject: Run remove_pages in a run_after_commit block --- spec/models/project_spec.rb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'spec') diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 361a4c022ca..e1d64986a76 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -2313,6 +2313,7 @@ describe Project do describe '#remove_pages' do let(:project) { create(:project) } + let(:namespace) { project.namespace } let(:pages_path) { project.pages_path } around do |example| @@ -2324,6 +2325,14 @@ describe Project do end end + it 'removes the pages directory' do + expect_any_instance_of(Projects::UpdatePagesConfigurationService).to receive(:execute) + expect_any_instance_of(Gitlab::PagesTransfer).to receive(:rename_project).and_return(true) + expect(PagesWorker).to receive(:perform_in).with(5.minutes, :remove, namespace.full_path, anything) + + project.remove_pages + end + it 'is a no-op when there is no namespace' do project.update_column(:namespace_id, nil) @@ -2332,6 +2341,12 @@ describe Project do project.remove_pages end + + it 'is run when the project is destroyed' do + expect(project).to receive(:remove_pages).and_call_original + + project.destroy + end end describe '#forks_count' do -- cgit v1.2.3