Skip to content
Snippets Groups Projects
Verified Commit 58ab8a4a authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Fix tests and increase delay time before remove repository

parent fd1723f0
Branches
Tags
No related merge requests found
Loading
@@ -44,7 +44,7 @@ module Projects
Loading
@@ -44,7 +44,7 @@ module Projects
   
if gitlab_shell.mv_repository(path, new_path) if gitlab_shell.mv_repository(path, new_path)
log_info("Repository \"#{path}\" moved to \"#{new_path}\"") log_info("Repository \"#{path}\" moved to \"#{new_path}\"")
GitlabShellWorker.perform_in(30.seconds, :remove_repository, new_path) GitlabShellWorker.perform_in(5.minutes, :remove_repository, new_path)
else else
false false
end end
Loading
Loading
Loading
@@ -13,15 +13,6 @@ describe "Projects", feature: true, js: true do
Loading
@@ -13,15 +13,6 @@ describe "Projects", feature: true, js: true do
it "should remove project" do it "should remove project" do
expect { remove_project }.to change {Project.count}.by(-1) expect { remove_project }.to change {Project.count}.by(-1)
end end
it 'should delete the project from disk' do
expect(GitlabShellWorker).to(
receive(:perform_async).with(:remove_repository,
/#{@project.path_with_namespace}/)
).twice
remove_project
end
end end
   
def remove_project def remove_project
Loading
Loading
Loading
@@ -792,11 +792,6 @@ describe API::API, api: true do
Loading
@@ -792,11 +792,6 @@ describe API::API, api: true do
describe 'DELETE /projects/:id' do describe 'DELETE /projects/:id' do
context 'when authenticated as user' do context 'when authenticated as user' do
it 'should remove project' do it 'should remove project' do
expect(GitlabShellWorker).to(
receive(:perform_async).with(:remove_repository,
/#{project.path_with_namespace}/)
).twice
delete api("/projects/#{project.id}", user) delete api("/projects/#{project.id}", user)
expect(response.status).to eq(200) expect(response.status).to eq(200)
end end
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment