Skip to content

Commit fe86f0d

Browse files
committed
Bug fixes, and improved test coverage
1 parent 5d18faf commit fe86f0d

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

gogs_client/updates.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,11 @@ def set_admin(self, admin):
8181

8282
def set_allow_git_hook(self, allow_git_hook):
8383
self._allow_git_hook = allow_git_hook
84+
return self
8485

8586
def set_allow_import_local(self, allow_import_local):
8687
self._allow_import_local = allow_import_local
88+
return self
8789

8890
def build(self):
8991
return GogsUserUpdate(

tests/interface_test.py

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,12 @@ def test_get_user1(self):
156156
responses.add(responses.GET, uri2, status=404)
157157
user = self.client.get_user(None, "username1")
158158
self.assert_users_equals(user, self.expected_user)
159-
self.assertRaises(gogs_client.GogsApi.ApiFailure, self.client.get_user,
160-
None, "username2")
159+
try:
160+
self.client.get_user(None, "username2")
161+
raise AssertionError("Call to get_user did not raise an exception")
162+
except gogs_client.GogsApi.ApiFailure as exc:
163+
self.assertIsNotNone(exc.message)
164+
self.assertEqual(exc.status_code, 404)
161165
self.assertEqual(len(responses.calls), 2)
162166
first_call = responses.calls[0]
163167
self.assertEqual(first_call.request.url, uri1)
@@ -170,6 +174,9 @@ def test_update_user1(self):
170174
.set_full_name("Example User")\
171175
.set_password("Password")\
172176
.set_website("mywebsite.net")\
177+
.set_active(True)\
178+
.set_admin(False)\
179+
.set_allow_git_hook(False)\
173180
.build()
174181

175182
def callback(request):
@@ -179,6 +186,12 @@ def callback(request):
179186
self.assertEqual(data["email"], "user@example.com")
180187
self.assertEqual(data["password"], "Password")
181188
self.assertEqual(data["website"], "mywebsite.net")
189+
self.assertRegexpMatches(str(data["active"]), r"[tT]rue")
190+
self.assertRegexpMatches(str(data["admin"]), r"[fF]alse")
191+
self.assertRegexpMatches(str(data["allow_git_hook"]), r"[fF]alse")
192+
self.assertNotIn("source_id", data)
193+
self.assertNotIn("location", data)
194+
self.assertNotIn("allow_import_local", data)
182195
return 200, {}, self.user_json_str
183196
uri = self.path("/admin/users/username")
184197
responses.add_callback(responses.PATCH, uri, callback=callback)

0 commit comments

Comments
 (0)