Skip to content

Commit 70b1271

Browse files
OleLaursenOleLaursen
committed
Fix broken wgcharter tests
 - Legacy-Id: 4203
1 parent d0dcd60 commit 70b1271

4 files changed

Lines changed: 33 additions & 84 deletions

File tree

‎ietf/wgcharter/models.py‎

Whitespace-only changes.

‎ietf/wgcharter/tests.py‎

Lines changed: 11 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -21,56 +21,16 @@
2121

2222
from utils import *
2323

24-
class SearchTestCase(django.test.TestCase):
24+
class EditCharterTestCase(django.test.TestCase):
2525
fixtures = ['names']
2626

27-
def test_search(self):
28-
make_test_data()
29-
30-
group = Group.objects.get(acronym="mars")
31-
group.charter.set_state(State.objects.get(slug="infrev", type="charter"))
32-
33-
r = self.client.get("/wgcharter/")
34-
self.assertEquals(r.status_code, 200)
35-
36-
r = self.client.get(urlreverse("wg_search"))
37-
self.assertEquals(r.status_code, 200)
38-
39-
r = self.client.get(urlreverse("wg_search_in_process"))
40-
self.assertEquals(r.status_code, 200)
41-
42-
r = self.client.get(urlreverse("wg_search_by_area", kwargs=dict(name=group.parent.acronym)))
43-
self.assertEquals(r.status_code, 200)
44-
45-
r = self.client.get(urlreverse("wg_search") + "?nameacronym=%s" % group.name.replace(" ", "+"))
46-
self.assertEquals(r.status_code, 302)
47-
48-
r = self.client.get(urlreverse("wg_search") + "?nameacronym=something")
49-
self.assertEquals(r.status_code, 200)
50-
51-
r = self.client.get(urlreverse("wg_search") + "?nameacronym=something&by=acronym&acronym=some")
52-
self.assertEquals(r.status_code, 200)
53-
54-
r = self.client.get(urlreverse("wg_search") + "?nameacronym=something&by=state&state=active&charter_state=")
55-
self.assertEquals(r.status_code, 200)
56-
57-
r = self.client.get(urlreverse("wg_search") + "?nameacronym=something&by=state&state=&charter_state=%s" % State.objects.get(type="charter", slug="approved").pk)
58-
self.assertEquals(r.status_code, 200)
59-
60-
r = self.client.get(urlreverse("wg_search") + "?nameacronym=something&by=ad&ad=%s" % Person.objects.get(name="Aread Irector").pk)
61-
self.assertEquals(r.status_code, 200)
62-
63-
r = self.client.get(urlreverse("wg_search") + "?nameacronym=something&by=area&area=%s" % group.parent.pk)
64-
self.assertEquals(r.status_code, 200)
65-
66-
r = self.client.get(urlreverse("wg_search") + "?nameacronym=something&by=anyfield&anyfield=something")
67-
self.assertEquals(r.status_code, 200)
27+
def setUp(self):
28+
self.charter_dir = os.path.abspath("tmp-charter-dir")
29+
os.mkdir(self.charter_dir)
30+
settings.CHARTER_PATH = self.charter_dir
6831

69-
r = self.client.get(urlreverse("wg_search") + "?nameacronym=something&by=eacronym&eacronym=someold")
70-
self.assertEquals(r.status_code, 200)
71-
72-
class WgStateTestCase(django.test.TestCase):
73-
fixtures = ['names']
32+
def tearDown(self):
33+
shutil.rmtree(self.charter_dir)
7434

7535
def test_change_state(self):
7636
make_test_data()
@@ -121,26 +81,14 @@ def test_change_state(self):
12181
else:
12282
self.assertTrue("State changed" in outbox[-1]['Subject'])
12383

124-
125-
class WgInfoTestCase(django.test.TestCase):
126-
fixtures = ['names']
127-
128-
def setUp(self):
129-
self.charter_dir = os.path.abspath("tmp-charter-dir")
130-
os.mkdir(self.charter_dir)
131-
settings.CHARTER_PATH = self.charter_dir
132-
133-
def tearDown(self):
134-
shutil.rmtree(self.charter_dir)
135-
13684
def test_edit_telechat_date(self):
13785
make_test_data()
13886

13987
# And make a charter for group
14088
group = Group.objects.get(acronym="mars")
14189
charter = group.charter
14290

143-
url = urlreverse('wg_edit_info', kwargs=dict(name=group.acronym))
91+
url = urlreverse('charter_telechat_date', kwargs=dict(name=group.acronym))
14492
login_testing_unauthorized(self, "secretary", url)
14593

14694
# add to telechat
@@ -197,7 +145,7 @@ def test_submit_charter(self):
197145
self.assertEquals(charter.rev, next_revision(prev_rev))
198146
self.assertTrue("new_revision" in charter.latest_event().type)
199147

200-
class WgEditPositionTestCase(django.test.TestCase):
148+
class CharterPositionTestCase(django.test.TestCase):
201149
fixtures = ['names', 'ballot']
202150

203151
def test_edit_position(self):
@@ -290,7 +238,7 @@ def test_edit_position_as_secretary(self):
290238
q = PyQuery(r.content)
291239
self.assertTrue(len(q('form input[name=position]')) > 0)
292240

293-
# vote for rhousley
241+
# vote for AD
294242
pos_before = charter.docevent_set.filter(type="changed_ballot_position").count()
295243
self.assertTrue(not charter.docevent_set.filter(type="changed_ballot_position", by__name="Sec Retary"))
296244

@@ -349,7 +297,7 @@ def test_send_ballot_comment(self):
349297
self.assertTrue("BLOCKING COMMENT" in outbox[-1]['Subject'])
350298
self.assertTrue("COMMENT" in outbox[-1]['Subject'])
351299

352-
class WgApproveBallotTestCase(django.test.TestCase):
300+
class CharterApproveBallotTestCase(django.test.TestCase):
353301
fixtures = ['names']
354302

355303
def setUp(self):

‎ietf/wgcharter/views_ballot.py‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@ def default_action_text(wg, charter, user, action):
4444
except IOError:
4545
info['charter_txt'] = "Error: couldn't read charter text"
4646

47-
e.text = render_to_string("wgcharter/action_text.txt",
48-
dict(wg=wg,
49-
charter_url=settings.IDTRACKER_BASE_URL + charter.get_absolute_url(),
50-
action_type=action,
51-
info=info,
52-
))
47+
e.text = render_to_string("wgcharter/action_text.txt",
48+
dict(wg=wg,
49+
charter_url=settings.IDTRACKER_BASE_URL + charter.get_absolute_url(),
50+
action_type=action,
51+
info=info,
52+
))
5353

54-
e.save()
55-
return e
54+
e.save()
55+
return e
5656

5757
def default_review_text(wg, charter, user):
5858
e = WriteupDocEvent(doc=charter, by=user)
@@ -77,15 +77,15 @@ def default_review_text(wg, charter, user):
7777
except IOError:
7878
info['charter_txt'] = "Error: couldn't read charter text"
7979

80-
e.text = render_to_string("wgcharter/review_text.txt",
81-
dict(wg=wg,
82-
charter_url=settings.IDTRACKER_BASE_URL + charter.get_absolute_url(),
83-
info=info,
84-
review_type="new" if wg.state_id == "proposed" else "recharter",
85-
)
86-
)
87-
e.save()
88-
return e
80+
e.text = render_to_string("wgcharter/review_text.txt",
81+
dict(wg=wg,
82+
charter_url=settings.IDTRACKER_BASE_URL + charter.get_absolute_url(),
83+
info=info,
84+
review_type="new" if wg.state_id == "proposed" else "recharter",
85+
)
86+
)
87+
e.save()
88+
return e
8989

9090
BALLOT_CHOICES = (("yes", "Yes"),
9191
("no", "No"),
@@ -491,7 +491,7 @@ def ballot_writeupnotes(request, name):
491491
),
492492
context_instance=RequestContext(request))
493493

494-
@role_required('Secretariat')
494+
@role_required("Secretariat")
495495
def approve_ballot(request, name):
496496
"""Approve ballot, changing state, copying charter"""
497497
try:
@@ -510,7 +510,7 @@ def approve_ballot(request, name):
510510
e = charter.latest_event(WriteupDocEvent, type="changed_action_announcement")
511511
if not e:
512512
if next_approved_revision(wg.charter.rev) == "01":
513-
announcement= default_action_text(wg, charter, login, "Formed").text
513+
announcement = default_action_text(wg, charter, login, "Formed").text
514514
else:
515515
announcement = default_action_text(wg, charter, login, "Rechartered").text
516516
else:

‎ietf/wgcharter/views_edit.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
from utils import *
1313
from mails import email_secretariat
14-
from ietf.ietfauth.decorators import group_required
14+
from ietf.ietfauth.decorators import role_required
1515
from ietf.iesg.models import TelechatDate
1616

1717
from ietf.doc.models import *
@@ -37,7 +37,7 @@ def __init__(self, *args, **kwargs):
3737
for f in self.hide:
3838
self.fields[f].widget = forms.HiddenInput
3939

40-
@group_required('Area_Director','Secretariat')
40+
@role_required("Area Director", "Secretariat")
4141
def change_state(request, name, option=None):
4242
"""Change state of WG and charter, notifying parties as necessary
4343
and logging the change as a comment."""
@@ -203,6 +203,7 @@ def __init__(self, *args, **kwargs):
203203
self.fields['telechat_date'].choices = [("", "(not on agenda)")] + [(d, d.strftime("%Y-%m-%d")) for d in dates]
204204

205205

206+
@role_required("Area Director", "Secretariat")
206207
def telechat_date(request, name):
207208
wg = get_object_or_404(Group, acronym=name)
208209
doc = set_or_create_charter(wg)

0 commit comments

Comments
 (0)