finished all tests, attempted to manage static files

862f75e2 · Xavier Calabia · dec64e5d · 862f75e2 · 862f75e2 · 862f75e2
Commit 862f75e2 authored Mar 10, 2020 by Xavier Calabia
Showing with 21 additions and 5 deletions

detail_cloud.html heroes/templates/hero/detail_cloud.html +2 -1

tests.py heroes/tests.py +13 -1

views.py heroes/views.py +2 -2

settings.py willowisp/willowisp/settings.py +4 -1

No files found.
--- a/heroes/templates/hero/detail_cloud.html
+++ b/heroes/templates/hero/detail_cloud.html
@@ -4,7 +4,8 @@
 	<title>Detail - Cloud</title>
 </head>
 <body>
-<img src="./cloud.png" style="width: 10vw;" />
+{% load staticfiles %}
+<img src="{% static 'hero/cloud.png' %}" style="width: 10vw;" />
 <h1>Detail - Cloud</h1>
 <dl>
 <dt>Health Points</dt><dd>600</dd>

--- a/heroes/tests.py
+++ b/heroes/tests.py
@@ -5,4 +5,16 @@ from django.test import TestCase
 class HomePageTest(TestCase):
    def test_redirects_to_heros_template(self):
        response = self.client.get('')
-        self.assertRedirects(response, '/heroes')
+        self.assertRedirects(response, '/heroes', status_code=301)
+
+    def test_heroes_page_uses_heroes_template(self):
+        response = self.client.get('/heroes')
+        self.assertTemplateUsed(response, 'heroes.html')
+
+    def test_hero_detail_pages_use_hero_templates(self):
+        response = self.client.get('/hero/cloud')
+        self.assertTemplateUsed(response, 'hero/detail_cloud.html')
+        response = self.client.get('/hero/sunflowey')
+        self.assertTemplateUsed(response, 'hero/detail_sunflowey.html')
+        response = self.client.get('/hero/jester')
+        self.assertTemplateUsed(response, 'hero/detail_jester.html')
--- a/heroes/views.py
+++ b/heroes/views.py
@@ -5,8 +5,8 @@ def heroes_page(request):
    return render(request, 'heroes.html')

 def redirect_to_heroes_page(request):
-    return redirect('/heroes')
-    
+    return redirect('/heroes', permanent=True)
+
 def cloud_info_page(request):
    return render(request, 'hero/detail_cloud.html')


--- a/willowisp/willowisp/settings.py
+++ b/willowisp/willowisp/settings.py
@@ -122,4 +122,7 @@ USE_TZ = True
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.11/howto/static-files/

-STATIC_URL = '/static/'
+STATIC_URL = 'templates/'
+STATICFILES_DIRS = [
+    os.path.join(BASE_DIR, "templates"),
+]