More select2 and test fixes.

 - Legacy-Id: 19781

Author: larseggert

ietf/api/tests.py

@@ -145,7 +145,6 @@ def test_api_set_session_video_url(self):
         self.assertEqual(event.by, recman)
 
     def test_api_upload_bluesheet(self):
-        return  # FIXME-LARS
         url = urlreverse('ietf.meeting.views.api_upload_bluesheet')
         recmanrole = RoleFactory(group__type_id='ietf', name_id='recman')
         recman = recmanrole.person

ietf/doc/fields.py

@@ -4,46 +4,33 @@
 
 import json
 
-from typing import Type  # pyflakes:ignore
+from typing import Type # pyflakes:ignore
 
 from django.utils.html import escape
-from django.db import models  # pyflakes:ignore
+from django.db import models # pyflakes:ignore
 from django.db.models import Q
 from django.urls import reverse as urlreverse
 
-import debug  # pyflakes:ignore
+import debug                            # pyflakes:ignore
 
 from ietf.doc.models import Document, DocAlias
 from ietf.doc.utils import uppercase_std_abbreviated_name
 from ietf.utils.fields import SearchableField
 
-
 def select2_id_doc_name(objs):
-    return [
-        {
-            "id": o.pk,
-            "text": escape(uppercase_std_abbreviated_name(o.name)),
-        }
-        for o in objs
-    ]
-
-
-def select2_id_name(objs):
-    return [
-        (o.pk, escape(uppercase_std_abbreviated_name(o.name))) for o in objs
-    ]
+    return [{
+        "id": o.pk,
+        "text": escape(uppercase_std_abbreviated_name(o.name)),
+    } for o in objs]
 
 
 def select2_id_doc_name_json(objs):
     return json.dumps(select2_id_doc_name(objs))
 
 
 class SearchableDocumentsField(SearchableField):
-    """
-    Server-based multi-select field for choosing documents using select2.js.
-    """
-
-    model = Document  # type: Type[models.Model]
+    """Server-based multi-select field for choosing documents using select2.js. """
+    model = Document # type: Type[models.Model]
     default_hint_text = "Type name to search for document"
 
     def __init__(self, doc_type="draft", *args, **kwargs):
@@ -59,50 +46,41 @@ def get_model_instances(self, item_ids):
 
         Accepts both names and pks as IDs
         """
-        names = [i for i in item_ids if not i.isdigit()]
-        ids = [i for i in item_ids if i.isdigit()]
-        objs = self.model.objects.filter(Q(name__in=names) | Q(id__in=ids))
+        names = [ i for i in item_ids if not i.isdigit() ]
+        ids   = [ i for i in item_ids if i.isdigit() ]
+        objs = self.model.objects.filter(
+            Q(name__in=names)|Q(id__in=ids)
+        )
         return self.doc_type_filter(objs)
 
     def make_select2_data(self, model_instances):
         """Get select2 data items"""
-        self.choices = select2_id_name(set(model_instances))
-        # FIXME-LARS: this only works with one selection, not multiple
-        self.initial = [tup[0] for tup in self.choices]
-
         return select2_id_doc_name(model_instances)
 
     def ajax_url(self):
         """Get the URL for AJAX searches"""
-        return urlreverse(
-            "ietf.doc.views_search.ajax_select2_search_docs",
-            kwargs={
-                "doc_type": self.doc_type,
-                "model_name": self.model.__name__.lower(),
-            },
-        )
+        return urlreverse('ietf.doc.views_search.ajax_select2_search_docs', kwargs={
+            "doc_type": self.doc_type,
+            "model_name": self.model.__name__.lower()
+        })
 
 
 class SearchableDocumentField(SearchableDocumentsField):
     """Specialized to only return one Document"""
-
     max_entries = 1
 
 
 class SearchableDocAliasesField(SearchableDocumentsField):
     """Search DocAliases instead of Documents"""
-
-    model = DocAlias  # type: Type[models.Model]
-
+    model = DocAlias # type: Type[models.Model]
+    
     def doc_type_filter(self, queryset):
         """Filter to include only desired doc type
 
         For DocAlias, pass through to the docs to check type.
         """
         return queryset.filter(docs__type=self.doc_type)
 
-
 class SearchableDocAliasField(SearchableDocAliasesField):
     """Specialized to only return one DocAlias"""
-
-    max_entries = 1
+    max_entries = 1

ietf/doc/tests_bofreq.py

@@ -60,7 +60,6 @@ def test_show_bof_requests(self):
 
 
     def test_bofreq_main_page(self):
-        return  # FIXME-LARS
         doc = BofreqFactory()
         doc.save_with_history(doc.docevent_set.all())
         self.write_bofreq_file(doc)
@@ -167,7 +166,6 @@ def test_edit_state(self):
             self.client.logout()
 
     def test_change_editors(self):
-        return  # FIXME-LARS
         doc = BofreqFactory()
         previous_editors = list(bofreq_editors(doc))
         acting_editor = previous_editors[0]
@@ -210,7 +208,6 @@ def test_change_editors(self):
 
 
     def test_change_responsible(self):
-        return  # FIXME-LARS
         doc = BofreqFactory()
         previous_responsible = list(bofreq_responsible(doc))
         new_responsible = set(previous_responsible[1:])
@@ -249,7 +246,6 @@ def test_change_responsible(self):
             self.assertIn('BOF Request responsible leadership changed',outbox[0]['Subject'])
 
     def test_change_responsible_validation(self):
-        return  # FIXME-LARS
         doc = BofreqFactory()
         url = urlreverse('ietf.doc.views_bofreq.change_responsible', kwargs=dict(name=doc.name))
         login_testing_unauthorized(self,'secretary',url)

ietf/doc/views_doc.py

@@ -719,7 +719,6 @@ def document_main(request, name, rev=None):
 
     raise Http404("Document not found: %s" % (name + ("-%s"%rev if rev else "")))
 
-
 def document_html(request, name, rev=None):
     found = fuzzy_find_documents(name, rev)
     num_found = found.documents.count()
@@ -735,12 +734,14 @@ def document_html(request, name, rev=None):
     if not os.path.exists(doc.get_file_name()):
         raise Http404("File not found: %s" % doc.get_file_name())
 
+
     if found.matched_rev or found.matched_name.startswith('rfc'):
         rev = found.matched_rev
     else:
         rev = doc.rev
     if rev:
         doc = doc.history_set.filter(rev=rev).first() or doc.fake_history_obj(rev)
+
     if doc.type_id in ['draft',]:
         doc.supermeta = build_doc_supermeta_block(doc)
         doc.meta = build_doc_meta_block(doc, settings.HTMLIZER_URL_PREFIX)
@@ -1910,4 +1911,4 @@ def rfcdiff_latest_json(request, name, rev=None):
                 response['previous'] = f'rfc{match.group(2)}'
     if not response:
         raise Http404
-    return HttpResponse(json.dumps(response), content_type='application/json')
+    return HttpResponse(json.dumps(response), content_type='application/json')

ietf/group/tests_info.py

@@ -198,7 +198,6 @@ def test_bofs(self):
         self.assertEqual(len(q('#content a:contains("%s")' % group.acronym)), 1)
 
     def test_group_documents(self):
-        return  # FIXME-LARS
         group = GroupFactory()
         setup_default_community_list_for_group(group)
         draft = WgDraftFactory(group=group)
@@ -339,7 +338,6 @@ def verify_can_edit_group(url, group, username):
                     verify_cannot_edit_group(url, group, username)
 
     def test_group_about_personnel(self):
-        return  # FIXME-LARS
         """Correct personnel should appear on the group About page"""
         group = GroupFactory()
         for role_name in group.features.default_used_roles:
@@ -582,7 +580,6 @@ def test_create_based_on_existing_bof(self):
 #         self.assertEqual(Group.objects.get(acronym=group.acronym).name, "Test")
 
     def test_edit_info(self):
-        return  # FIXME-LARS
         group = GroupFactory(acronym='mars',parent=GroupFactory(type_id='area'))
         CharterFactory(group=group)
         RoleFactory(group=group,name_id='chair',person__user__email='marschairman@example.org')
@@ -719,7 +716,6 @@ def test_edit_extresources(self):
 
 
     def test_edit_field(self):
-        return  # FIXME-LARS
         def _test_field(group, field_name, field_content, prohibited_form_names):
             url = urlreverse('ietf.group.views.edit', 
                              kwargs=dict(
@@ -763,7 +759,6 @@ def _test_field(group, field_name, field_content, prohibited_form_names):
         _test_field(group, 'liaison_cc_contact_roles', 'user@example.com, other_user@example.com', ['liaison_contact'])
 
     def test_edit_reviewers(self):
-        return  # FIXME-LARS
         group=GroupFactory(type_id='review',parent=GroupFactory(type_id='area'))
         other_group=GroupFactory(type_id='review',parent=GroupFactory(type_id='area'))
         review_req = ReviewRequestFactory(team=group)
@@ -960,7 +955,6 @@ def _assert_cleaned_data_equal(self, cleaned_data, post_data):
             self.assertEqual(actual, expected, 'unexpected value for {}'.format(attr))
 
     def do_edit_roles_test(self, group):
-        return  # FIXME-LARS
         # get post_data for the group
         orig_data = self._group_post_data(group)
 
@@ -1000,7 +994,6 @@ def test_edit_roles(self):
                 self.do_edit_roles_test(group)
 
     def test_need_parent(self):
-        return  # FIXME-LARS
         """GroupForm should enforce non-null parent when required"""
         group = GroupFactory()
         parent = group.parent
@@ -1076,7 +1069,6 @@ def last_day_of_month(self, d):
 
 
     def test_milestone_sets(self):
-        return  # FIXME-LARS
         m1, m2, group = self.create_test_milestones()
 
         for url in group_urlreverse_list(group, 'ietf.group.milestones.edit_milestones;current'):
@@ -1097,7 +1089,6 @@ def test_milestone_sets(self):
             self.assertContains(r, m2.desc)
 
     def test_add_milestone(self):
-        return  # FIXME-LARS
         m1, m2, group = self.create_test_milestones()
 
         url = urlreverse('ietf.group.milestones.edit_milestones;current', kwargs=dict(group_type=group.type_id, acronym=group.acronym))
@@ -1156,7 +1147,6 @@ def test_add_milestone(self):
         self.assertTrue('mars-wg@' in outbox[-1]['To'])
 
     def test_add_milestone_as_chair(self):
-        return  # FIXME-LARS
         m1, m2, group = self.create_test_milestones()
 
         url = urlreverse('ietf.group.milestones.edit_milestones;current', kwargs=dict(group_type=group.type_id, acronym=group.acronym))
@@ -1193,7 +1183,6 @@ def test_add_milestone_as_chair(self):
         self.assertFalse(group.list_email in outbox[-1]['To'])
 
     def test_accept_milestone(self):
-        return  # FIXME-LARS
         m1, m2, group = self.create_test_milestones()
         m1.state_id = "review"
         m1.save()
@@ -1225,7 +1214,6 @@ def test_accept_milestone(self):
         self.assertTrue("to active from review" in m.milestonegroupevent_set.all()[0].desc)
 
     def test_delete_milestone(self):
-        return  # FIXME-LARS
         m1, m2, group = self.create_test_milestones()
 
         url = urlreverse('ietf.group.milestones.edit_milestones;current', kwargs=dict(group_type=group.type_id, acronym=group.acronym))
@@ -1253,7 +1241,6 @@ def test_delete_milestone(self):
         self.assertTrue("Deleted milestone" in m.milestonegroupevent_set.all()[0].desc)
 
     def test_edit_milestone(self):
-        return  # FIXME-LARS
         m1, m2, group = self.create_test_milestones()
 
         url = urlreverse('ietf.group.milestones.edit_milestones;current', kwargs=dict(group_type=group.type_id, acronym=group.acronym))
@@ -1333,7 +1320,6 @@ def test_reset_charter_milestones(self):
         self.assertEqual(group.charter.docevent_set.count(), events_before + 2) # 1 delete, 1 add
 
     def test_edit_sort(self):
-        return  # FIXME-LARS
         group = GroupFactory(uses_milestone_dates=False)
         DatelessGroupMilestoneFactory(group=group,order=1)
         DatelessGroupMilestoneFactory(group=group,order=0)
@@ -1347,7 +1333,6 @@ def test_edit_sort(self):
 
 class DatelessMilestoneTests(TestCase):
     def test_switch_to_dateless(self):
-        return  # FIXME-LARS
         ad_role = RoleFactory(group__type_id='area',name_id='ad')
         ms = DatedGroupMilestoneFactory(group__parent=ad_role.group)
         ad = ad_role.person
@@ -1384,7 +1369,6 @@ def test_switch_to_dateless(self):
         self.assertEqual(len(q('#uses_milestone_dates')),0)
 
     def test_switch_to_dated(self):
-        return  # FIXME-LARS
         ad_role = RoleFactory(group__type_id='area',name_id='ad')
         ms = DatelessGroupMilestoneFactory(group__parent=ad_role.group)
         ad = ad_role.person
@@ -1408,7 +1392,6 @@ def test_switch_to_dated(self):
         self.assertEqual(len(q('#uses_milestone_dates')),1)
 
     def test_add_first_milestone(self):
-        return  # FIXME-LARS
         role = RoleFactory(name_id='chair',group__uses_milestone_dates=False)
         group = role.group
         chair = role.person
@@ -1428,7 +1411,6 @@ def test_add_first_milestone(self):
         self.assertEqual(group.groupmilestone_set.count(),1)
 
     def test_can_switch_date_types_for_initial_charter(self):
-        return  # FIXME-LARS
         ad_role = RoleFactory(group__type_id='area',name_id='ad')
         ms = DatedGroupMilestoneFactory(group__parent=ad_role.group)
         ad = ad_role.person   
@@ -1451,7 +1433,6 @@ def test_can_switch_date_types_for_initial_charter(self):
         self.assertEqual(q('#switch-date-use-form button').attr('style'), None)          
 
     def test_edit_and_reorder_milestone(self):
-        return  # FIXME-LARS
         role = RoleFactory(name_id='chair',group__uses_milestone_dates=False)
         group = role.group
 
@@ -1661,7 +1642,6 @@ def setUp(self):
 
 
     def test_meeting_info(self):
-        return  # FIXME-LARS
         for url in group_urlreverse_list(self.group, 'ietf.group.views.meetings'):
             response = self.client.get(url)
             self.assertEqual(response.status_code, 200) 
@@ -1852,7 +1832,6 @@ def test_admin_acronym_validation(self):
         self.assertTrue(form.is_valid())
 
     def test_groupform_acronym_validation(self):
-        return  # FIXME-LARS
         form = GroupForm({'acronym':'shouldpass','name':'should pass','state':'active'},group_type='wg')
         self.assertTrue(form.is_valid())
         form = GroupForm({'acronym':'should-fail','name':'should fail','state':'active'},group_type='wg')

ietf/group/tests_review.py

@@ -983,5 +983,4 @@ def test_reset_next_reviewer(self):
             self.assertEqual(r.status_code,302)
             self.assertEqual(NextReviewerInTeam.objects.get(team=group).next_reviewer, reviewers[target_index].person)
             self.client.logout()
-            target_index += 2
-
+            target_index += 2

ietf/iesg/tests.py

@@ -330,7 +330,6 @@ def test_agenda_json(self):
         self.assertTrue(r.json())
 
     def test_agenda(self):
-        return  # FIXME-LARS
         r = self.client.get(urlreverse("ietf.iesg.views.agenda"))
         self.assertEqual(r.status_code, 200)
 

ietf/ietfauth/tests.py

@@ -407,7 +407,6 @@ def test_reset_password(self):
         self.assertTrue(self.username_in_htpasswd_file(user.username))
 
     def test_review_overview(self):
-        return  # FIXME-LARS
         review_req = ReviewRequestFactory()
         assignment = ReviewAssignmentFactory(review_request=review_req,reviewer=EmailFactory(person__user__username='reviewer'))
         RoleFactory(name_id='reviewer',group=review_req.team,person=assignment.reviewer.person)