check for merge method in label

Author: raboid

src/config.js

@@ -17,6 +17,8 @@ const defaultConfig = {
     duplicate: CLOSE,
     wontfix: CLOSE,
     invalid: CLOSE,
+    'squash when passing': MERGE,
+    'rebase when passing': MERGE,
     'merge when passing': MERGE
   },
   comments: [],

src/pull/labeled.js

@@ -1,4 +1,5 @@
 const ms = require('ms')
+const retry = require('async-retry')
 
 const getId = require('../get-job-id')
 const getConfig = require('../config')
@@ -20,6 +21,12 @@ const status = {
   UNSTABLE: 'unstable' // can merge, but build is failing 🚫
 }
 
+const methods = {
+  MERGE: 'merge',
+  SQUASH: 'squash',
+  REBASE: 'rebase'
+}
+
 module.exports = queue => async context => {
   const ID = getId(context, { action: MERGE })
 
@@ -50,15 +57,17 @@ module.exports = queue => async context => {
   })
 
   if (withMergeableLabels.length) {
-    return queue
-      .createJob({
-        ...context.issue({ installation_id: context.payload.installation.id }),
-        action: MERGE
-      })
-      .setId(ID)
-      .retries(RETRY_HORIZON / RETRY_PERIOD)
-      .backoff('fixed', RETRY_PERIOD)
-      .save()
+    return (
+      queue
+        .createJob({
+          ...context.issue({ installation_id: context.payload.installation.id }),
+          action: MERGE
+        })
+        .setId(ID)
+        //.retries(RETRY_HORIZON / RETRY_PERIOD)
+        //.backoff('fixed', RETRY_PERIOD)
+        .save()
+    )
   }
 
   // If closable labels are removed, delete job for this pull
@@ -81,36 +90,40 @@ module.exports.process = robot => async ({ data: { installation_id, owner, repo,
   // || pull.mergeable_state === status.HAS_HOOKS
   const isMergeable = pull.mergeable && !pull.merged && pull.mergeable_state === status.CLEAN
 
+  const method = pull.labels.find(({ name }) => name.match(/rebase/i))
+    ? methods.REBASE
+    : pull.labels.find(({ name }) => name.match(/squash/i))
+    ? methods.SQUASH
+    : methods.MERGE
+
   if (isMergeable) {
+    const payload = {
+      owner,
+      repo,
+      number,
+      sha: pull.head.sha,
+      merge_method: method
+    }
+
     try {
-      await github.pullRequests.merge({
-        owner,
-        repo,
-        number,
-        sha: pull.head.sha,
-        merge_method: 'merge'
-        /*
-        commit_title,
-        commit_message,
-        */
-      })
+      await github.pullRequests.merge(payload)
     } catch (e) {
-      try {
-        await github.pullRequests.merge({
-          owner,
-          repo,
-          number,
-          sha: pull.head.sha,
-          merge_method: 'rebase'
-        })
-      } catch (e) {
-        await github.pullRequests.merge({
-          owner,
-          repo,
-          number,
-          sha: pull.head.sha,
-          merge_method: 'squash'
-        })
+      if (method === methods.MERGE) {
+        payload.merge_method = methods.REBASE
+        try {
+          await github.pullRequests.merge(payload)
+        } catch (e) {
+          payload.merge_method = methods.SQUASH
+          await github.pullRequests.merge(payload)
+        }
+      } else if (method === methods.REBASE || method === methods.SQUASH) {
+        payload.merge_method = methods.MERGE
+        try {
+          await github.pullRequests.merge(payload)
+        } catch (e) {
+          payload.merge_method = method === methods.REBASE ? methods.SQUASH : methods.REBASE
+          await github.pullRequests.merge(payload)
+        }
       }
     }
   } else if (pull.mergeable_state === status.DIRTY) {

test/index.test.js

@@ -122,6 +122,10 @@ labels:
     action: comment
     message: boop
   comment3: comment
+  'squash when passing':
+    action: merge
+  'rebase when passing':
+    action: merge
 
 comments:
   - action: label
@@ -403,7 +407,7 @@ describe('Bot', () => {
       })
     })
 
-    test('Will first try merge, then rebase, then squash', async () => {
+    test('Will first try merge, then rebase, and then squash', async () => {
       github.pullRequests.merge
         .mockRejectedValueOnce(new Error('No Merge'))
         .mockRejectedValueOnce(new Error('No Rebase'))
@@ -419,7 +423,61 @@ describe('Bot', () => {
       )
 
       await wait(2)
-      ;['merge', 'rebase', 'squash'].forEach(merge_method => {
+      ;[('merge', 'rebase', 'squash')].forEach(merge_method => {
+        expect(github.pullRequests.merge).toHaveBeenCalledWith({
+          number: 7,
+          owner: 'mfix22',
+          repo: 'test-issue-bot',
+          sha: 0,
+          merge_method
+        })
+      })
+    })
+
+    test('Will first try squash, then merge, and then rebase if label contains "squash"', async () => {
+      github.pullRequests.merge
+        .mockRejectedValueOnce(new Error('No Squash'))
+        .mockRejectedValueOnce(new Error('No Merge'))
+        .mockResolvedValueOnce()
+
+      await robot.receive(
+        payload({
+          name: 'pull_request',
+          threadType: 'pull_request',
+          labels: ['squash when passing'],
+          number: 7
+        })
+      )
+
+      await wait(2)
+      ;['squash', 'merge', 'rebase'].forEach(merge_method => {
+        expect(github.pullRequests.merge).toHaveBeenCalledWith({
+          number: 7,
+          owner: 'mfix22',
+          repo: 'test-issue-bot',
+          sha: 0,
+          merge_method
+        })
+      })
+    })
+
+    test('Will first try rebase, then merge, and then squash if label contains "rebase"', async () => {
+      github.pullRequests.merge
+        .mockRejectedValueOnce(new Error('No Rebase'))
+        .mockRejectedValueOnce(new Error('No Merge'))
+        .mockResolvedValueOnce()
+
+      await robot.receive(
+        payload({
+          name: 'pull_request',
+          threadType: 'pull_request',
+          labels: ['rebase when passing'],
+          number: 7
+        })
+      )
+
+      await wait(2)
+      ;['rebase', 'merge', 'squash'].forEach(merge_method => {
         expect(github.pullRequests.merge).toHaveBeenCalledWith({
           number: 7,
           owner: 'mfix22',