chore: apply code review

python · Sep 5, 2024 · bb7c923 · bb7c923
1 parent 96d6f8e
commit bb7c923
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 25 deletions.
diff --git a/codesamples/tests.py b/codesamples/tests.py
@@ -16,13 +16,7 @@ def setUp(self):
             is_published=False)
 
     def test_published(self):
-        expected = ['<CodeSample: Copy One>']
-        published_qs = CodeSample.objects.published()
-        actual = [f'<CodeSample: {str(obj)}>' for obj in published_qs]
-        self.assertEqual(actual, expected)
+        self.assertQuerySetEqual(CodeSample.objects.published(),['<CodeSample: Copy One>'], transform=repr)
 
     def test_draft(self):
-        expected = ['<CodeSample: Copy Two>']
-        draft_qs = CodeSample.objects.draft()
-        actual = [f'<CodeSample: {str(obj)}>' for obj in draft_qs]
-        self.assertEqual(actual, expected)
+        self.assertQuerySetEqual(CodeSample.objects.draft(),['<CodeSample: Copy Two>'], transform=repr)
diff --git a/minutes/tests/test_models.py b/minutes/tests/test_models.py
@@ -21,16 +21,10 @@ def setUp(self):
         )
 
     def test_draft(self):
-        expected = ['<Minutes: PSF Meeting Minutes January 01, 2013>']
-        draft_qs = Minutes.objects.draft()
-        actual = [f'<Minutes: {str(obj)}>' for obj in draft_qs]
-        self.assertEqual(actual, expected)
+        self.assertQuerySetEqual(Minutes.objects.draft(), ['<Minutes: PSF Meeting Minutes January 01, 2013>'], transform=repr)
 
     def test_published(self):
-        expected = ['<Minutes: PSF Meeting Minutes January 01, 2012>']
-        published_qs = Minutes.objects.published()
-        actual = [f'<Minutes: {str(obj)}>' for obj in published_qs]
-        self.assertEqual(actual, expected)
+        self.assertQuerySetEqual(Minutes.objects.published(), ['<Minutes: PSF Meeting Minutes January 01, 2012>'], transform=repr)
 
     def test_date_methods(self):
         self.assertEqual(self.m1.get_date_year(), '2012')

diff --git a/pages/tests/test_models.py b/pages/tests/test_models.py
@@ -9,16 +9,10 @@
 
 class PageModelTests(BasePageTests):
     def test_draft(self):
-        expected_pages = ['Two']
-        draft_pages = list(Page.objects.draft())
-        draft_pages_str = [str(page) for page in draft_pages]
-        self.assertEqual(draft_pages_str, expected_pages)
+        self.assertQuerySetEqual(Page.objects.draft(), ['<Page: Two>'], transform=repr)
 
     def test_published(self):
-        expected_pages = ['One']
-        published_pages = list(Page.objects.published())
-        published_pages_str = [str(page) for page in published_pages]
-        self.assertEqual(published_pages_str, expected_pages)
+        self.assertQuerySetEqual(Page.objects.published(), ['<Page: One>'], transform=repr)
 
     def test_get_title(self):
         one = Page.objects.get(path='one')

diff --git a/successstories/tests/test_models.py b/successstories/tests/test_models.py
@@ -20,7 +20,8 @@ def test_draft(self):
 
     def test_featured(self):
         featured_stories = Story.objects.featured()
-        self.assertTrue(all(story.name == 'Featured Story' for story in featured_stories))
+        expected_repr = [f'<Story: {self.story3.name}>']
+        self.assertQuerysetEqual(featured_stories, expected_repr, transform=repr)
 
     def test_get_admin_url(self):
         self.assertEqual(self.story1.get_admin_url(),