Merge pull request sigmavirus24#608 from megawac/merge-pull

sigmavirus24 · sigmavirus24 · commit f6948ac9097f · 2016-05-05T14:24:49.000-05:00
Add support from squash on pull request merge
diff --git a/github3/pulls.py b/github3/pulls.py
@@ -313,14 +313,18 @@ def issue_comments(self, number=-1, etag=None):
         return self._iter(int(number), url, IssueComment, etag=etag)
 
     @requires_auth
-    def merge(self, commit_message='', sha=None):
+    def merge(self, commit_message='', sha=None, squash=False):
         """Merge this pull request.
 
         :param str commit_message: (optional), message to be used for the
             merge commit
+        :param str sha: (optional), SHA that pull request head must match
+            to merge.
+        :param bool squash: (optional), commit a single commit to the
+            head branch.
         :returns: bool
         """
-        parameters = {'commit_message': commit_message}
+        parameters = {'commit_message': commit_message, 'squash': squash}
         if sha:
             parameters['sha'] = sha
         url = self._build_url('merge', base_url=self._api)
diff --git a/tests/unit/test_pulls.py b/tests/unit/test_pulls.py
@@ -93,9 +93,18 @@ def test_merge(self):
         """Show that a user can merge a Pull Request."""
         self.instance.merge()
 
-        self.session.put.assert_called_once_with(
+        self.put_called_with(
             url_for('merge'),
-            data='{"commit_message": ""}'
+            data={"squash": False, "commit_message": ""}
+        )
+
+    def test_merge_squash_message(self):
+        """Show that a user can merge a Pull Request."""
+        self.instance.merge('commit message', squash=True)
+
+        self.put_called_with(
+            url_for('merge'),
+            data={"squash": True, "commit_message": "commit message"}
         )
 
     def test_patch(self):
