davidmoss
diff --git a/‎github3/pulls.py
Lines changed: 0 additions & 7 deletions b/‎github3/pulls.py
Lines changed: 0 additions & 7 deletions
diff --git a/‎tests/test_notifications.py
Lines changed: 89 additions & 0 deletions b/‎tests/test_notifications.py
Lines changed: 89 additions & 0 deletions
diff --git a/‎tests/test_pulls.py
Lines changed: 42 additions & 0 deletions b/‎tests/test_pulls.py
Lines changed: 42 additions & 0 deletions
@@ -181,13 +181,6 @@ def diff(self):
                          headers={'Accept': 'application/vnd.github.diff'})
         return resp.content if self._boolean(resp, 200, 404) else None
 
-    def is_mergeable(self):
-        """Checks to see if the pull request can be merged by GitHub.
-
-        :returns: bool
-        """
-        return self.mergeable
-
     def is_merged(self):
         """Checks to see if the pull request was merged.
 
 
@@ -0,0 +1,89 @@
+import github3
+import datetime
+from tests.utils import BaseCase, load, expect
+
+
+class TestThread(BaseCase):
+    def __init__(self, methodName='runTest'):
+        super(TestThread, self).__init__(methodName)
+        self.thread = github3.notifications.Thread(load('notification'))
+        self.api = ("https://api.github.com/notifications/threads/6169361")
+
+    def test_last_read_at(self):
+        json = self.thread.to_json().copy()
+        json['last_read_at'] = '2013-12-31T23:59:59Z'
+        t = github3.notifications.Thread(json)
+        expect(t.last_read_at).isinstance(datetime.datetime)
+
+    def test_repr(self):
+        expect(repr(self.thread)) == '<Thread [{0}]>'.format(
+            self.thread.subject.get('title'))
+
+    def test_delete_subscription(self):
+        self.response('', 204)
+        self.delete(self.api + '/subscription')
+
+        expect(self.thread.delete_subscription()).is_True()
+        self.mock_assertions()
+
+    def test_is_unread(self):
+        expect(self.thread.is_unread()) == self.thread.unread
+
+    def test_mark(self):
+        self.response('', 205)
+        self.patch(self.api)
+        self.conf = {'data': {'read': True}}
+
+        expect(self.thread.mark()).is_True()
+        self.mock_assertions()
+
+    def test_set_subscription(self):
+        self.response('subscription')
+        self.put(self.api + '/subscription')
+        self.conf = {'data': {'subscribed': True, 'ignored': False}}
+
+        expect(self.thread.set_subscription(True, False)).isinstance(
+            github3.notifications.Subscription)
+        self.mock_assertions()
+
+    def test_subscription(self):
+        self.response('subscription')
+        self.get(self.api + '/subscription')
+
+        expect(self.thread.subscription()).isinstance(
+            github3.notifications.Subscription)
+        self.mock_assertions()
+
+
+class TestSubscription(BaseCase):
+    def __init__(self, methodName='runTest'):
+        super(TestSubscription, self).__init__(methodName)
+        self.subscription = github3.notifications.Subscription(
+            load('subscription'))
+        self.api = ("https://api.github.com/notifications/threads/5864188/"
+                    "subscription")
+
+    def test_repr(self):
+        expect(repr(self.subscription)) == '<Subscription [True]>'
+
+    def test_delete(self):
+        self.response('', 204)
+        self.delete(self.api)
+
+        expect(self.subscription.delete()).is_True()
+        self.mock_assertions()
+
+    def test_is_ignored(self):
+        expect(self.subscription.is_ignored()) == self.subscription.ignored
+
+    def test_is_subscription(self):
+        subbed = self.subscription.is_subscribed()
+        expect(subbed) == self.subscription.subscribed
+
+    def test_set(self):
+        self.response('subscription')
+        self.put(self.api)
+        self.conf = {'data': {'subscribed': True, 'ignored': False}}
+
+        expect(self.subscription.set(True, False)).is_None()
+        self.mock_assertions()
@@ -0,0 +1,42 @@
+import github3
+from mock import patch
+from tests.utils import BaseCase, load, expect
+
+
+class TestPullRequest(BaseCase):
+    def __init__(self, methodName='runTest'):
+        super(TestPullRequest, self).__init__(methodName)
+        self.pull = github3.pulls.PullRequest(load('pull'))
+        self.api = ("https://api.github.com/repos/sigmavirus24/github3.py/"
+                    "pulls/18")
+
+    def setUp(self):
+        super(TestPullRequest, self).setUp()
+        self.pull = github3.pulls.PullRequest(self.pull.to_json(), self.g)
+
+    def test_repr(self):
+        expect(repr(self.pull).startswith('<Pull Request'))
+
+    def test_close(self):
+        with expect.githuberror():
+            self.pull.close()
+
+        self.login()
+
+        with patch.object(github3.pulls.PullRequest, 'update') as up:
+            up.return_value = True
+            expect(self.pull.close()).is_True()
+            up.assert_called_once_with(
+                self.pull.title, self.pull.body, 'closed')
+
+    def test_diff(self):
+        self.response('archive', 200)
+        self.get(self.api)
+        self.conf = {
+            'headers': {
+                'Accept': 'application/vnd.github.diff'
+            }
+        }
+
+        expect(self.pull.diff()) != ''
+        self.mock_assertions()