diff options
| author | Ramiro Morales <cramm0@gmail.com> | 2011-10-17 02:11:12 +0000 |
|---|---|---|
| committer | Ramiro Morales <cramm0@gmail.com> | 2011-10-17 02:11:12 +0000 |
| commit | ab72e6bdd1e42dce83fd7dba35919d6468d8ada3 (patch) | |
| tree | 885c71b18ef1f3c854a6a254315593e6e2172e9e | |
| parent | 62afd58c87318aa22970e86a8f80538befcadfc4 (diff) | |
Tweaked a tests tweak from r16960 so it uses the right model.
When testing for permission enforcement in the admin for m2m
relationships we were erroneously using the ID of the related model
instead of using the ID of the corresponding automatically created
intermediate model. This manifested as a failure under Oracle but can
fail with any backend if the IDs of both models diverge.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17001 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | tests/regressiontests/admin_inlines/tests.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/regressiontests/admin_inlines/tests.py b/tests/regressiontests/admin_inlines/tests.py index c2f10c0678..c2e3bbc397 100644 --- a/tests/regressiontests/admin_inlines/tests.py +++ b/tests/regressiontests/admin_inlines/tests.py @@ -233,7 +233,9 @@ class TestInlinePermissions(TestCase): author = Author.objects.create(pk=1, name=u'The Author') book = author.books.create(name=u'The inline Book') self.author_change_url = '/admin/admin_inlines/author/%i/' % author.id - self.book_id = book.id + # Get the ID of the automatically created intermediate model for thw Author-Book m2m + author_book_auto_m2m_intermediate = Author.books.through.objects.get(author=author, book=book) + self.author_book_auto_m2m_intermediate_id = author_book_auto_m2m_intermediate.pk holder = Holder2.objects.create(dummy=13) inner2 = Inner2.objects.create(dummy=42, holder=holder) @@ -311,7 +313,7 @@ class TestInlinePermissions(TestCase): self.assertContains(response, '<h2>Author-book relationships</h2>') self.assertContains(response, 'Add another Author-Book Relationship') self.assertContains(response, 'value="4" id="id_Author_books-TOTAL_FORMS"') - self.assertContains(response, '<input type="hidden" name="Author_books-0-id" value="%i"' % self.book_id) + self.assertContains(response, '<input type="hidden" name="Author_books-0-id" value="%i"' % self.author_book_auto_m2m_intermediate_id) self.assertContains(response, 'id="id_Author_books-0-DELETE"') def test_inline_change_fk_add_perm(self): |