Merge pull request #19 from pamelafox/testing-setup

.devcontainer/devcontainer.json

@@ -1,5 +1,3 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.245.0/containers/python-3
 {
 	"name": "django-quiz-app",
 	"dockerComposeFile": "docker-compose.yml",

.env.sample

@@ -2,4 +2,7 @@ DBHOST=localhost
 DBNAME=app
 DBUSER=app_user
 DBPASS=app_password
+DEBUG=True
 SECRET_KEY=InsecureKeyNotForProduction
+STATIC_BACKEND=whitenoise.storage.CompressedManifestStaticFilesStorage
+DJANGO_SETTINGS_MODULE=quizsite.settings

.env.test

@@ -0,0 +1,3 @@
+# This file is checked in, so it should NOT contain keys or secrets
+STATIC_BACKEND=django.contrib.staticfiles.storage.StaticFilesStorage
+DJANGO_SETTINGS_MODULE=quizsite.settings

.github/workflows/check.yaml

@@ -39,7 +39,7 @@ jobs:
             DBPASS: postgres
             SECRET_KEY: django-insecure-key-${{ github.run_id }}-${{ github.run_attempt }}
           run: |
-            python src/manage.py collectstatic
+            set -o pipefail
             python3 -m pytest | tee pytest-coverage.txt
         - name: Pytest coverage comment
           uses: MishaKav/pytest-coverage-comment@main

.vscode/settings.json

@@ -1,11 +0,0 @@
-{
-    "python.testing.unittestArgs": [
-        "-v",
-        "-s",
-        "./src",
-        "-p",
-        "test*.py"
-    ],
-    "python.testing.pytestEnabled": false,
-    "python.testing.unittestEnabled": true
-}

infra/main.bicep

@@ -79,6 +79,7 @@ module web 'core/host/appservice.bicep' = {
       DBUSER: '@Microsoft.KeyVault(VaultName=${keyVault.outputs.name};SecretName=postgresAdminUser)'
       DBPASS: '@Microsoft.KeyVault(VaultName=${keyVault.outputs.name};SecretName=postgresAdminPassword)'
       DBSSL: 'require'
+      STATIC_BACKEND: 'whitenoise.storage.CompressedManifestStaticFilesStorage'
       SECRET_KEY: '@Microsoft.KeyVault(VaultName=${keyVault.outputs.name};SecretName=djangoSecretKey)'
     }
   }

pyproject.toml

@@ -17,4 +17,5 @@ exclude = '''
 addopts = "-ra --cov=src --cov-report=term-missing:skip-covered --junitxml=pytest.xml"
 pythonpath = ["src"]
 python_files = ["tests.py"]
-DJANGO_SETTINGS_MODULE = "quizsite.settings"
+env_override_existing_values = 1
+env_files = [".env", ".env.test"]

requirements-dev.txt

@@ -5,3 +5,4 @@ ruff
 coverage
 pytest-django
 pytest-cov
+pytest-dotenv

src/quizsite/settings.py

@@ -21,6 +21,7 @@ env = environ.Env(
     DBENGINE=(str, "django.db.backends.postgresql_psycopg2"),
     DBSSL=(str, "disable"),
     ADMIN_URL=(str, "admin/"),
+    STATIC_BACKEND=(str, "django.contrib.staticfiles.storage.StaticFilesStorage"),
 )
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
@@ -154,7 +155,7 @@ STATIC_URL = "static/"
 # https://whitenoise.evans.io/en/stable/django.html
 STORAGES = {
     "staticfiles": {
-        "BACKEND": "whitenoise.storage.CompressedManifestStaticFilesStorage",
+        "BACKEND": env("STATIC_BACKEND"),
     },
 }
 STATIC_ROOT = os.path.join(BASE_DIR, "staticfiles")