Fix tests and increase delay time before remove repository

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

3 files changed, 3 insertions, 17 deletions

diff --git a/app/services/projects/destroy_service.rb b/app/services/projects/destroy_service.rb
index 53bf36b1010..29e8ba347d4 100644
--- a/app/services/projects/destroy_service.rb
+++ b/app/services/projects/destroy_service.rb
@@ -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
diff --git a/spec/features/projects_spec.rb b/spec/features/projects_spec.rb
index cae11be7cdd..24d4a67d50b 100644
--- a/spec/features/projects_spec.rb
+++ b/spec/features/projects_spec.rb
@@ -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
diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb
index 46cd26eb927..dbfd72e5f19 100644
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
@@ -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 }
@@ -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