Merge branch 'main' into typos

Author: Akarys42

pydis_site/apps/content/resources/frequently-asked-questions.md

@@ -119,7 +119,7 @@ You can also open an issue on our meta repo on GitHub, which can be found [here]
 While we love our blurple Python logo, we also enjoy celebrating other events throughout the year, like Advent of Code, Pride Month, Black History Month, Valentine's Day, Diwali, and more! In the spirit of those celebrations, we like to have some fun and change our icon instead.
 If you're wondering why it's changed this time, check out `#changelog` on the server, as the reasoning for the recent change will be there.
 
-If you'd like to contribute and create a Python Discord server icon for us to use, check out [our branding repo](https://github.com/python-discord/branding) for what we currently have and talk to us in the `#media-branding` channel in the server.
+If you'd like to contribute and create a Python Discord server icon for us to use, check out [our branding repo](https://github.com/python-discord/branding) for what we currently have and talk to us in the `#dev-branding` channel in the server.
 
 ## Misc
 

pydis_site/apps/content/tests/test_views.py

@@ -167,11 +167,16 @@ def test_get_context_data_breadcrumbs(self):
         self.ViewClass.dispatch(request, location="category/subcategory/with_metadata")
 
         context = self.ViewClass.get_context_data()
+
+        # Convert to paths to avoid dealing with non-standard path separators
+        for item in context["breadcrumb_items"]:
+            item["path"] = Path(item["path"])
+
         self.assertEquals(
             context["breadcrumb_items"],
             [
-                {"name": PARSED_CATEGORY_INFO["title"], "path": "."},
-                {"name": PARSED_CATEGORY_INFO["title"], "path": "category"},
-                {"name": PARSED_CATEGORY_INFO["title"], "path": "category/subcategory"},
+                {"name": PARSED_CATEGORY_INFO["title"], "path": Path(".")},
+                {"name": PARSED_CATEGORY_INFO["title"], "path": Path("category")},
+                {"name": PARSED_CATEGORY_INFO["title"], "path": Path("category/subcategory")},
             ]
         )