fix: handle error when branch already exists

fixes #16
all-contributors · Jan 16, 2019 · 2f683cd · 2f683cd
1 parent b03b402
commit 2f683cd
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 10 deletions.
diff --git a/src/Repository/index.js b/src/Repository/index.js
@@ -1,4 +1,7 @@
-const { ResourceNotFoundError } = require('../utils/errors')
+const {
+    ResourceNotFoundError,
+    ReferenceExistsError,
+} = require('../utils/errors')
 
 class Repository {
     constructor({ repo, owner, github }) {
@@ -72,14 +75,21 @@ class Repository {
 
     async createBranch({ branchName, defaultBranch }) {
         const fromSha = await this.getHeadRef(defaultBranch)
-
-        // https://octokit.github.io/rest.js/#api-Git-createRef
-        await this.github.git.createRef({
-            owner: this.owner,
-            repo: this.repo,
-            ref: `refs/heads/${branchName}`,
-            sha: fromSha,
-        })
+        try {
+            // https://octokit.github.io/rest.js/#api-Git-createRef
+            await this.github.git.createRef({
+                owner: this.owner,
+                repo: this.repo,
+                ref: `refs/heads/${branchName}`,
+                sha: fromSha,
+            })
+        } catch (error) {
+            if (error.code === 422) {
+                throw new ReferenceExistsError()
+            } else {
+                throw error
+            }
+        }
     }
 
     async updateFile({ filePath, content, branchName, originalSha }) {

diff --git a/src/utils/errors.js b/src/utils/errors.js
@@ -21,8 +21,16 @@ class UserNotFoundError extends AllContributorBotError {
     }
 }
 
+class ReferenceExistsError extends AllContributorBotError {
+    constructor() {
+        super(`A branch or Pull Request is already open.`)
+        this.name = this.constructor.name
+    }
+}
+
 module.exports = {
     AllContributorBotError,
     ResourceNotFoundError,
     UserNotFoundError,
+    ReferenceExistsError,
 }
diff --git a/test/Repository/__snapshots__/index.test.js.snap b/test/Repository/__snapshots__/index.test.js.snap
@@ -51,3 +51,10 @@ Object {
   "title": "Pull request title",
 }
 `;
+
+exports[`Repository createPullRequest with files but a branch or pull request already exists 1`] = `
+Object {
+  "ref": "refs/heads/all-contributors/add-jakebolam",
+  "sha": "aa218f56b14c9653891f9e74264a383fa43fefbd",
+}
+`;
diff --git a/test/Repository/index.test.js b/test/Repository/index.test.js
@@ -1,7 +1,8 @@
 const nock = require('nock')
 
 const Repository = require('../../src/Repository')
-
+const { rejectionOf } = require('../testUtils')
+const { ReferenceExistsError } = require('../../src/utils/errors')
 const gitGetRefdata = require('../../test/fixtures/git.getRef.json')
 const gitCreateRefdata = require('../../test/fixtures/git.createRef.json')
 const reposUpdateFiledata = require('../../test/fixtures/repos.updateFile.json')
@@ -101,4 +102,43 @@ describe('Repository', () => {
             'https://github.com/all-contributors/all-contributors-bot/pull/1347',
         )
     })
+
+    test('createPullRequest with files but a branch or pull request already exists', async () => {
+        nock('https://api.github.com')
+            .get(
+                `/repos/all-contributors/all-contributors-bot/git/refs/heads/master`,
+            )
+            .reply(200, gitGetRefdata)
+
+        nock('https://api.github.com')
+            .post(
+                `/repos/all-contributors/all-contributors-bot/git/refs`,
+                verifyBody,
+            )
+            .reply(422)
+
+        const error = await rejectionOf(
+            repository.createPullRequestFromFiles({
+                title: 'Pull request title',
+                body: 'Pull request body',
+                filesByPath: {
+                    '.all-contributorsrc': {
+                        content: JSON.stringify({ test: 'test content' }),
+                        originalSha: 'aa218f56b14c9653891f9e74264a383fa43fefbe',
+                    },
+                    'README.md': {
+                        content: 'Updated list',
+                        originalSha: 'aa218f56b14c9653891f9e74264a383fa43fefbl',
+                    },
+                    '/nested-folder/SOME-DOC.md': {
+                        content: 'Updated list in nested folder',
+                        originalSha: 'aa218f56b14de653891f9e74264a383fa43fefbd',
+                    },
+                },
+                branchName: 'all-contributors/add-jakebolam',
+                defaultBranch: 'master',
+            }),
+        )
+        expect(error instanceof ReferenceExistsError).toBeTruthy()
+    })
 })