fix(reset): don't fail if branch does not exist

greenkeeperio · Aug 1, 2017 · f7e2b84 · f7e2b84
1 parent 906db1e
commit f7e2b84
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
diff --git a/jobs/reset.js b/jobs/reset.js
@@ -52,6 +52,9 @@ module.exports = async function ({ repositoryFullName }) {
         ref: `heads/${branch.head}`
       }))
     } catch (e) {
+      if (e.code === 404) {
+        continue
+      }
       if (branch.head === 'greenkeeper/initial' || branch.head === 'greenkeeper-initial') {
         throw e
       }

diff --git a/test/jobs/reset.js b/test/jobs/reset.js
@@ -184,6 +184,32 @@ test('reset repo', async t => {
     }
   })
 
+  t.test('do not mind if a branch does not exist', async t => {
+    await repositories.put({
+      _id: '42:branch:deadbeef0',
+      type: 'branch',
+      repositoryId: '42',
+      head: 'greenkeeper/initial'
+    })
+    githubNock
+      .delete('/repos/finnp/abc/git/refs/heads/greenkeeper-standard-10.0.0')
+      .reply(200)
+      .delete('/repos/finnp/abc/git/refs/heads/greenkeeper/initial')
+      .reply(404)
+      .get('/repos/finnp/abc')
+      .reply(200, githubRepository)
+
+    try {
+      await worker({
+        repositoryFullName: 'finnp/abc'
+      })
+    } catch (e) {
+      t.fail('error thrown')
+    } finally {
+      await waitFor(timeToWaitAfterTests)
+    }
+  })
+
   t.test('delete all branchdocs of the repo', async t => {
     t.plan(1)
     githubNock