Merge branch 'main' into subclassing_bot

2 files changed, 14 insertions, 11 deletions

diff --git a/pydis_site/apps/home/tests/test_repodata_helpers.py b/pydis_site/apps/home/tests/test_repodata_helpers.py
index d43bd28e..acf4a817 100644
--- a/pydis_site/apps/home/tests/test_repodata_helpers.py
+++ b/pydis_site/apps/home/tests/test_repodata_helpers.py
@@ -22,7 +22,7 @@ def mocked_requests_get(*args, **kwargs) -> "MockResponse":  # noqa: F821
 
     if args[0] == HomeView.github_api:
         json_path = Path(__file__).resolve().parent / "mock_github_api_response.json"
-        with open(json_path, 'r') as json_file:
+        with open(json_path) as json_file:
             mock_data = json.load(json_file)
 
         return MockResponse(mock_data, 200)
@@ -36,13 +36,13 @@ class TestRepositoryMetadataHelpers(TestCase):
         """Executed before each test method."""
         self.home_view = HomeView()
 
-    @mock.patch('requests.get', side_effect=mocked_requests_get)
+    @mock.patch('httpx.get', side_effect=mocked_requests_get)
     def test_returns_metadata(self, _: mock.MagicMock):
         """Test if the _get_repo_data helper actually returns what it should."""
         metadata = self.home_view._get_repo_data()
 
         self.assertIsInstance(metadata[0], RepositoryMetadata)
-        self.assertEquals(len(metadata), len(self.home_view.repos))
+        self.assertEqual(len(metadata), len(self.home_view.repos))
 
     def test_returns_cached_metadata(self):
         """Test if the _get_repo_data helper returns cached data when available."""
@@ -59,7 +59,7 @@ class TestRepositoryMetadataHelpers(TestCase):
         self.assertIsInstance(metadata[0], RepositoryMetadata)
         self.assertIsInstance(str(metadata[0]), str)
 
-    @mock.patch('requests.get', side_effect=mocked_requests_get)
+    @mock.patch('httpx.get', side_effect=mocked_requests_get)
     def test_refresh_stale_metadata(self, _: mock.MagicMock):
         """Test if the _get_repo_data helper will refresh when the data is stale."""
         repo_data = RepositoryMetadata(
@@ -75,18 +75,18 @@ class TestRepositoryMetadataHelpers(TestCase):
 
         self.assertIsInstance(metadata[0], RepositoryMetadata)
 
-    @mock.patch('requests.get', side_effect=mocked_requests_get)
+    @mock.patch('httpx.get', side_effect=mocked_requests_get)
     def test_returns_api_data(self, _: mock.MagicMock):
         """Tests if the _get_api_data helper returns what it should."""
         api_data = self.home_view._get_api_data()
         repo = self.home_view.repos[0]
 
         self.assertIsInstance(api_data, dict)
-        self.assertEquals(len(api_data), len(self.home_view.repos))
+        self.assertEqual(len(api_data), len(self.home_view.repos))
         self.assertIn(repo, api_data.keys())
         self.assertIn("stargazers_count", api_data[repo])
 
-    @mock.patch('requests.get', side_effect=mocked_requests_get)
+    @mock.patch('httpx.get', side_effect=mocked_requests_get)
     def test_mocked_requests_get(self, mock_get: mock.MagicMock):
         """Tests if our mocked_requests_get is returning what it should."""
         success_data = mock_get(HomeView.github_api)
@@ -98,7 +98,7 @@ class TestRepositoryMetadataHelpers(TestCase):
         self.assertIsNotNone(success_data.json_data)
         self.assertIsNone(fail_data.json_data)
 
-    @mock.patch('requests.get')
+    @mock.patch('httpx.get')
     def test_falls_back_to_database_on_error(self, mock_get: mock.MagicMock):
         """Tests that fallback to the database is performed when we get garbage back."""
         repo_data = RepositoryMetadata(
@@ -117,7 +117,7 @@ class TestRepositoryMetadataHelpers(TestCase):
         [item] = metadata
         self.assertEqual(item, repo_data)
 
-    @mock.patch('requests.get')
+    @mock.patch('httpx.get')
     def test_falls_back_to_database_on_error_without_entries(self, mock_get: mock.MagicMock):
         """Tests that fallback to the database is performed when we get garbage back."""
         mock_get.return_value.json.return_value = ['garbage']
@@ -126,7 +126,7 @@ class TestRepositoryMetadataHelpers(TestCase):
         with self.assertLogs():
             metadata = self.home_view._get_repo_data()
 
-        self.assertEquals(len(metadata), 0)
+        self.assertEqual(len(metadata), 0)
 
     def test_cleans_up_stale_metadata(self):
         """Tests that we clean up stale metadata when we start the HomeView."""
diff --git a/pydis_site/apps/home/tests/test_views.py b/pydis_site/apps/home/tests/test_views.py
index b1215df4..379b984e 100644
--- a/pydis_site/apps/home/tests/test_views.py
+++ b/pydis_site/apps/home/tests/test_views.py
@@ -1,3 +1,5 @@
+from unittest import mock
+
 from django.test import TestCase
 from django.urls import reverse
 
@@ -6,5 +8,6 @@ class TestIndexReturns200(TestCase):
     def test_index_returns_200(self):
         """Check that the index page returns a HTTP 200 response."""
         url = reverse('home:home')
-        resp = self.client.get(url)
+        with mock.patch("pydis_site.apps.home.views.HomeView._get_api_data", autospec=True):
+            resp = self.client.get(url)
         self.assertEqual(resp.status_code, 200)