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
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -44,7 +44,7 @@ module Projects
 
if gitlab_shell.mv_repository(path, 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
false
end
Loading
Loading
Loading
Loading
@@ -13,15 +13,6 @@ describe "Projects", feature: true, js: true do
it "should remove project" do
expect { remove_project }.to change {Project.count}.by(-1)
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
 
def remove_project
Loading
Loading
Loading
Loading
@@ -57,14 +57,14 @@ describe API::API, api: true do
expect(json_response.first['name']).to eq(project.name)
expect(json_response.first['owner']['username']).to eq(user.username)
end
it 'should include the project labels as the tag_list' do
get api('/projects', user)
response.status.should == 200
json_response.should be_an Array
json_response.first.keys.should include('tag_list')
end
context 'and using search' do
it 'should return searched project' do
get api('/projects', user), { search: project.name }
Loading
Loading
@@ -792,11 +792,6 @@ describe API::API, api: true do
describe 'DELETE /projects/:id' do
context 'when authenticated as user' 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)
expect(response.status).to eq(200)
end
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment