From 604c6f0b622f095945f068a5582d350bf9bf609d Mon Sep 17 00:00:00 2001 From: joeriddles Date: Thu, 26 Jan 2023 14:25:09 -0800 Subject: [PATCH] Remove unnecessary model and simplify tests for prefetch_related --- tests/models.py | 8 -------- tests/test_fields/test_field_tracker.py | 17 ++++++++--------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/tests/models.py b/tests/models.py index adbf344..d785e88 100644 --- a/tests/models.py +++ b/tests/models.py @@ -324,14 +324,6 @@ class ModelTrackedFK(models.Model): custom_tracker_without_id = ModelTracker(fields=['fk']) -class ModelTrackedPrefetchRelatedFK(models.Model): - fk = models.ForeignKey('ModelTrackedFK', on_delete=models.CASCADE) - - tracker = ModelTracked() - custom_tracker = ModelTracker(fields=['fk_id']) - custom_tracker_without_id = ModelTracker(fields=['fk']) - - class ModelTrackedNotDefault(models.Model): name = models.CharField(max_length=20) number = models.IntegerField() diff --git a/tests/test_fields/test_field_tracker.py b/tests/test_fields/test_field_tracker.py index 77f3ea0..e69807e 100644 --- a/tests/test_fields/test_field_tracker.py +++ b/tests/test_fields/test_field_tracker.py @@ -15,7 +15,6 @@ from tests.models import ( ModelTrackedFK, ModelTrackedMultiple, ModelTrackedNotDefault, - ModelTrackedPrefetchRelatedFK, Tracked, TrackedAbstract, TrackedFileField, @@ -539,27 +538,27 @@ class FieldTrackerForeignKeyTests(FieldTrackerTestCase): self.assertCurrent(fk=self.instance.fk_id) -class ModelTrackedPrefetchRelatedFKTests(FieldTrackerTestCase): +class FieldTrackerForeignKeyPrefetchRelatedTests(FieldTrackerTestCase): """Test that using `prefetch_related` on a tracked field does raise a ValueError.""" - tracked_class = ModelTrackedPrefetchRelatedFK + fk_class = Tracked + tracked_class = TrackedFK def setUp(self): - model_tracked = ModelTracked.objects.create(name="", number=0) - model_tracked_fk = ModelTrackedFK.objects.create(fk=model_tracked) - self.instance = ModelTrackedPrefetchRelatedFK.objects.create(fk=model_tracked_fk) + model_tracked = self.fk_class.objects.create(name="", number=0) + self.instance = self.tracked_class.objects.create(fk=model_tracked) def test_default(self): self.tracker = self.instance.tracker - self.assertIsNotNone(list(self.tracked_class.objects.prefetch_related("fk__fk"))) + self.assertIsNotNone(list(self.tracked_class.objects.prefetch_related("fk"))) def test_custom(self): self.tracker = self.instance.custom_tracker - self.assertIsNotNone(list(self.tracked_class.objects.prefetch_related("fk__fk"))) + self.assertIsNotNone(list(self.tracked_class.objects.prefetch_related("fk"))) def test_custom_without_id(self): self.tracker = self.instance.custom_tracker_without_id - self.assertIsNotNone(list(self.tracked_class.objects.prefetch_related("fk__fk"))) + self.assertIsNotNone(list(self.tracked_class.objects.prefetch_related("fk"))) class FieldTrackerTimeStampedTests(FieldTrackerTestCase):