Fix more test errors - now only two not yet fully ported views remain

 - Legacy-Id: 8571

Author: OleLaursen

ietf/doc/migrations/0022_fill_in_shepherd_email.py

@@ -1,6 +1,5 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 from south.v2 import DataMigration
-import debug
 
 class Migration(DataMigration):
 

ietf/doc/templatetags/ietf_filters.py

@@ -8,8 +8,9 @@
 
 from ietf.doc.models import ConsensusDocEvent
 from django import template
+from django.conf import settings
 from django.utils.html import escape, fix_ampersands
-from django.template.defaultfilters import truncatewords_html, linebreaksbr, stringfilter, urlize, striptags
+from django.template.defaultfilters import truncatewords_html, linebreaksbr, stringfilter, striptags, urlize
 from django.template import resolve_variable
 from django.utils.safestring import mark_safe, SafeData
 from django.utils.html import strip_tags
@@ -528,7 +529,6 @@ def pos_to_label(text):
 
 @register.filter
 def capfirst_allcaps(text):
-    from django.template import defaultfilters
     """Like capfirst, except it doesn't lowercase words in ALL CAPS."""
     result = text
     i = False
@@ -543,10 +543,8 @@ def capfirst_allcaps(text):
 
 @register.filter
 def lower_allcaps(text):
-    from django.template import defaultfilters
     """Like lower, except it doesn't lowercase words in ALL CAPS."""
     result = text
-    i = False
     for token in re.split("(\W+)", striptags(text)):
         if not re.match("^[A-Z]+$", token):
             result = result.replace(token, token.lower())
@@ -561,7 +559,6 @@ def urlize_html(html, autoescape=False):
     """
     try:
         from BeautifulSoup import BeautifulSoup
-        from django.utils.html import urlize
     except ImportError:
         if settings.DEBUG:
             raise template.TemplateSyntaxError, "Error in urlize_html The Python BeautifulSoup libraries aren't installed."

ietf/doc/tests_conflict_review.py

@@ -45,13 +45,13 @@ def test_start_review_as_secretary(self):
         r = self.client.post(url,dict(create_in_state=""))
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertTrue(len(q('form ul.errorlist')) > 0)
+        self.assertTrue(len(q('form .has-error')) > 0)
         self.assertEqual(Document.objects.filter(name='conflict-review-imaginary-independent-submission').count() , 0)
 
         r = self.client.post(url,dict(ad=""))
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertTrue(len(q('form ul.errorlist')) > 0)
+        self.assertTrue(len(q('form .has-error')) > 0)
         self.assertEqual(Document.objects.filter(name='conflict-review-imaginary-independent-submission').count() , 0)
 
         # successful review start
@@ -139,7 +139,7 @@ def test_change_state(self):
         r = self.client.post(url,dict(review_state=""))
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertTrue(len(q('form ul.errorlist')) > 0)
+        self.assertTrue(len(q('form .has-error')) > 0)
 
         # successful change to AD Review
         adrev_pk = str(State.objects.get(used=True, slug='adrev',type__slug='conflrev').pk)
@@ -274,7 +274,7 @@ def approve_test_helper(self,approve_type):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertEqual(len(q('form.approve')),1)
+        self.assertEqual(len(q('[type=submit]:contains("Send announcement")')), 1)
         if approve_type == 'appr-noprob':
             self.assertTrue( 'IESG has no problem' in ''.join(wrap(r.content,2**16)))
         else:

ietf/doc/tests_status_change.py

@@ -41,25 +41,25 @@ def test_start_review(self):
         r = self.client.post(url,dict(document_name="bogus",title="Bogus Title",ad="",create_in_state=state_strpk,notify='ipu@ietf.org'))
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertTrue(len(q('form ul.errorlist')) > 0)
+        self.assertTrue(len(q('form .has-error')) > 0)
 
         ## Must set a name
         r = self.client.post(url,dict(document_name="",title="Bogus Title",ad=ad_strpk,create_in_state=state_strpk,notify='ipu@ietf.org'))
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertTrue(len(q('form ul.errorlist')) > 0)
+        self.assertTrue(len(q('form .has-error')) > 0)
 
         ## Must not choose a document name that already exists
         r = self.client.post(url,dict(document_name="imaginary-mid-review",title="Bogus Title",ad=ad_strpk,create_in_state=state_strpk,notify='ipu@ietf.org'))
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertTrue(len(q('form ul.errorlist')) > 0)
+        self.assertTrue(len(q('form .has-error')) > 0)
 
         ## Must set a title
         r = self.client.post(url,dict(document_name="bogus",title="",ad=ad_strpk,create_in_state=state_strpk,notify='ipu@ietf.org'))
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertTrue(len(q('form ul.errorlist')) > 0)
+        self.assertTrue(len(q('form .has-error')) > 0)
 
         # successful status change start
         r = self.client.post(url,dict(document_name="imaginary-new",title="A new imaginary status change",ad=ad_strpk,
@@ -90,7 +90,7 @@ def test_change_state(self):
         r = self.client.post(url,dict(new_state=""))
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertTrue(len(q('form ul.errorlist')) > 0)
+        self.assertTrue(len(q('form .has-error')) > 0)
 
         # successful change to AD Review
         adrev_pk = str(State.objects.get(slug='adrev',type__slug='statchg').pk)
@@ -283,7 +283,7 @@ def test_edit_lc(self):
         messages_before = len(outbox)
         r = self.client.post(url,dict(last_call_text='stuff',send_last_call_request='Save+and+Request+Last+Call'))
         self.assertEqual(r.status_code,200)
-        self.assertTrue( 'Last Call Requested' in ''.join(wrap(r.content,2**16)))
+        self.assertTrue( 'Last call requested' in ''.join(wrap(r.content,2**16)))
         self.assertEqual(len(outbox), messages_before + 1)
         self.assertTrue('iesg-secretary' in outbox[-1]['To'])
         self.assertTrue('Last Call:' in outbox[-1]['Subject'])
@@ -307,7 +307,7 @@ def test_approve(self):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertEqual(len(q('form.approve')),1)
+        self.assertEqual(len(q('[type=submit]:contains("Send announcement")')), 1)
         # There should be two messages to edit
         self.assertEqual(q('input#id_form-TOTAL_FORMS').val(),'2')
         self.assertTrue( '(rfc9999) to Internet Standard' in ''.join(wrap(r.content,2**16)))
@@ -345,7 +345,7 @@ def test_edit_relations(self):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertEqual(len(q('form.edit-status-change-rfcs')),1)
+        self.assertEqual(len(q('.content-wrapper [type=submit]:contains("Save")')),1)
         # There should be three rows on the form
         self.assertEqual(len(q('tr[id^=relation_row]')),3)
 
@@ -355,23 +355,23 @@ def test_edit_relations(self):
                                       Submit="Submit"))
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertTrue(len(q('form ul.errorlist')) > 0)
+        self.assertTrue(len(q('form .has-error')) > 0)
 
        # Try to add a relation leaving the relation type blank
         r = self.client.post(url,dict(new_relation_row_blah="rfc9999",
                                       statchg_relation_row_blah="",
                                       Submit="Submit"))
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertTrue(len(q('form ul.errorlist')) > 0)
+        self.assertTrue(len(q('form .has-error')) > 0)
 
        # Try to add a relation with an unknown relationship type
         r = self.client.post(url,dict(new_relation_row_blah="rfc9999",
                                       statchg_relation_row_blah="badslug",
                                       Submit="Submit"))
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertTrue(len(q('form ul.errorlist')) > 0)
+        self.assertTrue(len(q('form .has-error')) > 0)
 
         # Successful change of relations
         r = self.client.post(url,dict(new_relation_row_blah="rfc9999",

ietf/group/tests_info.py

@@ -99,7 +99,7 @@ def test_chartering_groups(self):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertEqual(len(q('table.ietf-doctable td.acronym a:contains("%s")' % group.acronym)), 1)
+        self.assertEqual(len(q('.content-wrapper a:contains("%s")' % group.acronym)), 1)
 
     def test_concluded_groups(self):
         draft = make_test_data()
@@ -111,7 +111,7 @@ def test_concluded_groups(self):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertEqual(len(q('table.concluded-groups a:contains("%s")' % group.acronym)), 1)
+        self.assertEqual(len(q('.content-wrapper a:contains("%s")' % group.acronym)), 1)
 
     def test_bofs(self):
         draft = make_test_data()
@@ -123,7 +123,7 @@ def test_bofs(self):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertEqual(len(q('table.ietf-doctable td.acronym a:contains("%s")' % group.acronym)), 1)
+        self.assertEqual(len(q('.content-wrapper a:contains("%s")' % group.acronym)), 1)
 
     def test_group_documents(self):
         draft = make_test_data()
@@ -302,7 +302,7 @@ def test_create(self):
         r = self.client.post(url, dict(acronym="foobarbaz")) # No name
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertTrue(len(q('form ul.errorlist')) > 0)
+        self.assertTrue(len(q('form .has-error')) > 0)
         self.assertEqual(len(Group.objects.filter(type="wg")), num_wgs)
 
         # acronym contains non-alphanumeric
@@ -330,7 +330,7 @@ def test_create(self):
         self.assertEqual(group.charter.name, "charter-ietf-testwg")
         self.assertEqual(group.charter.rev, "00-00")
 
-    def test_create_based_on_existing(self):
+    def test_create_based_on_existing_bof(self):
         make_test_data()
 
         url = urlreverse('group_create', kwargs=dict(group_type="wg"))
@@ -342,7 +342,7 @@ def test_create_based_on_existing(self):
         r = self.client.post(url, dict(name="Test", acronym=group.parent.acronym))
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertTrue(len(q('form ul.errorlist')) > 0)
+        self.assertTrue(len(q('form .has-error')) > 0)
         self.assertEqual(len(q('form input[name="confirmed"]')), 0) # can't confirm us out of this
 
         # try elevating BoF to WG
@@ -352,7 +352,7 @@ def test_create_based_on_existing(self):
         r = self.client.post(url, dict(name="Test", acronym=group.acronym))
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertTrue(len(q('form ul.errorlist')) > 0)
+        self.assertTrue(len(q('form .has-error')) > 0)
         self.assertEqual(len(q('form input[name="confirmed"]')), 1)
 
         self.assertEqual(Group.objects.get(acronym=group.acronym).state_id, "bof")
@@ -383,7 +383,7 @@ def test_edit_info(self):
         r = self.client.post(url, dict(acronym="collide"))
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertTrue(len(q('form ul.errorlist')) > 0)
+        self.assertTrue(len(q('form .has-error')) > 0)
 
         # create old acronym
         group.acronym = "oldmars"
@@ -396,7 +396,7 @@ def test_edit_info(self):
         r = self.client.post(url, dict(acronym="oldmars"))
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertTrue(len(q('form ul.errorlist')) > 0)
+        self.assertTrue(len(q('form .has-error')) > 0)
 
         # edit info
         with open(os.path.join(self.charter_dir, "%s-%s.txt" % (group.charter.canonical_name(), group.charter.rev)), "w") as f:
@@ -453,7 +453,7 @@ def test_conclude(self):
         r = self.client.post(url, dict(instructions="")) # No instructions
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertTrue(len(q('form ul.errorlist')) > 0)
+        self.assertTrue(len(q('form .has-error')) > 0)
 
         # request conclusion
         mailbox_before = len(outbox)

ietf/ipr/tests.py

@@ -158,7 +158,7 @@ def test_new_generic(self):
             })
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertTrue(len(q("ul.errorlist")) > 0)
+        self.assertTrue(len(q("form .has-error")) > 0)
 
         # successful post
         r = self.client.post(url, {

ietf/mailinglists/tests.py

@@ -18,13 +18,13 @@ def test_groups(self):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertEqual(len(q(".group-archives a:contains(\"%s\")" % group.acronym)), 0)
+        self.assertEqual(len(q(".content-wrapper a:contains(\"%s\")" % group.acronym)), 0)
 
         # successful get
         group.list_archive = "https://example.com/foo"
         group.save()
         r = self.client.get(url)
         q = PyQuery(r.content)
-        self.assertEqual(len(q(".group-archives a:contains(\"%s\")" % group.acronym)), 1)
+        self.assertEqual(len(q(".content-wrapper a:contains(\"%s\")" % group.acronym)), 1)
 
 

ietf/meeting/tests_views.py

@@ -38,19 +38,22 @@ def test_agenda(self):
         session = Session.objects.filter(meeting=meeting, group__acronym="mars").first()
         slot = TimeSlot.objects.get(scheduledsession__session=session)
 
-        time_interval = "%s-%s" % (slot.time.strftime("%H%M"), (slot.time + slot.duration).strftime("%H%M"))
+        time_interval = "%s-%s" % (slot.time.strftime("%H:%M").lstrip("0"), (slot.time + slot.duration).strftime("%H:%M").lstrip("0"))
 
         # plain
         r = self.client.get(urlreverse("ietf.meeting.views.agenda", kwargs=dict(num=meeting.number)))
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        agenda_content = q("#agenda").html()
+        agenda_content = q(".content-wrapper").html()
         self.assertTrue(session.group.acronym in agenda_content)
         self.assertTrue(session.group.name in agenda_content)
         self.assertTrue(session.group.parent.acronym.upper() in agenda_content)
         self.assertTrue(slot.location.name in agenda_content)
         self.assertTrue(time_interval in agenda_content)
 
+        # the rest of the results don't have as nicely formatted times
+        time_interval = time_interval.replace(":", "")
+
         # mobile
         r = self.client.get(urlreverse("ietf.meeting.views.agenda", kwargs=dict(num=meeting.number)),
                             { '_testiphone': "1" })
@@ -124,12 +127,11 @@ def test_materials(self):
 
         r = self.client.get(urlreverse("ietf.meeting.views.materials", kwargs=dict(meeting_num=meeting.number)))
         self.assertEqual(r.status_code, 200)
-        #debug.show('r.content')
         q = PyQuery(r.content)
-        row = q('.ietf-materials b:contains("%s")' % str(session.group.acronym.upper())).closest("tr")
-        self.assertTrue(row.find("a:contains(\"Agenda\")"))
-        self.assertTrue(row.find("a:contains(\"Minutes\")"))
-        self.assertTrue(row.find("a:contains(\"Slideshow\")"))
+        row = q('.content-wrapper td:contains("%s")' % str(session.group.acronym)).closest("tr")
+        self.assertTrue(row.find('a:contains("Agenda")'))
+        self.assertTrue(row.find('a:contains("Minutes")'))
+        self.assertTrue(row.find('a:contains("Slideshow")'))
 
         # FIXME: missing tests of .pdf/.tar generation (some code can
         # probably be lifted from similar tests in iesg/tests.py)