1 files changed, 10 insertions, 52 deletions

diff --git a/spec/lib/gitlab/gitaly_client/remote_service_spec.rb b/spec/lib/gitlab/gitaly_client/remote_service_spec.rb
index 2ec5f70be76..3d0f8358406 100644
--- a/spec/lib/gitlab/gitaly_client/remote_service_spec.rb
+++ b/spec/lib/gitlab/gitaly_client/remote_service_spec.rb
@@ -6,36 +6,9 @@ RSpec.describe Gitlab::GitalyClient::RemoteService do
   let(:project) { create(:project) }
   let(:storage_name) { project.repository_storage }
   let(:relative_path) { project.disk_path + '.git' }
-  let(:remote_name) { 'my-remote' }
   let(:client) { described_class.new(project.repository) }
 
-  describe '#add_remote' do
-    let(:url) { 'http://my-repo.git' }
-    let(:mirror_refmap) { :all_refs }
-
-    it 'sends an add_remote message' do
-      expect_any_instance_of(Gitaly::RemoteService::Stub)
-        .to receive(:add_remote)
-        .with(gitaly_request_with_path(storage_name, relative_path), kind_of(Hash))
-        .and_return(double(:add_remote_response))
-
-      client.add_remote(remote_name, url, mirror_refmap)
-    end
-  end
-
-  describe '#remove_remote' do
-    it 'sends an remove_remote message and returns the result value' do
-      expect_any_instance_of(Gitaly::RemoteService::Stub)
-        .to receive(:remove_remote)
-        .with(gitaly_request_with_path(storage_name, relative_path), kind_of(Hash))
-        .and_return(double(result: true))
-
-      expect(client.remove_remote(remote_name)).to be(true)
-    end
-  end
-
   describe '#find_remote_root_ref' do
-    let(:remote) { 'origin' }
     let(:url) { 'http://git.example.com/my-repo.git' }
     let(:auth) { 'Basic secret' }
     let(:expected_params) { { remote_url: url, http_authorization_header: auth } }
@@ -47,7 +20,7 @@ RSpec.describe Gitlab::GitalyClient::RemoteService do
         .with(gitaly_request_with_params(expected_params), kind_of(Hash))
         .and_return(double(ref: 'master'))
 
-      expect(client.find_remote_root_ref(remote, url, auth)).to eq 'master'
+      expect(client.find_remote_root_ref(url, auth)).to eq 'master'
     end
 
     it 'ensure ref is a valid UTF-8 string' do
@@ -57,39 +30,24 @@ RSpec.describe Gitlab::GitalyClient::RemoteService do
         .with(gitaly_request_with_params(expected_params), kind_of(Hash))
         .and_return(double(ref: "an_invalid_ref_\xE5"))
 
-      expect(client.find_remote_root_ref(remote, url, auth)).to eq "an_invalid_ref_å"
+      expect(client.find_remote_root_ref(url, auth)).to eq "an_invalid_ref_å"
     end
   end
 
   describe '#update_remote_mirror' do
-    let(:ref_name) { 'remote_mirror_1' }
     let(:only_branches_matching) { %w[my-branch master] }
     let(:ssh_key) { 'KEY' }
     let(:known_hosts) { 'KNOWN HOSTS' }
+    let(:url) { 'http:://git.example.com/my-repo.git' }
+    let(:expected_params) { { remote: Gitaly::UpdateRemoteMirrorRequest::Remote.new(url: url) } }
 
-    shared_examples 'an update' do
-      it 'sends an update_remote_mirror message' do
-        expect_any_instance_of(Gitaly::RemoteService::Stub)
-          .to receive(:update_remote_mirror)
-          .with(array_including(gitaly_request_with_params(expected_params)), kind_of(Hash))
-          .and_return(double(:update_remote_mirror_response))
-
-        client.update_remote_mirror(ref_name, url, only_branches_matching, ssh_key: ssh_key, known_hosts: known_hosts, keep_divergent_refs: true)
-      end
-    end
-
-    context 'with remote name' do
-      let(:url) { nil }
-      let(:expected_params) { { ref_name: ref_name } }
-
-      it_behaves_like 'an update'
-    end
-
-    context 'with remote URL' do
-      let(:url) { 'http:://git.example.com/my-repo.git' }
-      let(:expected_params) { { remote: Gitaly::UpdateRemoteMirrorRequest::Remote.new(url: url) } }
+    it 'sends an update_remote_mirror message' do
+      expect_any_instance_of(Gitaly::RemoteService::Stub)
+        .to receive(:update_remote_mirror)
+        .with(array_including(gitaly_request_with_params(expected_params)), kind_of(Hash))
+        .and_return(double(:update_remote_mirror_response))
 
-      it_behaves_like 'an update'
+      client.update_remote_mirror(url, only_branches_matching, ssh_key: ssh_key, known_hosts: known_hosts, keep_divergent_refs: true)
     end
   end