From 4bae3e999b6710423d7bb8b73a7e0946fe4e8352 Mon Sep 17 00:00:00 2001 From: Trey Hunner Date: Thu, 23 May 2013 12:53:02 -0700 Subject: [PATCH] Fix foreign key tests for FieldTracker --- model_utils/tests/tests.py | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/model_utils/tests/tests.py b/model_utils/tests/tests.py index c841590..afe9d5c 100644 --- a/model_utils/tests/tests.py +++ b/model_utils/tests/tests.py @@ -945,17 +945,16 @@ class FieldTrackerForeignKeyTests(FieldTrackerTestCase): self.assertCurrent(fk_id=self.instance.fk_id) def test_custom_without_id(self): - with self.assertNumQueries(2): + with self.assertNumQueries(1): self.tracked_class.objects.get() self.tracker = self.instance.custom_tracker_without_id self.assertChanged() self.assertPrevious() - self.assertCurrent(fk=self.old_fk) + self.assertCurrent(fk=self.old_fk.id) self.instance.fk = self.fk_class.objects.create(number=8) - self.assertNotEqual(self.instance.fk, self.old_fk) - self.assertChanged(fk=self.old_fk) - self.assertPrevious(fk=self.old_fk) - self.assertCurrent(fk=self.instance.fk) + self.assertChanged(fk=self.old_fk.id) + self.assertPrevious(fk=self.old_fk.id) + self.assertCurrent(fk=self.instance.fk_id) class ModelTrackerTests(FieldTrackerTests): @@ -977,3 +976,16 @@ class ModelTrackerForeignKeyTests(FieldTrackerForeignKeyTests): fk_class = ModelTracked tracked_class = ModelTrackedFK + + def test_custom_without_id(self): + with self.assertNumQueries(2): + self.tracked_class.objects.get() + self.tracker = self.instance.custom_tracker_without_id + self.assertChanged() + self.assertPrevious() + self.assertCurrent(fk=self.old_fk) + self.instance.fk = self.fk_class.objects.create(number=8) + self.assertNotEqual(self.instance.fk, self.old_fk) + self.assertChanged(fk=self.old_fk) + self.assertPrevious(fk=self.old_fk) + self.assertCurrent(fk=self.instance.fk)