Merged in [8504] from rjsparks@nostrum.com:\n Added tests that would have caught bug ietf-tools#1508. Added message to edit_shepherd_email to match that added in edit_shepherd.

 - Legacy-Id: 8531
Note: SVN reference [8504] has been migrated to Git commit 905df23

Author: levkowetz

ietf/doc/tests_draft.py

@@ -843,10 +843,16 @@ def test_doc_change_shepherd(self):
         self.assertEqual(r.status_code,302)
         self.doc = Document.objects.get(name=self.docname)
         self.assertEqual(self.doc.shepherd, plain_email)
-        comments = '::'.join([x.desc for x in self.doc.docevent_set.filter(time=self.doc.time,type="added_comment")])
+        comment_events = self.doc.docevent_set.filter(time=self.doc.time,type="added_comment")
+        comments = '::'.join([x.desc for x in comment_events])
         self.assertTrue('Document shepherd changed to Plain Man' in comments)
         self.assertTrue('Notification list changed' in comments)
 
+        # save the form without changing the email (nothing should be saved)
+        r = self.client.post(url, dict(shepherd=plain_email.pk))
+        self.assertEqual(r.status_code, 302)
+        self.assertEqual(set(comment_events), set(self.doc.docevent_set.filter(time=self.doc.time,type="added_comment")))
+
         # test buggy change
         ad = Person.objects.get(name='Aread Irector')
         two_answers = "%s,%s" % (plain_email, ad.email_set.all()[0])
@@ -881,7 +887,14 @@ def test_doc_change_shepherd_email(self):
         self.assertEqual(r.status_code, 302)
         self.doc = Document.objects.get(name=self.docname)
         self.assertEqual(self.doc.shepherd, new_email)
-        self.assertTrue(self.doc.latest_event(DocEvent, type="added_comment").desc.startswith('Document shepherd email changed'))
+        comment_event = self.doc.latest_event(DocEvent, type="added_comment")
+        self.assertTrue(comment_event.desc.startswith('Document shepherd email changed'))
+
+        # save the form without changing the email (nothing should be saved)
+        r = self.client.post(url, dict(shepherd=new_email))
+        self.assertEqual(r.status_code, 302)
+        self.assertEqual(comment_event, self.doc.latest_event(DocEvent, type="added_comment"))
+       
 
     def test_doc_view_shepherd_writeup(self):
         url = urlreverse('doc_shepherd_writeup',kwargs=dict(name=self.docname))

ietf/doc/views_draft.py

@@ -1025,6 +1025,8 @@ def change_shepherd_email(request, name):
                 c = DocEvent(type="added_comment", doc=doc, by=request.user.person)
                 c.desc = "Document shepherd email changed"
                 c.save()
+            else:
+                messages.info(request,"The selected shepherd address was already assigned - no changes have been made.")
 
             return redirect('doc_view', name=doc.name)