Permalink
Browse files

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
  • Loading branch information...
1 parent 62afd58 commit ab72e6bdd1e42dce83fd7dba35919d6468d8ada3 @ramiro ramiro committed Oct 17, 2011
Showing with 4 additions and 2 deletions.
  1. +4 −2 tests/regressiontests/admin_inlines/tests.py
View
6 tests/regressiontests/admin_inlines/tests.py
@@ -233,7 +233,9 @@ def setUp(self):
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 @@ def test_inline_change_m2m_change_perm(self):
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):

0 comments on commit ab72e6b

Please sign in to comment.