Merge pull request sigmavirus24#727 from balloob/add-merge-commit-sha

sigmavirus24 · web-flow · commit 47727c9dcdde · 2017-12-14T19:27:14.000-06:00
Add merge_commit_sha attribute to PullRequest object
diff --git a/github3/pulls.py b/github3/pulls.py
@@ -185,6 +185,12 @@ def _update_attributes(self, pull):
         #: Dictionary of _links. Changed in 1.0
         self.links = self._get_attribute(pull, '_links', {})
 
+        #: If unmerged, holds the sha of the commit to test mergability.
+        #: If merged, holds commit sha of the merge commit, squashed commit on
+        #: the base branch or the commit that the base branch was updated to
+        #: after rebasing the PR.
+        self.merge_commit_sha = self._get_attribute(pull, 'merge_commit_sha')
+
         #: Boolean representing whether the pull request has been merged
         self.merged = self._get_attribute(pull, 'merged')
 
diff --git a/tests/unit/test_pulls.py b/tests/unit/test_pulls.py
@@ -144,6 +144,13 @@ def test_update(self):
             }
         )
 
+    def test_attributes(self):
+        """Show that we extract attributes correctly."""
+        assert self.instance.merge_commit_sha == \
+            'e5bd3914e2e596debea16f433f57875b5b90bcd6'
+        assert not self.instance.merged
+        assert self.instance.mergeable
+
 
 class TestPullRequestRequiresAuthentication(
         helper.UnitRequiresAuthenticationHelper):

Original file line number	Diff line number	Diff line change
`@@ -144,6 +144,13 @@ def test_update(self):`
`144`	`144`	`}`
`145`	`145`	`)`
`146`	`146`
	`147`	`+ def test_attributes(self):`
	`148`	`+ """Show that we extract attributes correctly."""`
	`149`	`+ assert self.instance.merge_commit_sha == \`
	`150`	`+ 'e5bd3914e2e596debea16f433f57875b5b90bcd6'`
	`151`	`+ assert not self.instance.merged`
	`152`	`+ assert self.instance.mergeable`
	`153`	`+`
`147`	`154`
`148`	`155`	`class TestPullRequestRequiresAuthentication(`
`149`	`156`	`helper.UnitRequiresAuthenticationHelper):`