Merged [4825] from rjsparks@nostrum.com:

Updated tests to deal with the mandatory state field
 - Legacy-Id: 4941

Author: levkowetz

ietf/name/migrations/0004_add_wg_state_abandon.py

@@ -3,6 +3,7 @@
 from south.db import db
 from south.v2 import DataMigration
 from django.db import models
+from ietf.group.models import GroupStateName
 
 class Migration(DataMigration):
 

ietf/wginfo/tests.py

@@ -113,7 +113,8 @@ def test_create(self):
         self.assertEquals(len(Group.objects.filter(type="wg")), num_wgs)
 
         # creation
-        r = self.client.post(url, dict(acronym="testwg", name="Testing WG", state="proposed"))
+        state = GroupStateName.objects.get(slug="bof")
+        r = self.client.post(url, dict(acronym="testwg", name="Testing WG", state=state.pk))
         self.assertEquals(r.status_code, 302)
         self.assertEquals(len(Group.objects.filter(type="wg")), num_wgs + 1)
         group = Group.objects.get(acronym="testwg")
@@ -149,7 +150,8 @@ def test_create_based_on_existing(self):
         self.assertEquals(Group.objects.get(acronym=group.acronym).state_id, "bof")
 
         # confirm elevation
-        r = self.client.post(url, dict(name="Test", acronym=group.acronym, confirmed="1", state="proposed"))
+        state = GroupStateName.objects.get(slug="proposed")
+        r = self.client.post(url, dict(name="Test", acronym=group.acronym, confirmed="1",state=state.pk))
         self.assertEquals(r.status_code, 302)
         self.assertEquals(Group.objects.get(acronym=group.acronym).state_id, "proposed")
         self.assertEquals(Group.objects.get(acronym=group.acronym).name, "Test")
@@ -193,12 +195,13 @@ def test_edit_info(self):
             f.write("This is a charter.")
         area = group.parent
         ad = Person.objects.get(name="Aread Irector")
+        state = GroupStateName.objects.get(slug="bof")
         r = self.client.post(url,
                              dict(name="Mars Not Special Interest Group",
                                   acronym="mnsig",
                                   parent=area.pk,
                                   ad=ad.pk,
-                                  state=group.state.pk,
+                                  state=state.pk,
                                   chairs="aread@ietf.org, ad1@ietf.org",
                                   secretaries="aread@ietf.org, ad1@ietf.org, ad2@ietf.org",
                                   techadv="aread@ietf.org",