summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/regressiontests/admin_views/tests.py126
1 files changed, 63 insertions, 63 deletions
diff --git a/tests/regressiontests/admin_views/tests.py b/tests/regressiontests/admin_views/tests.py
index 65a246cd77..4f2a503b4f 100644
--- a/tests/regressiontests/admin_views/tests.py
+++ b/tests/regressiontests/admin_views/tests.py
@@ -1326,69 +1326,69 @@ class AdminInlineTests(TestCase):
self.failUnlessEqual(Grommet.objects.count(), 1)
self.failUnlessEqual(Grommet.objects.all()[0].name, "Grommet 1 Updated")
- # def test_char_pk_inline(self):
- # "A model with a character PK can be saved as inlines. Regression for #10992"
- # # First add a new inline
- # self.post_data['doohickey_set-0-code'] = "DH1"
- # self.post_data['doohickey_set-0-name'] = "Doohickey 1"
- # response = self.client.post('/test_admin/admin/admin_views/collector/1/', self.post_data)
- # self.failUnlessEqual(response.status_code, 302)
- # self.failUnlessEqual(DooHickey.objects.count(), 1)
- # self.failUnlessEqual(DooHickey.objects.all()[0].name, "Doohickey 1")
- #
- # # Check that the PK link exists on the rendered form
- # response = self.client.get('/test_admin/admin/admin_views/collector/1/')
- # self.assertContains(response, 'name="doohickey_set-0-code"')
- #
- # # Now resave that inline
- # self.post_data['doohickey_set-INITIAL_FORMS'] = "1"
- # self.post_data['doohickey_set-0-code'] = "DH1"
- # self.post_data['doohickey_set-0-name'] = "Doohickey 1"
- # response = self.client.post('/test_admin/admin/admin_views/collector/1/', self.post_data)
- # self.failUnlessEqual(response.status_code, 302)
- # self.failUnlessEqual(DooHickey.objects.count(), 1)
- # self.failUnlessEqual(DooHickey.objects.all()[0].name, "Doohickey 1")
- #
- # # Now modify that inline
- # self.post_data['doohickey_set-INITIAL_FORMS'] = "1"
- # self.post_data['doohickey_set-0-code'] = "DH1"
- # self.post_data['doohickey_set-0-name'] = "Doohickey 1 Updated"
- # response = self.client.post('/test_admin/admin/admin_views/collector/1/', self.post_data)
- # self.failUnlessEqual(response.status_code, 302)
- # self.failUnlessEqual(DooHickey.objects.count(), 1)
- # self.failUnlessEqual(DooHickey.objects.all()[0].name, "Doohickey 1 Updated")
-
- # def test_integer_pk_inline(self):
- # "A model with an integer PK can be saved as inlines. Regression for #10992"
- # # First add a new inline
- # self.post_data['whatsit_set-0-index'] = "42"
- # self.post_data['whatsit_set-0-name'] = "Whatsit 1"
- # response = self.client.post('/test_admin/admin/admin_views/collector/1/', self.post_data)
- # self.failUnlessEqual(response.status_code, 302)
- # self.failUnlessEqual(Whatsit.objects.count(), 1)
- # self.failUnlessEqual(Whatsit.objects.all()[0].name, "Whatsit 1")
- #
- # # Check that the PK link exists on the rendered form
- # response = self.client.get('/test_admin/admin/admin_views/collector/1/')
- # self.assertContains(response, 'name="whatsit_set-0-index"')
- #
- # # Now resave that inline
- # self.post_data['whatsit_set-INITIAL_FORMS'] = "1"
- # self.post_data['whatsit_set-0-index'] = "42"
- # self.post_data['whatsit_set-0-name'] = "Whatsit 1"
- # response = self.client.post('/test_admin/admin/admin_views/collector/1/', self.post_data)
- # self.failUnlessEqual(response.status_code, 302)
- # self.failUnlessEqual(Whatsit.objects.count(), 1)
- # self.failUnlessEqual(Whatsit.objects.all()[0].name, "Whatsit 1")
- #
- # # Now modify that inline
- # self.post_data['whatsit_set-INITIAL_FORMS'] = "1"
- # self.post_data['whatsit_set-0-index'] = "42"
- # self.post_data['whatsit_set-0-name'] = "Whatsit 1 Updated"
- # response = self.client.post('/test_admin/admin/admin_views/collector/1/', self.post_data)
- # self.failUnlessEqual(response.status_code, 302)
- # self.failUnlessEqual(Whatsit.objects.count(), 1)
- # self.failUnlessEqual(Whatsit.objects.all()[0].name, "Whatsit 1 Updated")
+ def test_char_pk_inline(self):
+ "A model with a character PK can be saved as inlines. Regression for #10992"
+ # First add a new inline
+ self.post_data['doohickey_set-0-code'] = "DH1"
+ self.post_data['doohickey_set-0-name'] = "Doohickey 1"
+ response = self.client.post('/test_admin/admin/admin_views/collector/1/', self.post_data)
+ self.failUnlessEqual(response.status_code, 302)
+ self.failUnlessEqual(DooHickey.objects.count(), 1)
+ self.failUnlessEqual(DooHickey.objects.all()[0].name, "Doohickey 1")
+
+ # Check that the PK link exists on the rendered form
+ response = self.client.get('/test_admin/admin/admin_views/collector/1/')
+ self.assertContains(response, 'name="doohickey_set-0-code"')
+
+ # Now resave that inline
+ self.post_data['doohickey_set-INITIAL_FORMS'] = "1"
+ self.post_data['doohickey_set-0-code'] = "DH1"
+ self.post_data['doohickey_set-0-name'] = "Doohickey 1"
+ response = self.client.post('/test_admin/admin/admin_views/collector/1/', self.post_data)
+ self.failUnlessEqual(response.status_code, 302)
+ self.failUnlessEqual(DooHickey.objects.count(), 1)
+ self.failUnlessEqual(DooHickey.objects.all()[0].name, "Doohickey 1")
+
+ # Now modify that inline
+ self.post_data['doohickey_set-INITIAL_FORMS'] = "1"
+ self.post_data['doohickey_set-0-code'] = "DH1"
+ self.post_data['doohickey_set-0-name'] = "Doohickey 1 Updated"
+ response = self.client.post('/test_admin/admin/admin_views/collector/1/', self.post_data)
+ self.failUnlessEqual(response.status_code, 302)
+ self.failUnlessEqual(DooHickey.objects.count(), 1)
+ self.failUnlessEqual(DooHickey.objects.all()[0].name, "Doohickey 1 Updated")
+
+ def test_integer_pk_inline(self):
+ "A model with an integer PK can be saved as inlines. Regression for #10992"
+ # First add a new inline
+ self.post_data['whatsit_set-0-index'] = "42"
+ self.post_data['whatsit_set-0-name'] = "Whatsit 1"
+ response = self.client.post('/test_admin/admin/admin_views/collector/1/', self.post_data)
+ self.failUnlessEqual(response.status_code, 302)
+ self.failUnlessEqual(Whatsit.objects.count(), 1)
+ self.failUnlessEqual(Whatsit.objects.all()[0].name, "Whatsit 1")
+
+ # Check that the PK link exists on the rendered form
+ response = self.client.get('/test_admin/admin/admin_views/collector/1/')
+ self.assertContains(response, 'name="whatsit_set-0-index"')
+
+ # Now resave that inline
+ self.post_data['whatsit_set-INITIAL_FORMS'] = "1"
+ self.post_data['whatsit_set-0-index'] = "42"
+ self.post_data['whatsit_set-0-name'] = "Whatsit 1"
+ response = self.client.post('/test_admin/admin/admin_views/collector/1/', self.post_data)
+ self.failUnlessEqual(response.status_code, 302)
+ self.failUnlessEqual(Whatsit.objects.count(), 1)
+ self.failUnlessEqual(Whatsit.objects.all()[0].name, "Whatsit 1")
+
+ # Now modify that inline
+ self.post_data['whatsit_set-INITIAL_FORMS'] = "1"
+ self.post_data['whatsit_set-0-index'] = "42"
+ self.post_data['whatsit_set-0-name'] = "Whatsit 1 Updated"
+ response = self.client.post('/test_admin/admin/admin_views/collector/1/', self.post_data)
+ self.failUnlessEqual(response.status_code, 302)
+ self.failUnlessEqual(Whatsit.objects.count(), 1)
+ self.failUnlessEqual(Whatsit.objects.all()[0].name, "Whatsit 1 Updated")
def test_inherited_inline(self):
"An inherited model can be saved as inlines. Regression for #11042"