Move delete_remote_branches from Gitlab::Shell to Gitlab::Git::Repository

ee/app/models/ee/repository.rb

@@ -31,10 +31,6 @@ module EE
       refs.map { |sha| commit(sha.strip) }
     end
 
-    def delete_remote_branches(remote, branches)
-      gitlab_shell.delete_remote_branches(repository_storage_path, disk_path, remote, branches)
-    end
-
     def rebase(user, merge_request)
       raw.rebase(user, merge_request.id, branch: merge_request.source_branch,
                                          branch_sha: merge_request.source_branch_sha,

lib/gitlab/git/repository.rb

@@ -1287,6 +1287,12 @@ module Gitlab
         success || gitlab_projects_error
       end
 
+      def delete_remote_branches(remote_name, branch_names)
+        success = @gitlab_projects.delete_remote_branches(remote_name, branch_names)
+
+        success || gitlab_projects_error
+      end
+
       def gitaly_repository
         Gitlab::GitalyClient::Util.repository(@storage, @relative_path, @gl_repository)
       end

lib/gitlab/shell.rb

@@ -364,26 +364,6 @@ module Gitlab
       end
     end
 
-    # Delete branch from remote repository
-    #
-    # storage - project's storage path
-    # project_name - project's disk path
-    # remote_name - remote name
-    # branch_names - remote branch names
-    #
-    # Ex.
-    #   delete_remote_branches('/path/to/storage', 'gitlab-org/gitlab-test', 'upstream', ['feature'])
-    #
-    def delete_remote_branches(storage, project_name, remote_name, branch_names)
-      cmd = gitlab_projects(storage, "#{project_name}.git")
-
-      success = cmd.delete_remote_branches(remote_name, branch_names)
-
-      raise Error, cmd.output unless success
-
-      success
-    end
-
     protected
 
     def gitlab_shell_path

spec/lib/gitlab/git/repository_spec.rb

@@ -1877,6 +1877,29 @@ describe Gitlab::Git::Repository, seed_helper: true do
         expect { subject }.to raise_error(Gitlab::Git::CommandError, 'error')
       end
     end
+
+    describe '#delete_remote_branches' do
+      subject do
+        repository.delete_remote_branches('downstream-remote', ['master'])
+      end
+
+      it 'executes the command' do
+        expect(gitlab_projects).to receive(:delete_remote_branches)
+          .with('downstream-remote', ['master'])
+          .and_return(true)
+
+        is_expected.to be_truthy
+      end
+
+      it 'raises an error if the command fails' do
+        allow(gitlab_projects).to receive(:output) { 'error' }
+        expect(gitlab_projects).to receive(:delete_remote_branches)
+          .with('downstream-remote', ['master'])
+          .and_return(false)
+
+        expect { subject }.to raise_error(Gitlab::Git::CommandError, 'error')
+      end
+    end
   end
 
   def create_remote_branch(repository, remote_name, branch_name, source_branch_name)

spec/lib/gitlab/shell_spec.rb

@@ -652,34 +652,6 @@ describe Gitlab::Shell do
         end.to raise_error(Gitlab::Shell::Error, "error")
       end
     end
-
-    describe '#delete_remote_branches' do
-      subject(:result) do
-        gitlab_shell.delete_remote_branches(
-          project.repository_storage_path,
-          project.disk_path,
-          'downstream-remote',
-          ['master']
-        )
-      end
-
-      it 'executes the command' do
-        expect(gitlab_projects).to receive(:delete_remote_branches)
-          .with('downstream-remote', ['master'])
-          .and_return(true)
-
-        is_expected.to be_truthy
-      end
-
-      it 'fails to execute the command' do
-        allow(gitlab_projects).to receive(:output) { 'error' }
-        expect(gitlab_projects).to receive(:delete_remote_branches)
-          .with('downstream-remote', ['master'])
-          .and_return(false)
-
-        expect { result }.to raise_error(Gitlab::Shell::Error, 'error')
-      end
-    end
   end
 
   describe 'namespace actions' do

spec/models/repository_spec.rb

@@ -2217,14 +2217,6 @@ describe Repository do
       end
     end
   end
-  describe '#delete_remote_branches' do
-    it 'delete branches to the remote repo' do
-      expect_any_instance_of(Gitlab::Shell).to receive(:delete_remote_branches)
-        .with(repository.repository_storage_path, repository.disk_path, 'remote_name', ['branch'])
-
-      repository.delete_remote_branches('remote_name', ['branch'])
-    end
-  end
 
   describe '#local_branches' do
     it 'returns the local branches' do