fix(tests): fix local development tests through docker

Author: makors

.github/workflows/ci.yml

@@ -47,7 +47,7 @@
                 },
                 {
                     "name": "Set up packages",
-                    "run": "set -e\n\nsudo apt-get update\nsudo apt-get install -y libfreetype6-dev\n\npip install -U pip setuptools wheel\npip install -U \\\n  pre-commit coveralls pyyaml pytest-django\npip install -U -r requirements.txt\n\necho \"PATH=$PATH\" >> $GITHUB_ENV\n"
+                    "run": "set -e\n\nsudo apt-get update\nsudo apt-get install -y libfreetype6-dev\n\npip install -U pip setuptools wheel\npip install -U \\\n  pre-commit coveralls pyyaml\npip install -U -r requirements.txt\n\necho \"PATH=$PATH\" >> $GITHUB_ENV\n"
                 },
                 {
                     "name": "Copy secret.py",
@@ -94,7 +94,7 @@
                 },
                 {
                     "name": "Set up packages",
-                    "run": "set -e\n\nsudo apt-get update\nsudo apt-get install -y libfreetype6-dev\n\npip install -U pip setuptools wheel\npip install -U \\\n  pre-commit coveralls pyyaml pytest-django\npip install -U -r requirements.txt\n\necho \"PATH=$PATH\" >> $GITHUB_ENV\n"
+                    "run": "set -e\n\nsudo apt-get update\nsudo apt-get install -y libfreetype6-dev\n\npip install -U pip setuptools wheel\npip install -U \\\n  pre-commit coveralls pyyaml\npip install -U -r requirements.txt\n\necho \"PATH=$PATH\" >> $GITHUB_ENV\n"
                 },
                 {
                     "name": "Copy secret.py",
@@ -203,7 +203,7 @@
                 },
                 {
                     "name": "Set up packages",
-                    "run": "set -e\n\nsudo apt-get update\nsudo apt-get install -y libfreetype6-dev\n\npip install -U pip setuptools wheel\npip install -U \\\n  pre-commit coveralls pyyaml pytest-django\npip install -U -r requirements.txt\n\necho \"PATH=$PATH\" >> $GITHUB_ENV\n"
+                    "run": "set -e\n\nsudo apt-get update\nsudo apt-get install -y libfreetype6-dev\n\npip install -U pip setuptools wheel\npip install -U \\\n  pre-commit coveralls pyyaml\npip install -U -r requirements.txt\n\necho \"PATH=$PATH\" >> $GITHUB_ENV\n"
                 },
                 {
                     "name": "Copy secret.py",

ci/spec.yml

@@ -60,7 +60,7 @@ env:
 
       pip install -U pip setuptools wheel
       pip install -U \
-        pre-commit coveralls pyyaml pytest-django
+        pre-commit coveralls pyyaml
       pip install -U -r requirements.txt
 
       echo "PATH=$PATH" >> $GITHUB_ENV

docs/source/developing/testing.rst

@@ -11,10 +11,46 @@ For most modules, the unit tests go in ``intranet/apps/<module>/tests.py``. Curr
 
 .. _running-tests:
 
-Running Tests
-=============
+Running Tests Locally
+=====================
+
+Tests should be run inside the Docker development environment. Make sure your Docker containers are running first:
+
+.. code-block:: bash
+
+    cd config/docker
+    docker compose up -d
+
+Running Tests with Django's Test Runner (Recommended)
+-----------------------------------------------------
+
+The recommended way to run tests is using Django's built-in test runner, which is what CI uses:
+
+.. code-block:: bash
+
+    # Run all tests (this may take some time!)
+    docker exec intranet_django python ./manage.py test --noinput
+
+    # Run tests for a specific app (in this case, polls)
+    docker exec intranet_django python ./manage.py test intranet.apps.polls --noinput
+
+    # Run a specific test file (in this case, auth)
+    docker exec intranet_django python ./manage.py test intranet.apps.auth.tests.TurnstileFieldTest --noinput
+
+    # Run with verbose output, useful for debugging
+    docker exec intranet_django python ./manage.py test intranet.apps.polls --noinput -v 2
+
+Interactive Testing Shell
+-------------------------
+
+If you want to run multiple test commands, you can open an interactive shell with Docker:
+
+.. code-block:: bash
+
+    docker exec -it intranet_django sh
 
-To actually execute tests, run ``pytest`` inside your dev environment. If you want to only test a specific app, you can run ``pytest <apps_name>``. Do note that this deletes and re-creates the db from scratch each time, so you may want to pass the ``-k`` option when developing tests as it significantly reduces run-time.
+    # then inside the container, run tests:
+    ./manage.py test intranet.apps.polls --noinput
 
 Coverage
 ========
@@ -42,8 +78,8 @@ The first is calling methods directly; the second is making a GET or POST reques
 The best tests utilize both. After you do either/both of these to call the code, you should use assertions to see if the code behaved as expected.
 A list of assertion options can be found `here <https://docs.python.org/3/library/unittest.html#assert-methods>`_.
 A useful tool for making requests to the view is ``self.client``. More documentation on that can be found
-`here <https://docs.djangoproject.com/en/3.2/topics/testing/tools/>`_. Alternatively, just search through Ion's
-testing files for examples of using `self.client`.
+`here <https://docs.djangoproject.com/en/stable/topics/testing/tools/>`_. Alternatively, just search through Ion's
+testing files for examples of using ``self.client``.
 
 Good Testing Examples
 =====================
@@ -57,8 +93,8 @@ Ion has lots of tests; the following are examples of very well-written ones. Not
 References
 ==========
 
-- `Django Testing Guide <https://docs.djangoproject.com/en/3.2/topics/testing>`_.
-- `Python unittest documentation <https://docs.python.org/3/library/unittest.html>`_.
-- `Code Coverage <https://coveralls.io/github/tjcsl/ion>`_.
-- `Python Unit Testing Frameworkgood <https://docs.python.org/3/library/unittest.html#assert-methods>`_.
-- `Testing Exceptions <https://docs.djangoproject.com/en/3.2/topics/testing/tools/#exceptions>`_.
+- `Django Testing Guide <https://docs.djangoproject.com/en/stable/topics/testing/>`_
+- `Python unittest documentation <https://docs.python.org/3/library/unittest.html>`_
+- `Code Coverage <https://coveralls.io/github/tjcsl/ion>`_
+- `Python Unit Testing Assert Methods <https://docs.python.org/3/library/unittest.html#assert-methods>`_
+- `Testing Exceptions <https://docs.djangoproject.com/en/stable/topics/testing/tools/#exceptions>`_

intranet/settings/__init__.py

@@ -665,6 +665,10 @@ def get_oidc_private_key():
     # "REQUEST_APPROVAL_PROMPT": "auto",
 }
 OAUTH2_PROVIDER_APPLICATION_MODEL = "oauth.CSLApplication"
+OAUTH2_PROVIDER_ACCESS_TOKEN_MODEL = "oauth2_provider.AccessToken"
+OAUTH2_PROVIDER_REFRESH_TOKEN_MODEL = "oauth2_provider.RefreshToken"
+OAUTH2_PROVIDER_ID_TOKEN_MODEL = "oauth2_provider.IDToken"
+OAUTH2_PROVIDER_GRANT_MODEL = "oauth2_provider.Grant"
 
 
 INSTALLED_APPS = [
@@ -842,7 +846,6 @@ def get_log(name):  # pylint: disable=redefined-outer-name; 'name' is used as th
         ("debug_toolbar.panels.templates.TemplatesPanel", False),
         ("debug_toolbar.panels.cache.CachePanel", False),
         ("debug_toolbar.panels.signals.SignalsPanel", False),
-        ("debug_toolbar.panels.logging.LoggingPanel", True),
         ("debug_toolbar.panels.redirects.RedirectsPanel", False),
         ("debug_toolbar.panels.profiling.ProfilingPanel", False),
     ]

pyproject.toml

@@ -118,12 +118,6 @@ ignore = [
   "F403",
 ]
 
-[tool.ruff.lint.flake8-pytest-style]
-fixture-parentheses = false
-mark-parentheses = false
-parametrize-names-type = "tuple"
-parametrize-values-type = "tuple"
-
 [tool.ruff.format]
 docstring-code-format = true
 line-ending = "lf"