3 files changed, 11 insertions, 74 deletions
diff --git a/spec/services/projects/enable_deploy_key_service_spec.rb b/spec/services/projects/enable_deploy_key_service_spec.rb
index a37510cf159..78626fbad4b 100644
--- a/spec/services/projects/enable_deploy_key_service_spec.rb
+++ b/spec/services/projects/enable_deploy_key_service_spec.rb
@@ -21,6 +21,16 @@ describe Projects::EnableDeployKeyService, services: true do
     end
   end
 
+  context 'add the same key twice' do
+    before do
+      project.deploy_keys << deploy_key
+    end
+
+    it 'returns existing key' do
+      expect(service.execute).to eq(deploy_key)
+    end
+  end
+
   def service
     Projects::EnableDeployKeyService.new(project, user, params)
   end
diff --git a/spec/services/projects/housekeeping_service_spec.rb b/spec/services/projects/housekeeping_service_spec.rb
index eaf63457b32..fff12beed71 100644
--- a/spec/services/projects/housekeeping_service_spec.rb
+++ b/spec/services/projects/housekeeping_service_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Projects::HousekeepingService do
-  subject { Projects::HousekeepingService.new(project) }
+  subject { described_class.new(project) }
   let(:project) { create(:project, :repository) }
 
   before do
diff --git a/spec/services/projects/upload_service_spec.rb b/spec/services/projects/upload_service_spec.rb
deleted file mode 100644
index d2cefa46bfa..00000000000
--- a/spec/services/projects/upload_service_spec.rb
+++ /dev/null
@@ -1,73 +0,0 @@
-require 'spec_helper'
-
-describe Projects::UploadService, services: true do
-  describe 'File service' do
-    before do
-      @user = create(:user)
-      @project = create(:empty_project, creator_id: @user.id, namespace: @user.namespace)
-    end
-
-    context 'for valid gif file' do
-      before do
-        gif = fixture_file_upload(Rails.root + 'spec/fixtures/banana_sample.gif', 'image/gif')
-        @link_to_file = upload_file(@project, gif)
-      end
-
-      it { expect(@link_to_file).to have_key(:alt) }
-      it { expect(@link_to_file).to have_key(:url) }
-      it { expect(@link_to_file).to have_value('banana_sample') }
-      it { expect(@link_to_file[:url]).to match('banana_sample.gif') }
-    end
-
-    context 'for valid png file' do
-      before do
-        png = fixture_file_upload(Rails.root + 'spec/fixtures/dk.png',
-          'image/png')
-        @link_to_file = upload_file(@project, png)
-      end
-
-      it { expect(@link_to_file).to have_key(:alt) }
-      it { expect(@link_to_file).to have_key(:url) }
-      it { expect(@link_to_file).to have_value('dk') }
-      it { expect(@link_to_file[:url]).to match('dk.png') }
-    end
-
-    context 'for valid jpg file' do
-      before do
-        jpg = fixture_file_upload(Rails.root + 'spec/fixtures/rails_sample.jpg', 'image/jpg')
-        @link_to_file = upload_file(@project, jpg)
-      end
-
-      it { expect(@link_to_file).to have_key(:alt) }
-      it { expect(@link_to_file).to have_key(:url) }
-      it { expect(@link_to_file).to have_value('rails_sample') }
-      it { expect(@link_to_file[:url]).to match('rails_sample.jpg') }
-    end
-
-    context 'for txt file' do
-      before do
-        txt = fixture_file_upload(Rails.root + 'spec/fixtures/doc_sample.txt', 'text/plain')
-        @link_to_file = upload_file(@project, txt)
-      end
-
-      it { expect(@link_to_file).to have_key(:alt) }
-      it { expect(@link_to_file).to have_key(:url) }
-      it { expect(@link_to_file).to have_value('doc_sample.txt') }
-      it { expect(@link_to_file[:url]).to match('doc_sample.txt') }
-    end
-
-    context 'for too large a file' do
-      before do
-        txt = fixture_file_upload(Rails.root + 'spec/fixtures/doc_sample.txt', 'text/plain')
-        allow(txt).to receive(:size) { 1000.megabytes.to_i }
-        @link_to_file = upload_file(@project, txt)
-      end
-
-      it { expect(@link_to_file).to eq(nil) }
-    end
-  end
-
-  def upload_file(project, file)
-    Projects::UploadService.new(project, file).execute
-  end
-end