1 files changed, 25 insertions, 4 deletions
diff --git a/tests/regressiontests/admin_views/tests.py b/tests/regressiontests/admin_views/tests.py
index 1385e5e0aa..41aade0561 100644
--- a/tests/regressiontests/admin_views/tests.py
+++ b/tests/regressiontests/admin_views/tests.py
@@ -2113,11 +2113,9 @@ class ReadonlyTest(TestCase):
         response = self.client.get('/test_admin/admin/admin_views/pizza/add/')
         self.assertEqual(response.status_code, 200)
 
-class IncompleteFormTest(TestCase):
+class UserAdminTest(TestCase):
     """
-    Tests validation of a ModelForm that doesn't explicitly have all data
-    corresponding to model fields. Model validation shouldn't fail
-    such a forms.
+    Tests user CRUD functionality.
     """
     fixtures = ['admin-views-users.xml']
 
@@ -2128,6 +2126,7 @@ class IncompleteFormTest(TestCase):
         self.client.logout()
 
     def test_user_creation(self):
+        user_count = User.objects.count()
         response = self.client.post('/test_admin/admin/auth/user/add/', {
             'username': 'newuser',
             'password1': 'newpassword',
@@ -2136,6 +2135,7 @@ class IncompleteFormTest(TestCase):
         })
         new_user = User.objects.order_by('-id')[0]
         self.assertRedirects(response, '/test_admin/admin/auth/user/%s/' % new_user.pk)
+        self.assertEquals(User.objects.count(), user_count + 1)
         self.assertNotEquals(new_user.password, UNUSABLE_PASSWORD)
 
     def test_password_mismatch(self):
@@ -2149,3 +2149,24 @@ class IncompleteFormTest(TestCase):
         self.assert_('password' not in adminform.form.errors)
         self.assertEquals(adminform.form.errors['password2'],
                           [u"The two password fields didn't match."])
+
+    def test_user_fk_popup(self):
+        response = self.client.get('/test_admin/admin/admin_views/album/add/')
+        self.failUnlessEqual(response.status_code, 200)
+        self.assertContains(response, '/test_admin/admin/auth/user/add')
+        self.assertContains(response, 'class="add-another" id="add_id_owner" onclick="return showAddAnotherPopup(this);"')
+        response = self.client.get('/test_admin/admin/auth/user/add/?_popup=1')
+        self.assertNotContains(response, 'name="_continue"')
+
+    def test_user_add_another(self):
+        user_count = User.objects.count()
+        response = self.client.post('/test_admin/admin/auth/user/add/', {
+            'username': 'newuser',
+            'password1': 'newpassword',
+            'password2': 'newpassword',
+            '_addanother': '1',
+        })
+        new_user = User.objects.order_by('-id')[0]
+        self.assertRedirects(response, '/test_admin/admin/auth/user/add/')
+        self.assertEquals(User.objects.count(), user_count + 1)
+        self.assertNotEquals(new_user.password, UNUSABLE_PASSWORD)