More test fixes

 - Legacy-Id: 19803

Author: larseggert

ietf/community/tests.py

@@ -101,7 +101,6 @@ def test_view_list(self):
         self.assertContains(r, draft.name)
 
     def test_manage_personal_list(self):
-        return  # FIXME-LARS
 
         PersonFactory(user__username='plain')
         ad = Person.objects.get(user__username='ad')
@@ -116,7 +115,7 @@ def test_manage_personal_list(self):
         # add document
         self.assertIn('add_document', page.forms)
         form = page.forms['add_document']
-        form['documents']=draft.pk
+        form['documents'].options=[(draft.pk, True, draft.name)]
         page = form.submit('action',value='add_documents')
         self.assertEqual(page.status_int, 302)
         clist = CommunityList.objects.get(user__username="plain")
@@ -173,7 +172,6 @@ def test_manage_personal_list(self):
         self.assertTrue(not clist.searchrule_set.filter(rule_type="author_rfc"))
 
     def test_manage_group_list(self):
-        return  # FIXME-LARS
         draft = WgDraftFactory(group__acronym='mars')
         RoleFactory(group__acronym='mars',name_id='chair',person=PersonFactory(user__username='marschairman'))
 

ietf/doc/tests.py

@@ -228,7 +228,6 @@ def test_frontpage(self):
         self.assertContains(r, "Document Search")
 
     def test_docs_for_ad(self):
-        return  # FIXME-LARS
         ad = RoleFactory(name_id='ad',group__type_id='area',group__state_id='active').person
         draft = IndividualDraftFactory(ad=ad)
         draft.action_holders.set([PersonFactory()])
@@ -273,7 +272,6 @@ def test_auth48_doc_for_ad(self):
         self.assertContains(r, 'title="AUTH48"')  # title attribute of AUTH48 badge in auth48_alert_badge filter
 
     def test_drafts_in_last_call(self):
-        return  # FIXME-LARS
         draft = IndividualDraftFactory(pages=1)
         draft.action_holders.set([PersonFactory()])
         draft.set_state(State.objects.get(type="draft-iesg", slug="lc"))
@@ -283,7 +281,6 @@ def test_drafts_in_last_call(self):
         self.assertContains(r, escape(draft.action_holders.first().plain_name()))
 
     def test_in_iesg_process(self):
-        return  # FIXME-LARS
         doc_in_process = IndividualDraftFactory()
         doc_in_process.action_holders.set([PersonFactory()])
         doc_in_process.set_state(State.objects.get(type='draft-iesg', slug='lc'))
@@ -334,7 +331,6 @@ def test_ajax_search_docs(self):
         self.assertEqual(data[0]["id"], doc_alias.pk)
 
     def test_recent_drafts(self):
-        return  # FIXME-LARS
         # Three drafts to show with various warnings
         drafts = WgDraftFactory.create_batch(3,states=[('draft','active'),('draft-iesg','ad-eval')])
         for index, draft in enumerate(drafts):
@@ -800,7 +796,6 @@ def login(self, username):
         self.client.login(username=username, password=username + '+password')
 
     def test_edit_authors_permissions(self):
-        return  # FIXME-LARS
         """Only the secretariat may edit authors"""
         draft = WgDraftFactory(authors=PersonFactory.create_batch(3))
         RoleFactory(group=draft.group, name_id='chair')
@@ -915,7 +910,6 @@ def _add_prefix(s):
         post_data[_add_prefix(str(form_index) + '-ORDER')] = str(insert_order)
 
     def test_edit_authors_missing_basis(self):
-        return  # FIXME-LARS
         draft = WgDraftFactory()
         DocumentAuthorFactory.create_batch(3, document=draft)
         url = urlreverse('ietf.doc.views_doc.edit_authors', kwargs=dict(name=draft.name))
@@ -932,7 +926,6 @@ def test_edit_authors_missing_basis(self):
         self.assertContains(r, 'This field is required.')
 
     def test_edit_authors_no_change(self):
-        return  # FIXME-LARS
         draft = WgDraftFactory()
         DocumentAuthorFactory.create_batch(3, document=draft)
         url = urlreverse('ietf.doc.views_doc.edit_authors', kwargs=dict(name=draft.name))
@@ -1011,15 +1004,12 @@ def do_edit_authors_append_authors_test(self, new_author_count):
             self.assertIn(auth.name, evt.desc)
 
     def test_edit_authors_append_author(self):
-        return  # FIXME-LARS
         self.do_edit_authors_append_authors_test(1)
 
     def test_edit_authors_append_authors(self):
-        return  # FIXME-LARS
         self.do_edit_authors_append_authors_test(3)
 
     def test_edit_authors_insert_author(self):
-        return  # FIXME-LARS
         """Can add author in the middle of the list"""
         draft = WgDraftFactory()
         DocumentAuthorFactory.create_batch(3, document=draft)
@@ -1076,7 +1066,6 @@ def test_edit_authors_insert_author(self):
         self.assertEqual(reorder_events.count(), 2)
 
     def test_edit_authors_remove_author(self):
-        return  # FIXME-LARS
         draft = WgDraftFactory()
         DocumentAuthorFactory.create_batch(3, document=draft)
         url = urlreverse('ietf.doc.views_doc.edit_authors', kwargs=dict(name=draft.name))
@@ -1127,7 +1116,6 @@ def test_edit_authors_remove_author(self):
         self.assertIn(reordered_person.name, reordered_event.desc)
 
     def test_edit_authors_reorder_authors(self):
-        return  # FIXME-LARS
         draft = WgDraftFactory()
         DocumentAuthorFactory.create_batch(3, document=draft)
         url = urlreverse('ietf.doc.views_doc.edit_authors', kwargs=dict(name=draft.name))
@@ -1184,7 +1172,6 @@ def test_edit_authors_reorder_authors(self):
         )
 
     def test_edit_authors_edit_fields(self):
-        return  # FIXME-LARS
         draft = WgDraftFactory()
         DocumentAuthorFactory.create_batch(3, document=draft)
         url = urlreverse('ietf.doc.views_doc.edit_authors', kwargs=dict(name=draft.name))
@@ -1287,14 +1274,13 @@ def test_document_draft_shows_action_holders(self, mock_method):
         with self.settings(DOC_ACTION_HOLDER_AGE_LIMIT_DAYS=20):
             r = self.client.get(url)
 
-        # FIXME-LARS
-        # self.assertContains(r, 'Action Holders')  # should still be shown
-        # q = PyQuery(r.content)
-        # self.assertEqual(len(self._pyquery_select_action_holder_string(q, '(None)')), 0)
-        # for person in draft.action_holders.all():
-        #     self.assertEqual(len(self._pyquery_select_action_holder_string(q, person.plain_name())), 1)
-        # # check that one action holder was marked as old
-        # self.assertEqual(len(self._pyquery_select_action_holder_string(q, 'for 30 days')), 1)
+        self.assertContains(r, 'Action Holders')  # should still be shown
+        q = PyQuery(r.content)
+        self.assertEqual(len(self._pyquery_select_action_holder_string(q, '(None)')), 0)
+        for person in draft.action_holders.all():
+            self.assertEqual(len(self._pyquery_select_action_holder_string(q, person.plain_name())), 1)
+        # check that one action holder was marked as old
+        self.assertEqual(len(self._pyquery_select_action_holder_string(q, 'for 30 days')), 1)
 
     @mock.patch.object(Document, 'action_holders_enabled', return_value=True, new_callable=mock.PropertyMock)
     def test_document_draft_action_holders_buttons(self, mock_method):
@@ -1456,12 +1442,11 @@ def _change_state(doc, state):
 
 class DocTestCase(TestCase):
     def test_status_change(self):
-        return  # FIXME-LARS
         statchg = StatusChangeFactory()
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=statchg.name)))
         self.assertEqual(r.status_code, 200)
-        r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=statchg.relateddocument_set.first().target.document.canonical_name())))
-        self.assertEqual(r.status_code, 200)
+        r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=statchg.relateddocument_set.first().target.document)))
+        self.assertEqual(r.status_code, 302)
 
     def test_document_charter(self):
         CharterFactory(name='charter-ietf-mars')
@@ -2381,7 +2366,6 @@ def test_personal_chart(self):
 
 class FieldTests(TestCase):
     def test_searchabledocumentsfield_pre(self):
-        return  # FIXME-LARS
         # so far, just tests that the format expected by select2 set up
         docs = IndividualDraftFactory.create_batch(3)
 
@@ -2391,8 +2375,7 @@ class _TestForm(Form):
         form = _TestForm(initial=dict(test_field=docs))
         html = str(form)
         q = PyQuery(html)
-        json_data = q('input.select2-field').attr('data-pre')
-        print(json_data)
+        json_data = q('.select2-field').attr('data-pre')
         try:
             decoded = json.loads(json_data)
         except json.JSONDecodeError as e:
@@ -2401,7 +2384,7 @@ class _TestForm(Form):
         self.assertCountEqual(decoded_ids, [str(doc.id) for doc in docs])
         for doc in docs:
             self.assertEqual(
-                dict(id=doc.pk, text=escape(uppercase_std_abbreviated_name(doc.name))),
+                dict(id=doc.pk, selected=True, text=escape(uppercase_std_abbreviated_name(doc.name))),
                 decoded[str(doc.pk)],
             )
 

ietf/doc/tests_bofreq.py

@@ -173,7 +173,7 @@ def test_change_editors(self):
         new_editors.discard(acting_editor)
         new_editors.add(PersonFactory())
         url = urlreverse('ietf.doc.views_bofreq.change_editors', kwargs=dict(name=doc.name))
-        postdict = dict(editors=','.join([str(p.pk) for p in new_editors]))
+        postdict = dict(editors=[str(p.pk) for p in new_editors])
         r = self.client.post(url, postdict)
         self.assertEqual(r.status_code,302)
         editors = bofreq_editors(doc)
@@ -196,7 +196,7 @@ def test_change_editors(self):
             new_editors = set(previous_editors)
             new_editors.discard(acting_editor)
             new_editors.add(PersonFactory())
-            postdict = dict(editors=','.join([str(p.pk) for p in new_editors]))
+            postdict = dict(editors=[str(p.pk) for p in new_editors])
             r = self.client.post(url,postdict)
             self.assertEqual(r.status_code, 302)
             updated_editors = bofreq_editors(doc)
@@ -213,7 +213,7 @@ def test_change_responsible(self):
         new_responsible = set(previous_responsible[1:])
         new_responsible.add(RoleFactory(group__type_id='area',name_id='ad').person)
         url = urlreverse('ietf.doc.views_bofreq.change_responsible', kwargs=dict(name=doc.name))
-        postdict = dict(responsible=','.join([str(p.pk) for p in new_responsible]))
+        postdict = dict(responsible=[str(p.pk) for p in new_responsible])
         r = self.client.post(url, postdict)
         self.assertEqual(r.status_code,302)
         responsible = bofreq_responsible(doc)
@@ -235,7 +235,7 @@ def test_change_responsible(self):
                 self.assertIn(responsible.name,unescaped)
             new_responsible = set(previous_responsible)
             new_responsible.add(RoleFactory(group__type_id='area',name_id='ad').person)
-            postdict = dict(responsible=','.join([str(p.pk) for p in new_responsible]))
+            postdict = dict(responsible=[str(p.pk) for p in new_responsible])
             r = self.client.post(url,postdict)
             self.assertEqual(r.status_code, 302)
             updated_responsible = bofreq_responsible(doc)
@@ -256,11 +256,11 @@ def test_change_responsible_validation(self):
         pks = set()
         pks.update([p.pk for p in good_batch])
         pks.update([p.pk for p in bad_batch])
-        postdict = dict(responsible=','.join([str(pk) for pk in pks]))
+        postdict = dict(responsible=[str(pk) for pk in pks])
         r = self.client.post(url,postdict)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        error_text = q('.is-invalid .alert').text()
+        error_text = q('.invalid-feedback').text()
         for p in good_batch:
             self.assertNotIn(p.plain_name(), error_text)
         for p in bad_batch:

ietf/doc/tests_downref.py

@@ -48,7 +48,6 @@ def test_downref_registry(self):
         self.assertContains(r, 'Add downref')
 
     def test_downref_registry_add(self):
-        return  # FIXME-LARS
         url = urlreverse('ietf.doc.views_downref.downref_registry_add')
         login_testing_unauthorized(self, "plain", url)
 

ietf/doc/tests_draft.py

@@ -1076,7 +1076,6 @@ def test_doc_change_ad_allows_pre_ad(self):
         self.assertEqual(doc.ad, pre_ad, 'Pre-AD was not actually assigned')
 
     def test_doc_change_shepherd(self):
-        return  # FIXME-LARS
         doc = Document.objects.get(name=self.docname)
         doc.shepherd = None
         doc.save_with_history([DocEvent.objects.create(doc=doc, rev=doc.rev, type="changed_shepherd", by=Person.objects.get(user__username="secretary"), desc="Test")])
@@ -1094,7 +1093,7 @@ def test_doc_change_shepherd(self):
         r = self.client.get(url)
         self.assertEqual(r.status_code,200)
         q = PyQuery(r.content)
-        self.assertEqual(len(q('form input[id=id_shepherd]')),1)
+        self.assertEqual(len(q('form select[id=id_shepherd]')),1)
 
         # change the shepherd
         plain_email = Email.objects.get(person__name="Plain Man")
@@ -1116,7 +1115,7 @@ def test_doc_change_shepherd(self):
         self.assertTrue(any(['no changes have been made' in m.message for m in r.context['messages']]))
 
         # Remove the shepherd
-        r = self.client.post(url, dict(shepherd=''))
+        r = self.client.post(url, dict(shepherd=[]))
         self.assertEqual(r.status_code, 302)
         doc = Document.objects.get(name=self.docname)
         self.assertTrue(any(['Document shepherd changed to (None)' in x.desc for x in doc.docevent_set.filter(time=doc.time,type='added_comment')]))
@@ -1294,10 +1293,9 @@ def do_doc_change_action_holders_test(self, username):
                              'Expected "Remove %s" button for' % role_name)
 
         def _test_changing_ah(action_holders, reason):
-            return  # FIXME-LARS
             r = self.client.post(url, dict(
                 reason=reason,
-                action_holders=','.join([str(p.pk) for p in action_holders]),
+                action_holders=[str(p.pk) for p in action_holders],
             ))
             self.assertEqual(r.status_code, 302)
             doc = Document.objects.get(name=self.docname)
@@ -1322,7 +1320,6 @@ def test_doc_change_action_holders_as_ad(self):
         self.do_doc_change_action_holders_test('ad')
 
     def do_doc_remind_action_holders_test(self, username):
-        return  # FIXME-LARS
         doc = Document.objects.get(name=self.docname)
         doc.action_holders.set(PersonFactory.create_batch(3))
 
@@ -1840,7 +1837,6 @@ def setUp(self):
 
 
     def test_change_replaces(self):
-        return  # FIXME-LARS
         url = urlreverse('ietf.doc.views_draft.replaces', kwargs=dict(name=self.replacea.name))
         login_testing_unauthorized(self, "secretary", url)
 
@@ -1869,7 +1865,7 @@ def test_change_replaces(self):
         # Post that says replaceboth replaces both base a and base b
         url = urlreverse('ietf.doc.views_draft.replaces', kwargs=dict(name=self.replaceboth.name))
         self.assertEqual(self.baseb.get_state().slug,'expired')
-        r = self.client.post(url, dict(replaces='%s,%s' % (self.basea.pk, self.baseb.pk)))
+        r = self.client.post(url, dict(replaces=[self.basea.pk, self.baseb.pk]))
         self.assertEqual(r.status_code, 302)
         self.assertEqual(Document.objects.get(name='draft-test-base-a').get_state().slug,'repl')
         self.assertEqual(Document.objects.get(name='draft-test-base-b').get_state().slug,'repl')
@@ -1880,7 +1876,7 @@ def test_change_replaces(self):
 
         # Post that undoes replaceboth
         empty_outbox()
-        r = self.client.post(url, dict(replaces=""))
+        r = self.client.post(url, dict(replaces=[]))
         self.assertEqual(r.status_code, 302)
         self.assertEqual(Document.objects.get(name='draft-test-base-a').get_state().slug,'repl') # Because A is still also replaced by replacea
         self.assertEqual(Document.objects.get(name='draft-test-base-b').get_state().slug,'expired')
@@ -1892,7 +1888,7 @@ def test_change_replaces(self):
         # Post that undoes replacea
         empty_outbox()
         url = urlreverse('ietf.doc.views_draft.replaces', kwargs=dict(name=self.replacea.name))
-        r = self.client.post(url, dict(replaces=""))
+        r = self.client.post(url, dict(replaces=[]))
         self.assertEqual(r.status_code, 302)
         self.assertEqual(Document.objects.get(name='draft-test-base-a').get_state().slug,'active')
         self.assertTrue('basea_author@' in outbox[-1]['To'])
@@ -1921,7 +1917,6 @@ def test_review_possibly_replaces(self):
 class MoreReplacesTests(TestCase):
 
     def test_stream_state_changes_when_replaced(self):
-        return  # FIXME-LARS
         self.client.login(username='secretary',password='secretary+password')
         for stream in ('iab','irtf','ise'):
             old_doc = IndividualDraftFactory(stream_id=stream)