tests: serve common templates css through static files

manderj · stephane · commit 009a1c77026f · 2022-03-10T12:54:00.000+01:00
diff --git a/testproj/README b/testproj/README
@@ -3,6 +3,7 @@
 3  pip install ..
 4. ./manage.py migrate
 5. ./manage.py loaddata secretfiles
-6. ./manage.py runserver
+6. ./manage.py collectstatic
+7. ./manage.py runserver
 
 To run tests: ./manage.py test
diff --git a/testproj/testproj/settings.py b/testproj/testproj/settings.py
@@ -121,6 +121,7 @@
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/3.1/howto/static-files/
 
+STATIC_ROOT = "static/"
 STATIC_URL = "/static/"
 
 DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
diff --git a/testproj/testproj/testapp/jinja2/env.py b/testproj/testproj/testapp/jinja2/env.py
@@ -1,6 +1,7 @@
 from jinja2.environment import Environment
 
 from django.template.defaultfilters import yesno
+from django.templatetags.static import static
 from webstack_django_sorting.jinja2_globals import (
     sorting_anchor,
     sort_queryset,
@@ -13,3 +14,4 @@ def __init__(self, **kwargs):
         self.filters["yesno"] = yesno
         self.globals["sorting_anchor"] = sorting_anchor
         self.globals["sort_queryset"] = sort_queryset
+        self.globals["static"] = static
diff --git a/testproj/testproj/testapp/jinja2/secret_list.jinja2 b/testproj/testproj/testapp/jinja2/secret_list.jinja2
@@ -1,36 +1,6 @@
 <html>
   <head>
-    <style>
-      body {
-        font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
-        line-height: 1.42857143;
-        color: #333;
-      }
-
-      table {
-        border-spacing: 0;
-        border-collapse: collapse;
-      }
-
-      thead>tr>th {
-        vertical-align: bottom;
-        border-bottom: 2px solid #ddd;
-        text-align: left;
-      }
-
-      thead>tr>th>a {
-        text-decoration: none;
-      }
-
-      thead>tr>th>a:visited {
-        color: inherit;
-      }
-
-      tr>th, tr>td {
-        padding: 8px;
-        line-height: 1.42857143;
-      }
-    </style>
+    <link rel="stylesheet" href="{{ static('css/style.css') }}"/>
   </head>
   <body>
     <h2>List of files</h2>
diff --git a/testproj/testproj/testapp/templates/secret_list.html b/testproj/testproj/testapp/templates/secret_list.html
@@ -1,38 +1,8 @@
-{% load sorting_tags %}
+{% load static sorting_tags %}
 
 <html>
   <head>
-    <style>
-      body {
-        font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
-        line-height: 1.42857143;
-        color: #333;
-      }
-
-      table {
-        border-spacing: 0;
-        border-collapse: collapse;
-      }
-
-      thead>tr>th {
-        vertical-align: bottom;
-        border-bottom: 2px solid #ddd;
-        text-align: left;
-      }
-
-      thead>tr>th>a {
-        text-decoration: none;
-      }
-
-      thead>tr>th>a:visited {
-        color: inherit;
-      }
-
-      tr>th, tr>td {
-        padding: 8px;
-        line-height: 1.42857143;
-      }
-    </style>
+    <link rel="stylesheet" href="{% static 'css/style.css' %}"/>
   </head>
   <body>
     <h2>List of files</h2>
diff --git a/testproj/testproj/testapp/templates/secret_list_nulls_first.html b/testproj/testproj/testapp/templates/secret_list_nulls_first.html
@@ -1,6 +1,9 @@
-{% load sorting_tags %}
+{% load static sorting_tags %}
 
 <html>
+  <head>
+    <link rel="stylesheet" href="{% static 'css/style.css' %}"/>
+  </head>
   <body>
     <h2>List of files</h2>
     {% autosort secret_files nulls_first=True %}
diff --git a/testproj/testproj/testapp/templates/secret_list_nulls_last.html b/testproj/testproj/testapp/templates/secret_list_nulls_last.html
@@ -1,6 +1,9 @@
-{% load sorting_tags %}
+{% load static sorting_tags %}
 
 <html>
+  <head>
+    <link rel="stylesheet" href="{% static 'css/style.css' %}"/>
+  </head>
   <body>
     <h2>List of files</h2>
     {% autosort secret_files nulls_last=True %}
diff --git a/testproj/testproj/urls.py b/testproj/testproj/urls.py
@@ -1,12 +1,14 @@
 from django.contrib import admin
+from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 from django.urls import path
 
 from .testapp import views
 
+
 urlpatterns = [
     path("", views.secret_list, name="secret_list"),
     path("nulls_first", views.secret_list_nulls_first, name="nulls_first"),
     path("nulls_last", views.secret_list_nulls_last, name="nulls_last"),
     path("jinja2", views.secret_list_jinja2, name="secret_list_jinja2"),
     path("admin/", admin.site.urls),
-]
+] + staticfiles_urlpatterns()
