pythonthings
diff --git a/‎github3/decorators.py‎
Lines changed: 4 additions & 4 deletions b/‎github3/decorators.py‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎github3/github.py‎
Lines changed: 4 additions & 0 deletions b/‎github3/github.py‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎tests/base.py‎
Lines changed: 32 additions & 14 deletions b/‎tests/base.py‎
Lines changed: 32 additions & 14 deletions
@@ -9,12 +9,12 @@
 from functools import wraps
 from requests.models import Response
 
-try:
+try:  # (No coverage)
     # python2
-    from StringIO import StringIO
-except ImportError:
+    from StringIO import StringIO  # (No coverage)
+except ImportError:  # (No coverage)
     # python3
-    from io import BytesIO as StringIO
+    from io import BytesIO as StringIO  # (No coverage)
 
 
 def requires_auth(func):
 
@@ -688,6 +688,7 @@ def star(self, login, repo):
             resp = self._boolean(self._put(url), 204, 404)
         return resp
 
+    @requires_auth
     def subscribe(self, login, repo):
         """Subscribe to login/repo
 
@@ -701,6 +702,7 @@ def subscribe(self, login, repo):
             resp = self._boolean(self._put(url), 204, 404)
         return resp
 
+    @requires_auth
     def unfollow(self, login):
         """Make the authenticated user stop following login
 
@@ -714,6 +716,7 @@ def unfollow(self, login):
             resp = self._boolean(self._delete(url), 204, 404)
         return resp
 
+    @requires_auth
     def unstar(self, login, repo):
         """Unstar to login/repo
 
@@ -727,6 +730,7 @@ def unstar(self, login, repo):
             resp = self._boolean(self._delete(url), 204, 404)
         return resp
 
+    @requires_auth
     def unsubscribe(self, login, repo):
         """Unsubscribe to login/repo
 
 
@@ -2,7 +2,7 @@
 import sys
 import unittest
 import github3
-from expecter import expect, add_expectation
+import expecter
 
 
 class BaseTest(unittest.TestCase):
@@ -38,30 +38,48 @@ def assertAreNotNone(self, obj, *attrs):
             self.assertIsNotNone(getattr(obj, attr),
                 '{0} is None'.format(attr))
 
+    def raisesGHE(self, func, *args, **kwargs):
+        """Assert that the function, when called, raises a GitHubError."""
+        with expect.raises(github3.GitHubError):
+            func(*args, **kwargs)
+
     def expect_list_of_class(self, l, cls):
         for i in l:
             expect(i).isinstance(cls)
 
 
-def is_not_None(var):
-    return var is not None
-
+class CustomExpecter(expecter.expect):
+    def is_not_None(self):
+        assert self._actual is not None, (
+                'Expected anything but None but got it.'
+                )
 
-def is_None(var):
-    return var is None
+    def is_None(self):
+        assert self._actual is None, (
+                'Expected None but got %s' % repr(self._actual)
+                )
 
+    def is_True(self):
+        assert self._actual is True, (
+                'Expected True but got %s' % repr(self._actual)
+                )
 
-def is_True(var):
-    return var is True
+    def is_False(self):
+        assert self._actual is False, (
+                'Expected False but got %s' % repr(self._actual)
+                )
 
+    def list_of(self, cls):
+        expected = cls.__name__
+        for actual in self._actual:
+            actual_cls = actual.__class__.__name__
+            assert isinstance(actual, cls), (
+                    'Expected instance of %s but got %s' % (expected,
+                        actual_cls)
+                    )
 
-def is_False(var):
-    return var is False
+expect = CustomExpecter
 
-add_expectation(is_not_None)
-add_expectation(is_None)
-add_expectation(is_True)
-add_expectation(is_False)
 
 if sys.version_info >= (3, 0):
     str_test = (str, bytes)