Merge branch 'main' into serializable

* main:
  Added check for pytest as test runner for IS_RUNNING_TESTS. (#2137)
  [pre-commit.ci] pre-commit autoupdate (#2140)
  Disabled document.cookie linter

Author: matthiask

.pre-commit-config.yaml

@@ -14,7 +14,7 @@ repos:
     hooks:
     -   id: doc8
 -   repo: https://github.com/adamchainz/django-upgrade
-    rev: 1.24.0
+    rev: 1.25.0
     hooks:
     -   id: django-upgrade
         args: [--target-version, "4.2"]
@@ -29,12 +29,12 @@ repos:
     -   id: rst-backticks
     -   id: rst-directive-colons
 -   repo: https://github.com/biomejs/pre-commit
-    rev: v2.0.0-beta.3
+    rev: v2.0.0-beta.4
     hooks:
       - id: biome-check
         verbose: true
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: 'v0.11.9'
+    rev: 'v0.11.10'
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]

biome.json

@@ -38,6 +38,9 @@
                 "useExportType": "error",
                 "noUselessElse": "error",
                 "useShorthandFunctionType": "error"
+            },
+            "suspicious": {
+                "noDocumentCookie": "off"
             }
         }
     },

debug_toolbar/settings.py

@@ -7,6 +7,15 @@
 from django.dispatch import receiver
 from django.test.signals import setting_changed
 
+
+def _is_running_tests():
+    """
+    Helper function to support testing default value for
+    IS_RUNNING_TESTS
+    """
+    return "test" in sys.argv or "PYTEST_VERSION" in os.environ
+
+
 CONFIG_DEFAULTS = {
     # Toolbar options
     "DISABLE_PANELS": {
@@ -45,7 +54,7 @@
     "OBSERVE_REQUEST_CALLBACK": "debug_toolbar.toolbar.observe_request",
     "TOOLBAR_LANGUAGE": None,
     "TOOLBAR_STORE_CLASS": "debug_toolbar.store.MemoryStore",
-    "IS_RUNNING_TESTS": "test" in sys.argv or "PYTEST_VERSION" in os.environ,
+    "IS_RUNNING_TESTS": _is_running_tests(),
     "UPDATE_ON_FETCH": False,
 }
 

docs/spelling_wordlist.txt

@@ -49,6 +49,7 @@ psycopg
 py
 pyflame
 pylibmc
+pytest
 pyupgrade
 querysets
 refactoring
@@ -65,5 +66,6 @@ theming
 timeline
 tox
 uWSGI
+unhandled
 unhashable
 validator

tests/test_settings.py

@@ -0,0 +1,22 @@
+from unittest.mock import patch
+
+from django.test import TestCase
+
+from debug_toolbar.settings import _is_running_tests
+
+
+class SettingsTestCase(TestCase):
+    @patch("debug_toolbar.settings.sys")
+    @patch("debug_toolbar.settings.os")
+    def test_is_running_tests(self, mock_os, mock_sys):
+        mock_sys.argv = "test"
+        mock_os.environ = {}
+        self.assertTrue(_is_running_tests())
+
+        mock_sys.argv = ""
+        mock_os.environ = {}
+        self.assertFalse(_is_running_tests())
+
+        mock_sys.argv = ""
+        mock_os.environ = {"PYTEST_VERSION": "1"}
+        self.assertTrue(_is_running_tests())