Add tests (and related fixes)

Author: pyhedgehog

gogs_client/__init__.py

@@ -1,4 +1,4 @@
 from gogs_client.auth import Authentication, Token, UsernamePassword
-from gogs_client.entities import GogsUser, GogsRepo
+from gogs_client.entities import GogsUser, GogsRepo, TokenInfo
 from gogs_client.interface import GogsApi, ApiFailure, NetworkFailure
 from gogs_client.updates import GogsUserUpdate

gogs_client/entities.py

@@ -252,7 +252,7 @@ def __init__(self, name, sha1):
         self._sha1 = sha1
 
     @staticmethod
-    def from_json(cls, parsed_json):
+    def from_json(parsed_json):
         name = json_get(parsed_json, "name")
         sha1 = json_get(parsed_json, "sha1")
         return TokenInfo(name, sha1)

tests/interface_test.py

@@ -43,11 +43,16 @@ def setUp(self):
                   "email": "u@gogs.io",
                   "avatar_url": "/avatars/1"
                 }"""
-        self.token = gogs_client.Token("mytoken")
+        self.token_json_str = """{
+                  "name": "new token",
+                  "sha1": "mytoken"
+                }"""
         self.username_password = gogs_client.UsernamePassword(
             "auth_username", "password")
         self.expected_repo = gogs_client.GogsRepo.from_json(json.loads(self.repo_json_str))
         self.expected_user = gogs_client.GogsUser.from_json(json.loads(self.user_json_str))
+        self.expected_token = gogs_client.TokenInfo.from_json(json.loads(self.token_json_str))
+        self.token = self.expected_token.as_token()
 
     @responses.activate
     def test_create_repo1(self):
@@ -238,6 +243,14 @@ def test_authenticated_user(self):
         user = self.client.authenticated_user(self.token)
         self.assert_users_equals(user, self.expected_user)
 
+    @responses.activate
+    def test_ensure_token(self):
+        uri = self.path("/users/{}/tokens".format(self.username_password.username))
+        responses.add(responses.GET, uri, body="[]", status=200)
+        responses.add(responses.POST, uri, body=self.token_json_str, status=200)
+        token = self.client.ensure_token(self.username_password, self.expected_token.name, self.username_password.username)
+        self.assertEqual(token.token, self.expected_token.sha1)
+
     # helper methods
 
     @staticmethod