aboutsummaryrefslogtreecommitdiffstats
path: root/pydis_site/apps
diff options
context:
space:
mode:
authorGravatar ks129 <[email protected]>2020-10-06 16:18:11 +0300
committerGravatar ks129 <[email protected]>2020-10-06 16:30:10 +0300
commitd6a56e63ae64b2e3df40a9a4468289456b2182dc (patch)
tree70dc56c22be831110eec82eb16646c69ff9da172 /pydis_site/apps
parentMerge branch 'dewikification' into guides-app (diff)
Rename content -> articles for visual part
Diffstat (limited to 'pydis_site/apps')
-rw-r--r--pydis_site/apps/content/tests/test_views.py14
-rw-r--r--pydis_site/apps/content/urls.py2
-rw-r--r--pydis_site/apps/home/urls.py6
3 files changed, 12 insertions, 10 deletions
diff --git a/pydis_site/apps/content/tests/test_views.py b/pydis_site/apps/content/tests/test_views.py
index 0901c67f..06e6d526 100644
--- a/pydis_site/apps/content/tests/test_views.py
+++ b/pydis_site/apps/content/tests/test_views.py
@@ -13,7 +13,7 @@ class TestGuidesIndexView(TestCase):
get_categories_mock.return_value = {}
get_articles_mock.return_value = {}
- url = reverse('content:content')
+ url = reverse('articles:articles')
response = self.client.get(url)
self.assertEqual(response.status_code, 200)
get_articles_mock.assert_called_once()
@@ -26,7 +26,7 @@ class TestGuideView(TestCase):
def test_guide_return_code_200(self, get_category_mock, get_article_mock):
get_article_mock.return_value = {"guide": "test", "metadata": {}}
- url = reverse("content:article", args=["test-guide"])
+ url = reverse("articles:article", args=["test-guide"])
response = self.client.get(url)
self.assertEqual(response.status_code, 200)
get_category_mock.assert_not_called()
@@ -38,7 +38,7 @@ class TestGuideView(TestCase):
"""Check that return code is 404 when invalid article provided."""
get_article_mock.side_effect = Http404("Article not found.")
- url = reverse("content:article", args=["invalid-guide"])
+ url = reverse("articles:article", args=["invalid-guide"])
response = self.client.get(url)
self.assertEqual(response.status_code, 404)
get_article_mock.assert_called_once_with("invalid-guide", None)
@@ -53,7 +53,7 @@ class TestCategoryView(TestCase):
get_category_mock.return_value = {"name": "test", "description": "test"}
get_articles_mock.return_value = {}
- url = reverse("content:category", args=["category"])
+ url = reverse("articles:category", args=["category"])
response = self.client.get(url)
self.assertEqual(response.status_code, 200)
@@ -66,7 +66,7 @@ class TestCategoryView(TestCase):
"""Check that return code is 404 when trying to visit invalid category."""
get_category_mock.side_effect = Http404("Category not found.")
- url = reverse("content:category", args=["invalid-category"])
+ url = reverse("articles:category", args=["invalid-category"])
response = self.client.get(url)
self.assertEqual(response.status_code, 404)
@@ -81,7 +81,7 @@ class TestCategoryGuidesView(TestCase):
"""Check that return code is 200 when visiting valid category article."""
get_article_mock.return_value = {"guide": "test", "metadata": {}}
- url = reverse("content:category_article", args=["category", "test3"])
+ url = reverse("articles:category_article", args=["category", "test3"])
response = self.client.get(url)
self.assertEqual(response.status_code, 200)
get_article_mock.assert_called_once_with("test3", "category")
@@ -93,7 +93,7 @@ class TestCategoryGuidesView(TestCase):
"""Check that return code is 200 when trying to visit invalid category article."""
get_article_mock.side_effect = Http404("Article not found.")
- url = reverse("content:category_article", args=["category", "invalid"])
+ url = reverse("articles:category_article", args=["category", "invalid"])
response = self.client.get(url)
self.assertEqual(response.status_code, 404)
get_article_mock.assert_called_once_with("invalid", "category")
diff --git a/pydis_site/apps/content/urls.py b/pydis_site/apps/content/urls.py
index 5a4ee37a..cd41751b 100644
--- a/pydis_site/apps/content/urls.py
+++ b/pydis_site/apps/content/urls.py
@@ -4,7 +4,7 @@ from . import views
app_name = "content"
urlpatterns = [
- path("", views.ArticlesView.as_view(), name='content'),
+ path("", views.ArticlesView.as_view(), name='articles'),
path("category/<str:category>/", views.CategoryView.as_view(), name='category'),
path(
"category/<str:category>/<str:article>/",
diff --git a/pydis_site/apps/home/urls.py b/pydis_site/apps/home/urls.py
index c7e36156..7e41a1b9 100644
--- a/pydis_site/apps/home/urls.py
+++ b/pydis_site/apps/home/urls.py
@@ -1,4 +1,6 @@
from allauth.account.views import LogoutView
+from django.conf import settings
+from django.conf.urls.static import static
from django.contrib import admin
from django.contrib.messages import ERROR
from django.urls import include, path
@@ -33,5 +35,5 @@ urlpatterns = [
path('logout', LogoutView.as_view(), name="logout"),
path('admin/', admin.site.urls),
- path('content/', include('pydis_site.apps.content.urls', namespace='content')),
-]
+ path('articles/', include('pydis_site.apps.content.urls', namespace='articles')),
+] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)