From 3e19a4708e0ef0293e568dcd70a4d3151afc3da1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dragomir=20=C8=9Aurcanu?= <dragomirt22@gmail.com>
Date: Mon, 2 Jul 2018 12:27:08 +0300
Subject: [PATCH] feat(gitlab): mergeBranch (#2178)

---
 lib/platform/gitlab/index.js                  | 22 +++++++++-
 .../gitlab/__snapshots__/index.spec.js.snap   | 28 ++++++++++++
 test/platform/gitlab/index.spec.js            | 43 ++++++++++++++++---
 3 files changed, 86 insertions(+), 7 deletions(-)

diff --git a/lib/platform/gitlab/index.js b/lib/platform/gitlab/index.js
index 2c0600b3a5..a8eda38938 100644
--- a/lib/platform/gitlab/index.js
+++ b/lib/platform/gitlab/index.js
@@ -338,8 +338,26 @@ async function deleteBranch(branchName, closePr = false) {
   );
 }
 
-function mergeBranch() {
-  logger.warn('Unimplemented in GitLab: mergeBranch');
+async function mergeBranch(branchName) {
+  logger.debug(`mergeBranch(${branchName}`);
+  const branchURI = encodeURIComponent(branchName);
+  try {
+    await get.post(
+      `projects/${
+        config.repository
+      }/repository/commits/${branchURI}/cherry_pick?branch=${config.baseBranch}`
+    );
+  } catch (err) {
+    logger.info(
+      expandError(err),
+      `Error pushing branch merge for ${branchName}`
+    );
+    throw new Error('Branch automerge failed');
+  }
+  // Update base commit
+  config.baseCommitSHA = null;
+  // Delete branch
+  await deleteBranch(branchName);
 }
 
 async function getBranchLastCommitTime(branchName) {
diff --git a/test/platform/gitlab/__snapshots__/index.spec.js.snap b/test/platform/gitlab/__snapshots__/index.spec.js.snap
index 991b35fe06..f192d986d0 100644
--- a/test/platform/gitlab/__snapshots__/index.spec.js.snap
+++ b/test/platform/gitlab/__snapshots__/index.spec.js.snap
@@ -409,6 +409,34 @@ Array [
 
 exports[`platform/gitlab initRepo should initialise the config for the repo - 3 2`] = `Object {}`;
 
+exports[`platform/gitlab mergeBranch(branchName) should perform a branch merge 1`] = `
+Array [
+  Array [
+    "projects/some%2Frepo/repository/commits/thebranchname/cherry_pick?branch=undefined",
+  ],
+]
+`;
+
+exports[`platform/gitlab mergeBranch(branchName) should perform a branch merge 2`] = `
+Array [
+  Array [
+    "projects/some%2Frepo/repository/branches/thebranchname",
+  ],
+]
+`;
+
+exports[`platform/gitlab mergeBranch(branchName) should throw if branch merge throws 1`] = `[Error: Branch automerge failed]`;
+
+exports[`platform/gitlab mergeBranch(branchName) should throw if branch merge throws 2`] = `
+Array [
+  Array [
+    "projects/some%2Frepo/repository/commits/thebranchname/cherry_pick?branch=undefined",
+  ],
+]
+`;
+
+exports[`platform/gitlab mergeBranch(branchName) should throw if branch merge throws 3`] = `Array []`;
+
 exports[`platform/gitlab setBaseBranch(branchName) sets the base branch 1`] = `
 Array [
   Array [
diff --git a/test/platform/gitlab/index.spec.js b/test/platform/gitlab/index.spec.js
index 6c172bb434..8b255dae51 100644
--- a/test/platform/gitlab/index.spec.js
+++ b/test/platform/gitlab/index.spec.js
@@ -452,6 +452,44 @@ describe('platform/gitlab', () => {
       expect(get.post.mock.calls).toHaveLength(1);
     });
   });
+  describe('mergeBranch(branchName)', () => {
+    it('should perform a branch merge', async () => {
+      await initRepo({
+        repository: 'some/repo',
+        token: 'token',
+      });
+
+      await gitlab.mergeBranch('thebranchname');
+
+      // deleteBranch
+      get.delete.mockImplementationOnce();
+
+      expect(get.post.mock.calls).toMatchSnapshot();
+      expect(get.delete.mock.calls).toMatchSnapshot();
+    });
+    it('should throw if branch merge throws', async () => {
+      await initRepo({
+        repository: 'some/repo',
+        token: 'token',
+      });
+      get.post.mockImplementationOnce(() => {
+        throw new Error('branch-push failed');
+      });
+      let e;
+      try {
+        await gitlab.mergeBranch('thebranchname');
+      } catch (err) {
+        e = err;
+      }
+
+      // deleteBranch
+      get.delete.mockImplementationOnce();
+
+      expect(e).toMatchSnapshot();
+      expect(get.post.mock.calls).toMatchSnapshot();
+      expect(get.delete.mock.calls).toMatchSnapshot();
+    });
+  });
   describe('deleteBranch(branchName)', () => {
     it('should send delete', async () => {
       get.delete = jest.fn();
@@ -465,11 +503,6 @@ describe('platform/gitlab', () => {
       expect(get.delete.mock.calls.length).toBe(1);
     });
   });
-  describe('mergeBranch()', () => {
-    it('exists', () => {
-      gitlab.mergeBranch();
-    });
-  });
   describe('getBranchLastCommitTime', () => {
     it('should return a Date', async () => {
       get.mockReturnValueOnce({
-- 
GitLab