merge pull request

beneidel · beneidel · commit fadd68772e1c · 2016-01-20T20:56:42.000-03:00
diff --git a/README.md b/README.md
@@ -119,6 +119,23 @@ var pullRequestID = 123;
 repo.getPull(pullRequestID, function(err, pullRequestInfo) {});
 ```
 
+Merge a Pull Request.
+
+```js
+var pullRequestID = 123;
+
+repo.mergePull({
+   number: pullRequestID,
+   // pull request head sha is required to merge a pull request safely
+   sha: 'f4c3e6d8045ea567cccdc0802e1769a85c6b690c'
+}, optionalMessage, function(err, mergeResult){});
+
+// or simply:
+repo.getPull(pullRequestID, function(err, pullRequestInfo) {
+   repo.mergePull(pullRequestInfo, function(err, mergeResult){});
+});
+```
+
 Create Pull Request.
 
 ```js
diff --git a/github.js b/github.js
@@ -458,6 +458,26 @@
             });
          };
 
+         // Merge a specific pull request
+         // -------
+
+         this.mergePull = function(pull, message, cb) {
+            if (typeof message === 'function') {
+               cb = message;
+               message = '';
+            }
+
+            var data = {
+               sha: pull.sha || pull.head.sha,
+               commit_message: message
+            };
+
+            _request('PUT', repoPath + '/pulls/' + pull.number + '/merge', data, function(err, mergeResult, xhr) {
+               if (err) return cb(err);
+               cb(null, mergeResult, xhr);
+            });
+         };
+
          // Retrieve the changes made between base and head
          // -------
 
diff --git a/test/test.repo.js b/test/test.repo.js
@@ -40,6 +40,7 @@ if (typeof window === 'undefined') { // We're in NodeJS
       // jscs:disable
       imageB64 = 'iVBORw0KGgoAAAANSUhEUgAAACsAAAAmCAAAAAB4qD3CAAABgElEQVQ4y9XUsUocURQGYN/pAyMWBhGtrEIMiFiooGuVIoYsSBAsRSQvYGFWC4uFhUBYsilXLERQsDA20YAguIbo5PQp3F3inVFTheSvZoavGO79z+mJP0/Pv2nPtlfLpfLq9tljNquO62S8mj1kmy/8nrHm/Xaz1930bt5n1+SzVmyrilItsod9ON0td1V59xR9hwV2HsMRsbfROLo4amzsRcQw5vO2CZPJEU5CM2cXYTCxg7CY2mwIVhK7AkNZYg9g4CqxVwNwkNg6zOTKMQP1xFZgKWeXoJLYdSjl7BysJ7YBIzk7Ap8TewLOE3oOTtIz6y/64bfQn55ZTIAPd2gNTOTurcbzp7z50v1y/Pq2Q7Wczca8vFjG6LvbMo92hiPL96xO+eYVPkVExMdONetFXZ+l+eP9cuV7RER8a9PZwrloTXv2tfv285ZOt4rnrTXlydxCu9sZmGrdN8eXC3ATERHXsHD5wC7ZL3HdsaX9R3bUzlb7YWvn/9ipf93+An8cHsx3W3WHAAAAAElFTkSuQmCC';
       imageBlob = new Blob();
+
       // jscs:enable
    }
 }
@@ -131,9 +132,9 @@ describe('Github.Repository', function() {
 
    it('should get statuses for a SHA from a repo', function(done) {
       repo.getStatuses('20fcff9129005d14cc97b9d59b8a3d37f4fb633b', function(err, statuses) {
-         statuses.length.should.equal(6)
+         statuses.length.should.equal(6);
          statuses.every(function(status) {
-            return status.url === 'https://api.github.com/repos/michael/github/statuses/20fcff9129005d14cc97b9d59b8a3d37f4fb633b'
+            return status.url === 'https://api.github.com/repos/michael/github/statuses/20fcff9129005d14cc97b9d59b8a3d37f4fb633b';
          }).should.equal(true);
          done();
       });
@@ -272,14 +273,35 @@ describe('Creating new Github.Repository', function() {
    it('should get pull requests on repo', function(done) {
       var repo = github.getRepo('michael', 'github');
 
-      repo.getPull(153, function(err) {
+      repo.getPull(153, function(err, pull) {
          should.not.exist(err);
-
-         // @TODO write better assertion
+         should.exist(pull.number);
+         pull.number.should.equal(153);
+         should.exist(pull.head);
+         should.exist(pull.head.sha);
          done();
       });
    });
 
+   it('should merge pull requests on repo', function(done) {
+      var repo = github.getRepo('michael', 'github');
+      var expectedDocUrl = 'https://developer.github.com/v3/pulls/#merge-a-pull-request-merge-button';
+
+      repo.getPull(153, function(err, pull) {
+         repo.mergePull(pull, function(err) {
+            should.exist(err);
+            should.exist(err.request);
+            should.exist(err.request.response);
+            var errResponse = JSON.parse(err.request.response);
+
+            errResponse.documentation_url.should.equal(expectedDocUrl);
+
+            // @TODO write better assertion
+            done();
+         });
+      });
+   });
+
    it('should delete a file on the repo', function(done) {
       repo.write('master', 'REMOVE-TEST.md', 'THIS IS A TEST', 'Remove test', function(err) {
          should.not.exist(err);
