Merged in [9307] from rcross@amsl.com:

    Improve test coverage of secr.drafts.
 - Legacy-Id: 9312
Note: SVN reference [9307] has been migrated to Git commit 34a1648

Author: levkowetz

hold-for-merge

@@ -1,6 +1,5 @@
 # -*- conf-mode -*-
 
-personal/rcross/v5.12.4.dev0@9307	# Failed pyflakes, fixed in 9308
 personal/rcross/v5.7.3-dev0@8640	# Rework: make the check_permissions() decorator handle the case where the user isn't logged in
 personal/rcross/v5.6.3-dev0@8237	# Includes other merges; merge personal/rcross/v5.6.2-dev0@8216 instead
 personal/liudapeng/v5.5.1-dev0@7925	# alternative resolution desired

ietf/secr/drafts/tests.py

@@ -0,0 +1,119 @@
+import os
+import shutil
+
+from StringIO import StringIO
+from django.conf import settings
+from django.core.urlresolvers import reverse as urlreverse
+
+from ietf.utils.test_utils import TestCase
+from ietf.person.models import Person
+from ietf.submit.models import Preapproval
+from ietf.utils.test_data import make_test_data
+
+#from pyquery import PyQuery
+
+SECR_USER='secretary'
+
+class MainTestCase(TestCase):
+    def setUp(self):
+        self.repository_dir = os.path.abspath("tmp-submit-repository-dir")
+        os.mkdir(self.repository_dir)
+        settings.INTERNET_DRAFT_PATH = self.repository_dir
+
+        self.archive_dir = os.path.abspath("tmp-submit-archive-dir")
+        os.mkdir(self.archive_dir)
+        settings.INTERNET_DRAFT_ARCHIVE_DIR = self.archive_dir
+
+    def tearDown(self):
+        shutil.rmtree(self.repository_dir)
+        shutil.rmtree(self.archive_dir)
+        
+    def test_abstract(self):
+        draft = make_test_data()
+        url = urlreverse('drafts_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_add(self):
+        draft = make_test_data()
+        url = urlreverse('drafts_add')
+        self.client.login(username="secretary", password="secretary+password")
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        
+        # dummy upload file
+        txt_file = StringIO('This is a simple text file.')
+        txt_file.name = "draft-dummy-00.txt"
+        
+        post = dict(title='A test draft',
+            group=draft.group.pk,
+            start_date='2015-01-01',
+            pages='10',
+            txt=txt_file
+        )
+        response = self.client.post(url,post)
+        self.assertEqual(response.status_code, 302)
+        
+    def test_announce(self):
+        draft = make_test_data()
+        url = urlreverse('drafts_announce', kwargs={'id':draft.name})
+        self.client.login(username="secretary", password="secretary+password")
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 302)
+        
+    def test_approvals(self):
+        make_test_data()
+        Preapproval.objects.create(name='draft-dummy',
+            by=Person.objects.get(name="(System)"))
+        url = urlreverse('drafts_approvals')
+        self.client.login(username="secretary", password="secretary+password")
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        self.assertTrue('draft-dummy' in response.content)
+    
+    def test_edit(self):
+        draft = make_test_data()
+        url = urlreverse('drafts_edit', 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_email(self):
+        # can't test this directly, test via drafts actions
+        pass
+    
+    def test_makerfc(self):
+        draft = make_test_data()
+        url = urlreverse('drafts_edit', kwargs={'id':draft.name})
+        self.client.login(username="secretary", password="secretary+password")
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        self.assertTrue(draft.intended_std_level)
+        
+    def test_search(self):
+        draft = make_test_data()
+        url = urlreverse('drafts')
+        self.client.login(username="secretary", password="secretary+password")
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        
+        post = dict(filename='draft',state=1,submit='submit')
+        response = self.client.post(url,post)
+        self.assertEqual(response.status_code, 200)
+        self.assertTrue(draft.name in response.content)
+    
+    def test_update(self):
+        draft = make_test_data()
+        url = urlreverse('drafts_update', 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_view(self):
+        draft = make_test_data()
+        url = urlreverse('drafts_view', kwargs={'id':draft.name})
+        self.client.login(username="secretary", password="secretary+password")
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+

ietf/secr/drafts/tests_views.py

@@ -53,7 +53,7 @@ <h2>Draft - Make RFC</h2>
       <h2>Author(s)</h2>
         <table>
         {% for author in draft.authors.all %}
-          <tr><td><a href="{% url "sec.rolodex.views.view" id=author.person.pk %}">{{ author.person.name }}</a></td></tr>
+          <tr><td><a href="{% url "ietf.secr.rolodex.views.view" id=author.person.pk %}">{{ author.person.name }}</a></td></tr>
         {% endfor %}
         </table>
     </div> <!-- inline-related -->

ietf/secr/templates/drafts/makerfc.html

@@ -221,6 +221,13 @@ def make_test_data():
         desc="Started IESG process",
         )
 
+    DocEvent.objects.create(
+        type="new_revision",
+        by=ad,
+        doc=draft,
+        desc="New revision available",
+        )
+
     BallotDocEvent.objects.create(
         type="created_ballot",
         ballot_type=BallotType.objects.get(doc_type="draft", slug="approve"),