improved coverage for several tests. Commit ready for merge.

 - Legacy-Id: 15596

Author: rjsparks

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/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

@@ -13,8 +13,9 @@
 from ietf.doc.expire import expire_draft
 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
@@ -63,7 +64,7 @@ def test_approvals(self):
         self.assertTrue('draft-dummy' in response.content) 
 
     def test_edit(self):
-        draft = WgDraftFactory()
+        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)
@@ -81,7 +82,8 @@ 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 = WgDraftFactory()
+        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'])
 

ietf/secr/sreq/tests.py

@@ -63,7 +63,7 @@ def test_cancel(self):
         meeting = MeetingFactory(type_id='ietf', date=datetime.date.today())
         ad = Person.objects.get(user__username='ad')
         area = RoleFactory(name_id='ad', person=ad, group__type_id='area').group
-        mars = SessionFactory(meeting=meeting, group__parent=area, group__acronym='mars').group
+        mars = SessionFactory(meeting=meeting, group__parent=area, group__acronym='mars', status_id='sched').group
         url = reverse('ietf.secr.sreq.views.cancel', kwargs={'acronym':'mars'})
         self.client.login(username="ad", password="ad+password")
         r = self.client.get(url)
@@ -74,7 +74,7 @@ def test_cancel(self):
     def test_edit(self):
         meeting = MeetingFactory(type_id='ietf', date=datetime.date.today())
         mars = RoleFactory(name_id='chair', person__user__username='marschairman', group__acronym='mars').group
-        SessionFactory(meeting=meeting,group=mars)
+        SessionFactory(meeting=meeting,group=mars,status_id='sched',scheduled=datetime.datetime.now())
 
         url = reverse('ietf.secr.sreq.views.edit', kwargs={'acronym':'mars'})
         self.client.login(username="marschairman", password="marschairman+password")

ietf/stats/tests.py

@@ -13,11 +13,12 @@
 from ietf.submit.models import Submission
 from ietf.doc.factories import WgDraftFactory, WgRfcFactory
 from ietf.doc.models import Document, DocAlias, State, RelatedDocument, NewRevisionDocEvent, DocumentAuthor
+from ietf.group.factories import RoleFactory
 from ietf.meeting.factories import MeetingFactory
 from ietf.person.factories import PersonFactory
 from ietf.person.models import Person, Email
 from ietf.name.models import FormalLanguageName, DocRelationshipName, CountryName
-from ietf.review.factories import ReviewRequestFactory
+from ietf.review.factories import ReviewRequestFactory, ReviewerSettingsFactory
 from ietf.stats.models import MeetingRegistration, CountryAlias
 from ietf.stats.utils import get_meeting_registration_data
 
@@ -155,7 +156,10 @@ def test_known_country_list(self):
         self.assertTrue("United States" in unicontent(r))
 
     def test_review_stats(self):
-        review_req = ReviewRequestFactory()
+        reviewer = PersonFactory()
+        review_req = ReviewRequestFactory(reviewer=reviewer.email_set.first())
+        RoleFactory(group=review_req.team,name_id='reviewer',person=reviewer)
+        ReviewerSettingsFactory(team=review_req.team, person=reviewer)
         PersonFactory(user__username='plain')
 
         # check redirect