From 890bbc22a279de13bed3d5abc3dc2da76ff94b7e Mon Sep 17 00:00:00 2001 From: hohoTT <609029365@qq.com> Date: Wed, 12 Aug 2015 18:13:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9group=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E4=B8=AD=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- group/tests.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/group/tests.py b/group/tests.py index 9af9da37..f62dfa57 100644 --- a/group/tests.py +++ b/group/tests.py @@ -181,10 +181,7 @@ class JoinGroupAPITest(APITestCase): data = {"group_id": group.id, "message": "message1"} response = self.client.post(self.url, data=data) self.assertEqual(response.data, {"code": 0, "data": u"申请提交成功,请等待审核"}) - try: - JoinGroupRequest.objects.get(user=self.user, group=group, status=False) - except JoinGroupRequest.DoesNotExist: - raise AssertionError() + JoinGroupRequest.objects.get(user=self.user, group=group, status=False) # 再提交一遍 已经提交过申请,请等待审核 data = {"group_id": group.id, "message": "message1"} @@ -223,7 +220,6 @@ class JoinGroupRequestAdminAPITest(APITestCase): self.request = JoinGroupRequest.objects.create(group=self.group, user=self.user1, message="message1") - # 以下是管理的群的加群请求测试 def test_get_all_request_successfully(self): self.assertEqual(self.client.get(self.url).data["code"], 0) @@ -249,7 +245,7 @@ class JoinGroupRequestAdminAPITest(APITestCase): data = {"request_id": self.request.id, "status": True} response = self.client.put(self.url, data=data) self.assertEqual(response.data, {"code": 0, "data": u"加入成功"}) - self.assertEqual(UserGroupRelation.objects.get(group=self.group).user.username, self.user1.username) + UserGroupRelation.objects.get(group=self.group, user=self.user1) # 再加入一次,此时返回的消息应为 加入失败,已经在本小组内 request = JoinGroupRequest.objects.create(group=self.group, user=self.user1,