Merged in [15596] from rjsparks@nostrum.com:

    improved coverage for several tests.
 - Legacy-Id: 15600
Note: SVN reference [15596] has been migrated to Git commit 6f18ae8

Author: levkowetz

ietf/doc/factories.py

@@ -4,7 +4,7 @@
 
 from django.conf import settings
 
-from ietf.doc.models import Document, DocEvent, NewRevisionDocEvent, DocAlias, State, DocumentAuthor
+from ietf.doc.models import Document, DocEvent, NewRevisionDocEvent, DocAlias, State, DocumentAuthor, StateDocEvent
 from ietf.group.models import Group
 
 def draft_name_generator(type_id,group,n):
@@ -210,3 +210,20 @@ class Meta:
     def desc(self):
          return 'New version available %s-%s'%(self.doc.name,self.rev)
 
+class StateDocEventFactory(DocEventFactory):
+    class Meta:
+        model = StateDocEvent
+
+    type = 'changed_state'
+    state_type_id = 'draft-iesg'
+
+    @factory.post_generation
+    def state(obj, create, extracted, **kwargs):
+        if not create:
+            return
+        if extracted:
+            (state_type_id, state_slug) = extracted
+            obj.state = State.objects.get(type_id=state_type_id,slug=state_slug)
+        else:
+            obj.state = State.objects.get(type_id='draft-iesg',slug='ad-eval')
+        obj.save()

ietf/doc/tests.py

@@ -22,7 +22,7 @@
 
 from ietf.doc.models import ( Document, DocAlias, DocRelationshipName, RelatedDocument, State,
     DocEvent, BallotPositionDocEvent, LastCallDocEvent, WriteupDocEvent, NewRevisionDocEvent )
-from ietf.doc.factories import DocumentFactory, DocEventFactory, CharterFactory, ConflictReviewFactory, WgDraftFactory, IndividualDraftFactory, WgRfcFactory, IndividualRfcFactory
+from ietf.doc.factories import DocumentFactory, DocEventFactory, CharterFactory, ConflictReviewFactory, WgDraftFactory, IndividualDraftFactory, WgRfcFactory, IndividualRfcFactory, StateDocEventFactory
 from ietf.doc.utils import create_ballot_if_not_open
 from ietf.group.models import Group
 from ietf.group.factories import GroupFactory
@@ -289,7 +289,25 @@ def test_ajax_search_docs(self):
         self.assertEqual(r.status_code, 200)
         data = json.loads(r.content)
         self.assertEqual(data[0]["id"], doc_alias.pk)
-        
+
+    def test_recent_drafts(self):
+        # 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):
+            StateDocEventFactory(doc=draft, state=('draft-iesg','ad-eval'), time=datetime.datetime.now()-datetime.timedelta(days=[1,15,29][index]))
+
+        # And one draft that should not show (with the default of 7 days to view)
+        old = WgDraftFactory()
+        old.docevent_set.filter(newrevisiondocevent__isnull=False).update(time=datetime.datetime.now()-datetime.timedelta(days=8))
+        StateDocEventFactory(doc=old, time=datetime.datetime.now()-datetime.timedelta(days=8))
+
+        url = urlreverse('ietf.doc.views_search.recent_drafts')
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertEqual(len(q('td.doc')),3)
+        self.assertEqual(q('td.status span.label-warning').text(),"for 15 days")
+        self.assertEqual(q('td.status span.label-danger').text(),"for 29 days")        
 
 class DocDraftTestCase(TestCase):
     draft_text = """

ietf/meeting/factories.py

@@ -4,7 +4,7 @@
 
 from django.core.files.base import ContentFile
 
-from ietf.meeting.models import Meeting, Session, Schedule, TimeSlot, SessionPresentation, FloorPlan
+from ietf.meeting.models import Meeting, Session, Schedule, TimeSlot, SessionPresentation, FloorPlan, Room
 from ietf.group.factories import GroupFactory
 from ietf.person.factories import PersonFactory
 
@@ -100,12 +100,29 @@ class Meta:
     name = factory.Sequence(lambda n: 'schedule_%d'%n)
     owner = factory.SubFactory(PersonFactory)
 
+class RoomFactory(factory.DjangoModelFactory):
+    class Meta:
+        model = Room
+
+    meeting = factory.SubFactory(MeetingFactory)
+    name = factory.Faker('name')
+
+
 class TimeSlotFactory(factory.DjangoModelFactory):
     class Meta:
         model = TimeSlot
 
     meeting = factory.SubFactory(MeetingFactory)
     type_id = 'session'
+
+    @factory.post_generation
+    def location(obj, create, extracted, **kwargs): # pylint: disable=no-self-argument
+        if create:
+            if extracted:
+                obj.location = extracted
+            else:
+                obj.location = RoomFactory(meeting=obj.meeting)
+            obj.save()
 
     @factory.lazy_attribute
     def time(self):
@@ -140,4 +157,3 @@ class Meta:
                 ), 'floorplan.jpg'
             )
         )
-        

ietf/secr/drafts/email.py

@@ -2,6 +2,8 @@
 import glob
 import os
 
+import debug           # pyflakes:ignore
+
 from django.conf import settings
 from django.template.loader import render_to_string
 

ietf/secr/drafts/tests_views.py

@@ -11,15 +11,15 @@
 import debug                            # pyflakes:ignore
 
 from ietf.doc.expire import expire_draft
-from ietf.doc.factories import DocumentFactory
+from ietf.doc.factories import WgDraftFactory
 from ietf.doc.models import Document
+from ietf.group.factories import RoleFactory
 from ietf.meeting.factories import MeetingFactory
-from ietf.person.factories import PersonFactory
+from ietf.person.factories import PersonFactory, EmailFactory
 from ietf.person.models import Person
 from ietf.submit.models import Preapproval
 from ietf.utils.mail import outbox
 from ietf.utils.test_utils import TestCase, login_testing_unauthorized
-from ietf.utils.test_data import make_test_data
 from ietf.secr.drafts.email import get_email_initial
 
 
@@ -48,14 +48,13 @@ def tearDown(self):
         settings.IDSUBMIT_MANUAL_STAGING_DIR = self.saved_idsubmit_manual_staging_dir
 
     def test_abstract(self):
-        draft = make_test_data()
+        draft = WgDraftFactory()
         url = urlreverse('ietf.secr.drafts.views.abstract', kwargs={'id':draft.name})
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
 
     def test_approvals(self): 
-        make_test_data() 
         Preapproval.objects.create(name='draft-dummy', 
             by=Person.objects.get(name="(System)")) 
         url = urlreverse('ietf.secr.drafts.views.approvals') 
@@ -65,7 +64,7 @@ def test_approvals(self):
         self.assertTrue('draft-dummy' in response.content) 
 
     def test_edit(self):
-        draft = make_test_data()
+        draft = WgDraftFactory(states=[('draft','active'),('draft-stream-ietf','wg-doc'),('draft-iesg','ad-eval')], shepherd=EmailFactory())
         url = urlreverse('ietf.secr.drafts.views.edit', kwargs={'id':draft.name})
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.get(url)
@@ -83,20 +82,23 @@ def test_email(self):
     def test_get_email_initial(self):
         # Makes sure that a manual posting by the Secretariat of an I-D that is
         # in the RFC Editor Queue will result in notification of the RFC Editor
-        draft = make_test_data()
+        draft = WgDraftFactory(authors=PersonFactory.create_batch(1),shepherd=EmailFactory())
+        RoleFactory(group=draft.group, name_id='chair')
         data = get_email_initial(draft,action='extend',input={'expiration_date': '2050-01-01'})
         self.assertTrue('Extension of Expiration Date' in data['subject'])
 
     def test_makerfc(self):
-        draft = make_test_data()
+        draft = WgDraftFactory(intended_std_level_id='ps')
         url = urlreverse('ietf.secr.drafts.views.edit', kwargs={'id':draft.name})
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
+        # It's not clear what this is testing. Was there supposed to be a POST here?
         self.assertTrue(draft.intended_std_level)
 
     def test_search(self):
-        draft = make_test_data()
+        WgDraftFactory() # Test exercises branch that requires >1 doc found
+        draft = WgDraftFactory()
         url = urlreverse('ietf.secr.drafts.views.search')
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.get(url)
@@ -108,14 +110,14 @@ def test_search(self):
         self.assertTrue(draft.name in response.content)
 
     def test_view(self):
-        draft = make_test_data()
+        draft = WgDraftFactory()
         url = urlreverse('ietf.secr.drafts.views.view', kwargs={'id':draft.name})
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
 
     def test_author_delete(self):
-        draft = make_test_data()
+        draft = WgDraftFactory(authors=PersonFactory.create_batch(2))
         author = draft.documentauthor_set.first()
         id = author.id
         url = urlreverse('ietf.secr.drafts.views.author_delete', kwargs={'id':draft.name, 'oid':id})
@@ -128,7 +130,7 @@ def test_author_delete(self):
         self.assertFalse(draft.documentauthor_set.filter(id=id))
 
     def test_resurrect(self):
-        draft = make_test_data()
+        draft = WgDraftFactory()
         path = os.path.join(self.repository_dir, draft.filename_with_rev())
         with open(path, 'w') as file:
             file.write('test')
@@ -164,7 +166,7 @@ def test_resurrect(self):
         self.assertEqual(recv['Subject'], subject)
 
     def test_extend(self):
-        draft = make_test_data()
+        draft = WgDraftFactory()
         url = urlreverse('ietf.secr.drafts.views.extend', kwargs={'id':draft.name})
         email_url = urlreverse('ietf.secr.drafts.views.email', kwargs={'id':draft.name})
         confirm_url = urlreverse('ietf.secr.drafts.views.confirm', kwargs={'id':draft.name})
@@ -203,7 +205,7 @@ def test_extend(self):
         self.assertEqual(recv['Subject'], subject)
 
     def test_withdraw(self):
-        draft = make_test_data()
+        draft = WgDraftFactory()
         url = urlreverse('ietf.secr.drafts.views.withdraw', kwargs={'id':draft.name})
         email_url = urlreverse('ietf.secr.drafts.views.email', kwargs={'id':draft.name})
         confirm_url = urlreverse('ietf.secr.drafts.views.confirm', kwargs={'id':draft.name})
@@ -237,7 +239,7 @@ def test_withdraw(self):
         self.assertEqual(recv['Subject'], subject)
 
     def test_authors(self):
-        draft = DocumentFactory()
+        draft = WgDraftFactory()
         person = PersonFactory()
         url = urlreverse('ietf.secr.drafts.views.authors',kwargs={'id':draft.name})
         login_testing_unauthorized(self, "secretary", url)

ietf/secr/groups/tests.py

@@ -3,23 +3,25 @@
 from ietf.utils.test_utils import TestCase
 from ietf.group.models import Group
 from ietf.secr.groups.forms import get_parent_group_choices
-from ietf.group.factories import GroupFactory
+from ietf.group.factories import GroupFactory, RoleFactory
+from ietf.meeting.factories import MeetingFactory
+from ietf.person.factories import PersonFactory
 from ietf.person.models import Person
-from ietf.utils.test_data import make_test_data
 import debug                            # pyflakes:ignore
 
 class GroupsTest(TestCase):
     def test_get_parent_group_choices(self):
-        make_test_data()
+        GroupFactory(type_id='area')
         choices = get_parent_group_choices()
         area = Group.objects.filter(type='area',state='active').first()
+        # This is opaque. Can it be rewritten to be more self-documenting?
         self.assertEqual(choices[0][1][0][0],area.id)
 
     # ------- Test Search -------- #
     def test_search(self):
         "Test Search"
-        make_test_data()
-        group = Group.objects.all()[0]
+        MeetingFactory(type_id='ietf')
+        group = GroupFactory()
         url = reverse('ietf.secr.groups.views.search')
         post_data = {'group_acronym':group.acronym,'submit':'Search'}
         self.client.login(username="secretary", password="secretary+password")
@@ -50,9 +52,8 @@ def test_add_group_invalid(self):
         self.assertTrue('This field is required' in response.content)
 
     def test_add_group_dupe(self):
-        make_test_data()
-        group = Group.objects.all()[0]
-        area = Group.objects.filter(type='area')[0]
+        group = GroupFactory()
+        area = GroupFactory(type_id='area')
         url = reverse('ietf.secr.groups.views.add')
         post_data = {'acronym':group.acronym,
                      'name':'Test Group',
@@ -69,8 +70,7 @@ def test_add_group_dupe(self):
         self.assertTrue('Group with this Acronym already exists' in response.content)
 
     def test_add_group_success(self):
-        make_test_data()
-        area = Group.objects.filter(type='area')[0]
+        area = GroupFactory(type_id='area')
         url = reverse('ietf.secr.groups.views.add')
         post_data = {'acronym':'test',
                      'name':'Test Group',
@@ -86,19 +86,19 @@ def test_add_group_success(self):
 
     # ------- Test View -------- #
     def test_view(self):
-        make_test_data()
-        group = Group.objects.all()[0]
+        MeetingFactory(type_id='ietf')
+        group = GroupFactory()
         url = reverse('ietf.secr.groups.views.view', kwargs={'acronym':group.acronym})
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
 
     # ------- Test Edit -------- #
     def test_edit_valid(self):
-        make_test_data()
-        group = Group.objects.filter(acronym='mars')[0]
-        area = Group.objects.filter(acronym='farfut')[0]
-        ad = Person.objects.get(name='Areað Irector')        
+        group = GroupFactory()
+        area = GroupFactory(type_id='area')
+        ad = Person.objects.get(name='Areað Irector')
+        MeetingFactory(type_id='ietf')        
         url = reverse('ietf.secr.groups.views.edit', kwargs={'acronym':group.acronym})
         target = reverse('ietf.secr.groups.views.view', kwargs={'acronym':group.acronym})
         post_data = {'acronym':group.acronym,
@@ -116,9 +116,9 @@ def test_edit_valid(self):
         self.assertTrue('changed successfully' in response.content)
 
     def test_edit_non_wg_group(self):
-        make_test_data()
         parent_sdo = GroupFactory.create(type_id='sdo',state_id='active')
         child_sdo = GroupFactory.create(type_id='sdo',state_id='active',parent=parent_sdo)
+        MeetingFactory(type_id='ietf')
         url = reverse('ietf.secr.groups.views.edit', kwargs={'acronym':child_sdo.acronym})
         target = reverse('ietf.secr.groups.views.view', kwargs={'acronym':child_sdo.acronym})
         post_data = {'acronym':child_sdo.acronym,
@@ -137,9 +137,8 @@ def test_edit_non_wg_group(self):
 
     # ------- Test People -------- #
     def test_people_delete(self):
-        make_test_data()
-        group = Group.objects.filter(acronym='mars')[0]
-        role = group.role_set.all()[0]
+        role = RoleFactory(name_id='member')
+        group = role.group
         id = role.id
         url = reverse('ietf.secr.groups.views.delete_role', kwargs={'acronym':group.acronym,'id':role.id})
         target = reverse('ietf.secr.groups.views.people', kwargs={'acronym':group.acronym})
@@ -151,9 +150,8 @@ def test_people_delete(self):
         self.assertFalse(group.role_set.filter(id=id))
 
     def test_people_add(self):
-        make_test_data()
-        person = Person.objects.get(name='Areað Irector')
-        group = Group.objects.filter(acronym='mars')[0]
+        person = PersonFactory()
+        group = GroupFactory()
         url = reverse('ietf.secr.groups.views.people', kwargs={'acronym':group.acronym})
         post_data = {'group_acronym':group.acronym,
                      'name':'chair',