wip

Author: jsolly

tests/base.py

@@ -40,16 +40,4 @@ def setUpTestData(cls):
         cls.client = Client(follow=True)
 
     def tearDown(self):
-        Post.objects.all().delete()
-
-    def assertResponseAndTemplate(self, response, template_name, status_code=200):
-        """Helper method to check response status and template after redirects"""
-        if hasattr(response, 'redirect_chain') and response.redirect_chain:
-            # Get the final response status from the last redirect
-            final_url, final_status = response.redirect_chain[-1]
-            self.assertEqual(final_status, status_code)
-        else:
-            # Direct response without redirects
-            self.assertEqual(response.status_code, status_code)
-            
-        self.assertTemplateUsed(response, template_name)
+        Post.objects.all().delete()

tests/test_views.py

@@ -24,7 +24,7 @@ class TestViews(SetUp):
     def test_status_view(self, mock_db_status):
         mock_db_status.return_value.get_status.return_value = (10, 2, 500)
         response = self.client.get(reverse("status"))
-        self.assertResponseAndTemplate(response, "blog/status_page.html")
+        self.assertTemplateUsed(response, "blog/status_page.html")
 
     # def test_all_posts_view_shows_pagination(self):
     #     response = self.client.get("/all-posts/")
@@ -42,20 +42,20 @@ def test_status_view(self, mock_db_status):
 
     def test_all_posts_view(self):
         response = self.client.get(reverse("all-posts"))
-        self.assertResponseAndTemplate(response, "blog/all_posts.html")
+        self.assertTemplateUsed(response, "blog/all_posts.html")
         self.assertIsInstance(response.context["posts"][0], Post)
 
     def test_home_view_anonymous_user(self):
         response = self.client.get(reverse("home"))
-        self.assertResponseAndTemplate(response, "blog/home.html")
+        self.assertTemplateUsed(response, "blog/home.html")
         self.assertIsInstance(response.context["posts"][0], Post)
 
     def test_home_view_admin_user(self):
         self.client.login(
             username=self.admin_user.username, password=self.admin_user_password
         )
         response = self.client.get(reverse("home"))
-        self.assertResponseAndTemplate(response, "blog/home.html")
+        self.assertTemplateUsed(response, "blog/home.html")
 
     def test_home_view_htmx_request(self):
         headers = {"HTTP_HX-Request": "true", "HTTP_HX-Trigger": "TEST"}
@@ -71,7 +71,7 @@ def test_home_view_htmx_request(self):
     def test_post_detail_view_anonymous(self):
         test_post_detail_url = reverse("post-detail", args=[self.first_post.slug])
         response = self.client.get(test_post_detail_url)
-        self.assertResponseAndTemplate(response, "blog/post/post_detail.html")
+        self.assertTemplateUsed(response, "blog/post/post_detail.html")
 
     def test_post_detail_view_anonymous_draft_post(self):
         draft_post_detail_url = reverse("post-detail", args=[self.draft_post.slug])
@@ -92,7 +92,7 @@ def test_post_create_view_has_correct_context_template_and_form(self):
             username=self.admin_user.username, password=self.admin_user_password
         )
         response = self.client.get(reverse("post-create"))
-        self.assertResponseAndTemplate(response, "blog/post/add_post.html")
+        self.assertTemplateUsed(response, "blog/post/add_post.html")
         self.assertIsInstance(response.context["form"], PostForm)
         self.assertEqual(response.context["title"], "Create a New Post")
 
@@ -155,7 +155,7 @@ def test_update_post_view_has_correct_context_template_and_form(self):
         )
         post1_update_url = reverse("post-update", args=[self.first_post.slug])
         response = self.client.get(post1_update_url)
-        self.assertResponseAndTemplate(response, "blog/post/edit_post.html")
+        self.assertTemplateUsed(response, "blog/post/edit_post.html")
         self.assertIsInstance(response.context["form"], PostForm)
         self.assertEqual(response.context["title"], f"Edit {self.first_post.title}")
 
@@ -344,7 +344,7 @@ def test_comment_delete_different_user_blocked(self):
     def test_category_view_anonymous(self):
         category_url = reverse("blog-category", args=[self.default_category.slug])
         response = self.client.get(category_url)
-        self.assertResponseAndTemplate(response, "blog/categories.html")
+        self.assertTemplateUsed(response, "blog/categories.html")
         self.assertEqual(response.context["category"], self.default_category)
         self.assertIsInstance(response.context["posts"][0], Post)
 
@@ -372,7 +372,7 @@ def test_category_view_htmx_request(self):
 
     def test_search_view_blank(self):
         response = self.client.get(reverse("blog-search"))
-        self.assertResponseAndTemplate(response, "blog/search_posts.html")
+        self.assertTemplateUsed(response, "blog/search_posts.html")
 
     def test_search_view_anonymous(self):
         # If anonymous, should be able to find a post
@@ -394,7 +394,7 @@ def test_search_view_staff(self):
 
     def test_register_view_happy_path(self):
         response = self.client.get(reverse("register"))
-        self.assertResponseAndTemplate(response, "users/register.html")
+        self.assertTemplateUsed(response, "users/register.html")
         self.assertIsInstance(response.context["form"], UserRegisterForm)
 
         data = {
@@ -438,7 +438,7 @@ def test_profile_view(self):
             username=self.admin_user.username, password=self.admin_user_password
         )
         response = self.client.get(reverse("profile"))
-        self.assertResponseAndTemplate(response, "users/profile.html")
+        self.assertTemplateUsed(response, "users/profile.html")
         self.assertIsInstance(response.context["p_form"], ProfileUpdateForm)
         self.assertIsInstance(response.context["u_form"], UserUpdateForm)
 
@@ -475,29 +475,29 @@ def test_profile_view_edit_invalid(self):
 
     def test_login_view(self):
         response = self.client.get(reverse("login"))
-        self.assertResponseAndTemplate(response, "users/login.html")
+        self.assertTemplateUsed(response, "users/login.html")
 
     def test_logout_view(self):
         self.client.login(
             username=self.admin_user.username, password=self.admin_user_password
         )
         response = self.client.post(reverse("logout"))
-        self.assertResponseAndTemplate(response, "users/logout.html")
+        self.assertTemplateUsed(response, "users/logout.html")
 
     def test_password_rest_view(self):
         response = self.client.get(reverse("password_reset"), follow=True)
-        self.assertResponseAndTemplate(response, "users/password_reset.html")
+        self.assertTemplateUsed(response, "users/password_reset.html")
 
     def test_password_reset_done_view(self):
         response = self.client.get(reverse("password_reset_done"), follow=True)
-        self.assertResponseAndTemplate(response, "users/password_reset_done.html")
+        self.assertTemplateUsed(response, "users/password_reset_done.html")
 
     # def test_password_reset_confirm_view(self):
     #     # TODO
 
     def test_password_reset_complete(self):
         response = self.client.get(reverse("password_reset_complete"), follow=True)
-        self.assertResponseAndTemplate(response, "users/password_reset_complete.html")
+        self.assertTemplateUsed(response, "users/password_reset_complete.html")
 
     def test_sitemap_view(self):
         response = self.client.get(reverse("django.contrib.sitemaps.views.sitemap"))