100% coverage for notifications

sigmavirus24 · sigmavirus24 · commit d35587b46127 · 2013-02-14T23:07:38.000-05:00
diff --git a/github3/notifications.py b/github3/notifications.py
@@ -99,20 +99,20 @@ def __init__(self, sub, session=None):
         self.thread_url = sub.get('thread_url')
         #: API url of the repository if it exists
         self.repository_url = sub.get('repository_url')
-        self._ignored = sub.get('ignored', False)
-        self._subscribed = sub.get('subscribed', False)
+        self.ignored = sub.get('ignored', False)
+        self.subscribed = sub.get('subscribed', False)
 
     def __repr__(self):
-        return '<Subscription [{0}]>'.format(self._subscribed)
+        return '<Subscription [{0}]>'.format(self.subscribed)
 
     def delete(self):
         return self._boolean(self._delete(self._api), 204, 404)
 
     def is_ignored(self):
-        return self._ignored
+        return self.ignored
 
     def is_subscribed(self):
-        return self._subscribed
+        return self.subscribed
 
     def set(self, subscribed, ignored):
         """Set the user's subscription for this subscription
diff --git a/github3/pulls.py b/github3/pulls.py
@@ -130,7 +130,12 @@ def __init__(self, pull, session=None):
         # If the pull request has been merged
         if self.merged_at:
             self.merged_at = self._strptime(self.merged_at)
+        #: Whether the pull is deemed mergeable by GitHub
         self.mergeable = pull.get('mergeable', False)
+        #: Whether it would be a clelan merge or not
+        self.mergeable_state = pull.get('mergeable_state', '')
+        #: SHA of the merge commit
+        self.merge_commit_sha = pull.get('merge_commit_sha', '')
         #: :class:`User <github3.users.User>` who merged this pull
         self.merged_by = pull.get('merged_by')
         if self.merged_by:
diff --git a/tests/json/subscription b/tests/json/subscription
@@ -1 +1 @@
-{"ignored": false, "subscribed": true, "url": "https://api.github.com/repos/sigmavirus24/github3.py/subscription", "created_at": "2008-04-10T00:00:00Z", "reason": null, "repository_url": "https://api.github.com/repos/sigmavirus24/github3.py"}
+{"ignored": false, "subscribed": true, "url": "https://api.github.com/notifications/threads/5864188/subscription", "created_at": "2013-02-12T04:43:09Z", "reason": "comment", "thread_url": "https://api.github.com/notifications/threads/5864188"}

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{"ignored": false, "subscribed": true, "url": "https://api.github.com/repos/sigmavirus24/github3.py/subscription", "created_at": "2008-04-10T00:00:00Z", "reason": null, "repository_url": "https://api.github.com/repos/sigmavirus24/github3.py"}`
	`1`	`+{"ignored": false, "subscribed": true, "url": "https://api.github.com/notifications/threads/5864188/subscription", "created_at": "2013-02-12T04:43:09Z", "reason": "comment", "thread_url": "https://api.github.com/notifications/threads/5864188"}`