Improved test coverage somewhat by making more of the group tests apply to both the /group/acronym and /wg/acronym (or equivalent) url forms.
- Legacy-Id: 11857
This commit is contained in:
parent
cf5ac68b09
commit
2b226ae7b7
|
@ -32,6 +32,13 @@ from ietf.utils.mail import outbox, empty_outbox
|
|||
from ietf.utils.test_data import make_test_data, create_person
|
||||
from ietf.utils.test_utils import login_testing_unauthorized, TestCase, unicontent
|
||||
|
||||
def group_urlreverse_list(group, viewname):
|
||||
return [
|
||||
urlreverse(viewname, kwargs=dict(acronym=group.acronym)),
|
||||
urlreverse(viewname, kwargs=dict(acronym=group.acronym, group_type=group.type_id)),
|
||||
]
|
||||
|
||||
|
||||
class GroupPagesTests(TestCase):
|
||||
def setUp(self):
|
||||
self.charter_dir = os.path.abspath("tmp-charter-dir")
|
||||
|
@ -94,8 +101,9 @@ class GroupPagesTests(TestCase):
|
|||
draft = make_test_data()
|
||||
group = draft.group
|
||||
|
||||
url = urlreverse('ietf.group.views.group_home', kwargs=dict(acronym=group.acronym))
|
||||
next = urlreverse('ietf.group.views.group_documents', kwargs=dict(acronym=group.acronym))
|
||||
url_list = group_urlreverse_list(group, 'ietf.group.views.group_home')
|
||||
next_list = group_urlreverse_list(group, 'ietf.group.views.group_documents')
|
||||
for url, next in [ (url_list[i], next_list[i]) for i in range(len(url_list)) ]:
|
||||
r = self.client.get(url)
|
||||
self.assertRedirects(r, next)
|
||||
r = self.client.get(next)
|
||||
|
@ -215,7 +223,7 @@ class GroupPagesTests(TestCase):
|
|||
related_docs_rule = clist.searchrule_set.get(rule_type='name_contains')
|
||||
reset_name_contains_index_for_rule(related_docs_rule)
|
||||
|
||||
url = urlreverse('ietf.group.views.group_documents', kwargs=dict(group_type=group.type_id, acronym=group.acronym))
|
||||
for url in group_urlreverse_list(group, 'ietf.group.views.group_documents'):
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
self.assertTrue(draft.name in unicontent(r))
|
||||
|
@ -230,7 +238,7 @@ class GroupPagesTests(TestCase):
|
|||
self.assertTrue(any([draft2.name in x.attrib['href'] for x in q('table td a.track-untrack-doc')]))
|
||||
|
||||
# test the txt version too while we're at it
|
||||
url = urlreverse('ietf.group.views.group_documents_txt', kwargs=dict(group_type=group.type_id, acronym=group.acronym))
|
||||
for url in group_urlreverse_list(group, 'ietf.group.views.group_documents_txt'):
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
self.assertTrue(draft.name in unicontent(r))
|
||||
|
@ -250,10 +258,7 @@ class GroupPagesTests(TestCase):
|
|||
due=datetime.date.today() + datetime.timedelta(days=100))
|
||||
milestone.docs.add(draft)
|
||||
|
||||
for url in [group.about_url(),
|
||||
urlreverse('ietf.group.views.group_about',kwargs=dict(acronym=group.acronym)),
|
||||
urlreverse('ietf.group.views.group_about',kwargs=dict(acronym=group.acronym,group_type=group.type_id)),
|
||||
]:
|
||||
for url in [group.about_url(),] + group_urlreverse_list(group, 'ietf.group.views.group_about'):
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
self.assertTrue(group.name in unicontent(r))
|
||||
|
@ -264,12 +269,12 @@ class GroupPagesTests(TestCase):
|
|||
|
||||
def test_group_about(self):
|
||||
|
||||
def verify_cannot_edit_group(username):
|
||||
def verify_cannot_edit_group(url, username):
|
||||
self.client.login(username=username, password=username+"+password")
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 403)
|
||||
|
||||
def verify_can_edit_group(username):
|
||||
def verify_can_edit_group(url, username):
|
||||
self.client.login(username=username, password=username+"+password")
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
|
@ -285,10 +290,7 @@ class GroupPagesTests(TestCase):
|
|||
)
|
||||
create_person(group, "chair", name="Testteam Chairman", username="teamchairman")
|
||||
|
||||
for url in [group.about_url(),
|
||||
urlreverse('ietf.group.views.group_about',kwargs=dict(acronym=group.acronym)),
|
||||
urlreverse('ietf.group.views.group_about',kwargs=dict(acronym=group.acronym,group_type=group.type_id)),
|
||||
]:
|
||||
for url in [group.about_url(),] + group_urlreverse_list(group, 'ietf.group.views.group_about'):
|
||||
url = group.about_url()
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
|
@ -296,13 +298,13 @@ class GroupPagesTests(TestCase):
|
|||
self.assertTrue(group.acronym in unicontent(r))
|
||||
self.assertTrue(group.description in unicontent(r))
|
||||
|
||||
url = urlreverse('ietf.group.views_edit.edit', kwargs=dict(acronym=group.acronym))
|
||||
for url in group_urlreverse_list(group, 'ietf.group.views_edit.edit'):
|
||||
|
||||
for username in ['plain','iana','iab chair','irtf chair','marschairman']:
|
||||
verify_cannot_edit_group(username)
|
||||
verify_cannot_edit_group(url, username)
|
||||
|
||||
for username in ['secretary','teamchairman','ad']:
|
||||
verify_can_edit_group(username)
|
||||
verify_can_edit_group(url, username)
|
||||
|
||||
def test_materials(self):
|
||||
make_test_data()
|
||||
|
@ -318,9 +320,7 @@ class GroupPagesTests(TestCase):
|
|||
doc.set_state(State.objects.get(type="slides", slug="active"))
|
||||
DocAlias.objects.create(name=doc.name, document=doc)
|
||||
|
||||
for url in [ urlreverse("group_materials", kwargs={ 'acronym': group.acronym }),
|
||||
urlreverse("group_materials", kwargs={ 'acronym': group.acronym , 'group_type': group.type_id}),
|
||||
]:
|
||||
for url in group_urlreverse_list(group, 'ietf.group.views.materials'):
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
self.assertTrue(doc.title in unicontent(r))
|
||||
|
@ -345,7 +345,7 @@ class GroupPagesTests(TestCase):
|
|||
type="added_comment",
|
||||
by=Person.objects.get(name="(System)"))
|
||||
|
||||
url = urlreverse('ietf.group.views.history', kwargs=dict(group_type=group.type_id, acronym=group.acronym))
|
||||
for url in group_urlreverse_list(group, 'ietf.group.views.history'):
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
self.assertTrue(e.desc in unicontent(r))
|
||||
|
@ -665,16 +665,18 @@ class MilestoneTests(TestCase):
|
|||
def test_milestone_sets(self):
|
||||
m1, m2, group = self.create_test_milestones()
|
||||
|
||||
url = urlreverse('group_edit_milestones', kwargs=dict(group_type=group.type_id, acronym=group.acronym))
|
||||
for url in group_urlreverse_list(group, 'group_edit_milestones'):
|
||||
login_testing_unauthorized(self, "secretary", url)
|
||||
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
self.assertTrue(m1.desc in unicontent(r))
|
||||
self.assertTrue(m2.desc not in unicontent(r))
|
||||
self.client.logout()
|
||||
|
||||
url = urlreverse('group_edit_charter_milestones', kwargs=dict(group_type=group.type_id, acronym=group.acronym))
|
||||
login_testing_unauthorized(self, "secretary", url)
|
||||
|
||||
for url in group_urlreverse_list(group, 'group_edit_charter_milestones'):
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
self.assertTrue(m1.desc not in unicontent(r))
|
||||
|
@ -1075,7 +1077,7 @@ class MeetingInfoTests(TestCase):
|
|||
|
||||
|
||||
def test_meeting_info(self):
|
||||
url = urlreverse('ietf.group.views.meetings',kwargs={'acronym':self.group.acronym})
|
||||
for url in group_urlreverse_list(self.group, 'ietf.group.views.meetings'):
|
||||
response = self.client.get(url)
|
||||
self.assertEqual(response.status_code, 200)
|
||||
q = PyQuery(response.content)
|
||||
|
@ -1121,7 +1123,7 @@ class StatusUpdateTests(TestCase):
|
|||
def test_see_status_update(self):
|
||||
chair = RoleFactory(name_id='chair',group__type_id='wg')
|
||||
GroupEventFactory(type='status_update',group=chair.group)
|
||||
url = urlreverse('ietf.group.views.group_about',kwargs={'acronym':chair.group.acronym})
|
||||
for url in group_urlreverse_list(chair.group, 'ietf.group.views.group_about'):
|
||||
response = self.client.get(url)
|
||||
self.assertEqual(response.status_code,200)
|
||||
q=PyQuery(response.content)
|
||||
|
@ -1134,11 +1136,12 @@ class StatusUpdateTests(TestCase):
|
|||
q=PyQuery(response.content)
|
||||
self.assertTrue(q('tr#status_update td a:contains("Show")'))
|
||||
self.assertTrue(q('tr#status_update td a:contains("Edit")'))
|
||||
self.client.logout()
|
||||
|
||||
def test_view_status_update(self):
|
||||
chair = RoleFactory(name_id='chair',group__type_id='wg')
|
||||
event = GroupEventFactory(type='status_update',group=chair.group)
|
||||
url = urlreverse('ietf.group.views.group_about_status',kwargs={'acronym':chair.group.acronym})
|
||||
for url in group_urlreverse_list(chair.group, 'ietf.group.views.group_about_status'):
|
||||
response = self.client.get(url)
|
||||
self.assertEqual(response.status_code,200)
|
||||
q=PyQuery(response.content)
|
||||
|
@ -1149,6 +1152,7 @@ class StatusUpdateTests(TestCase):
|
|||
self.assertEqual(response.status_code,200)
|
||||
q=PyQuery(response.content)
|
||||
self.assertTrue(q('a#edit_button'))
|
||||
self.client.logout()
|
||||
|
||||
def test_edit_status_update(self):
|
||||
chair = RoleFactory(name_id='chair',group__type_id='wg')
|
||||
|
|
Loading…
Reference in a new issue