diff --git a/reviewboard/webapi/tests/test_review_group_user.py b/reviewboard/webapi/tests/test_review_group_user.py index 7031097db792a90f029a382c419c57405b5a2fac..9ba51fd76810562c9865eaf5a03e60114e85afa2 100644 --- a/reviewboard/webapi/tests/test_review_group_user.py +++ b/reviewboard/webapi/tests/test_review_group_user.py @@ -4,8 +4,8 @@ from django.contrib.auth.models import User from django.utils import six from djblets.testing.decorators import add_fixtures from djblets.webapi.errors import PERMISSION_DENIED +from djblets.webapi.testing.decorators import webapi_test_template -from reviewboard.site.models import LocalSite from reviewboard.webapi.resources import resources from reviewboard.webapi.errors import INVALID_USER from reviewboard.webapi.tests.base import BaseWebAPITestCase @@ -52,10 +52,9 @@ class ResourceListTests(BaseWebAPITestCase): review_group_user_list_mimetype, items) + @webapi_test_template def test_get_with_no_access(self): - """Testing the GET groups//users/ API - without access to invite-only group - """ + """Testing the GET API without access to invite-only group""" group = self.create_review_group(name='priv-group', invite_only=True) rsp = self.api_get(get_review_group_user_list_url(group.name), expected_status=403) @@ -88,8 +87,9 @@ class ResourceListTests(BaseWebAPITestCase): self.assertEqual(users[0].username, 'doc') self.compare_item(rsp['user'], users[0]) + @webapi_test_template def test_post_with_no_access(self, local_site=None): - """Testing the POST groups//users/ API with Permission Denied""" + """Testing the POST API with Permission Denied""" group = self.create_review_group() user = User.objects.get(pk=1) @@ -99,8 +99,9 @@ class ResourceListTests(BaseWebAPITestCase): expected_status=403) self.assertEqual(rsp['stat'], 'fail') + @webapi_test_template def test_post_with_invalid_user(self): - """Testing the POST groups//users/ API with invalid user""" + """Testing the POST API with invalid user""" self._login_user(admin=True) group = self.create_review_group() @@ -114,10 +115,9 @@ class ResourceListTests(BaseWebAPITestCase): self.assertEqual(group.users.count(), 0) + @webapi_test_template def test_post_with_self(self): - """Testing the POST groups//users/ API - with the requesting user - """ + """Testing the POST API with the requesting user""" group = self.create_review_group() self.assertFalse(self.user.is_superuser) @@ -130,9 +130,10 @@ class ResourceListTests(BaseWebAPITestCase): self.assertEqual(group.users.count(), 1) + @webapi_test_template def test_post_with_self_and_private_group(self): - """Testing the POST groups//users/ API - with the requesting user and private group + """Testing the POST API with the requesting user and private + group """ group = self.create_review_group(invite_only=True) self.assertFalse(group.is_accessible_by(self.user)) @@ -146,9 +147,9 @@ class ResourceListTests(BaseWebAPITestCase): self.assertEqual(group.users.count(), 0) @add_fixtures(['test_site']) + @webapi_test_template def test_post_with_self_and_site(self): - """Testing the POST groups//users/ API - with the requesting user on a local site + """Testing the POST API with the requesting user on a local site """ self.assertFalse(self.user.is_superuser) @@ -168,9 +169,10 @@ class ResourceListTests(BaseWebAPITestCase): self.assertEqual(group.users.count(), 1) @add_fixtures(['test_site']) + @webapi_test_template def test_post_with_self_and_unjoined_site(self): - """Testing the POST groups//users/ API - with the requesting user on an unjoined local site + """Testing the POST API with the requesting user on an unjoined + local site """ self.assertFalse(self.user.is_superuser) @@ -221,9 +223,9 @@ class ResourceItemTests(BaseWebAPITestCase): def check_delete_result(self, user, group, doc): self.assertNotIn(doc, group.users.all()) + @webapi_test_template def test_delete_with_self(self): - """Testing the DELETE groups//users// API - with the requesting user + """Testing the DELETE API with the requesting user """ group = self.create_review_group() group.users.add(self.user) @@ -236,9 +238,9 @@ class ResourceItemTests(BaseWebAPITestCase): self.assertEqual(group.users.count(), 0) @add_fixtures(['test_site']) + @webapi_test_template def test_delete_with_self_with_site(self): - """Testing the DELETE groups//users// API - with the requesting user on local site + """Testing the DELETE API with the requesting user on local site """ self.assertFalse(self.user.is_superuser) @@ -270,10 +272,9 @@ class ResourceItemTests(BaseWebAPITestCase): review_group_user_item_mimetype, doc) + @webapi_test_template def test_get_delete_link(self): - """Testing GET groups//users// API contains the correct - DELETE link - """ + """Testing GET API contains the correct DELETE link""" doc = User.objects.get(username='doc') group = self.create_review_group() group.users.add(doc) @@ -291,13 +292,15 @@ class ResourceItemTests(BaseWebAPITestCase): self.assertNotEqual(delete_href, get_user_item_url(doc.username)) + @add_fixtures(['test_site']) + @webapi_test_template def test_get_delete_link_local_site(self): - """Testing GET groups//users// API contains the correct - DELETE link with a local site + """Testing GET API contains the correct DELETE link with a local + site """ doc = User.objects.get(username='doc') - local_site = LocalSite.objects.create(name='local-site-1') + local_site = self.get_local_site(name=self.local_site_name) local_site.users.add(self.user) local_site.users.add(doc)