From ac97ce5202b05ddb6bf4e5b77151a8964b6bf632 Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev Date: Mon, 31 Jul 2023 15:22:24 +0300 Subject: [PATCH] Make the tests pass with Sphinx 7.1 Fixes #25. --- .github/workflows/test.yml | 5 ++++- tests/test_jquery_installed.py | 12 ++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 825010a..2c13fce 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -30,10 +30,13 @@ jobs: - "4" # jQuery included - "5" # jQuery deprecated - "6" # jQuery removed + - "7" exclude: - # Sphinx 6 does not support Python 3.7 + # Sphinx >= 6 does not support Python 3.7 - python: "3.7" sphinx: "6" + - python: "3.7" + sphinx: "7" steps: - uses: actions/checkout@v3 diff --git a/tests/test_jquery_installed.py b/tests/test_jquery_installed.py index a402bd4..08c25ba 100644 --- a/tests/test_jquery_installed.py +++ b/tests/test_jquery_installed.py @@ -38,12 +38,14 @@ def test_jquery_installed_sphinx_ge_60_use_sri(blank_app): out_dir = blank_app(confoverrides={"extensions": ["sphinxcontrib.jquery"], "jquery_use_sri": True}) text = out_dir.joinpath("index.html").read_text(encoding="utf-8") + checksum = '?v=5d32c60e' if sphinx.version_info[:2] >= (7, 1) else '' assert ('') in text + f'src="_static/jquery.js{checksum}">') in text + checksum = '?v=2cd50e6c' if sphinx.version_info[:2] >= (7, 1) else '' assert ('') in text + f'src="_static/_sphinx_javascript_frameworks_compat.js{checksum}">') in text static_dir = out_dir / '_static' assert static_dir.joinpath('jquery.js').is_file() @@ -56,10 +58,12 @@ def test_jquery_installed_sphinx_ge_60(blank_app): out_dir = blank_app(confoverrides={"extensions": ["sphinxcontrib.jquery"]}) text = out_dir.joinpath("index.html").read_text(encoding="utf-8") + checksum = '?v=5d32c60e' if sphinx.version_info[:2] >= (7, 1) else '' assert ('') in text + f'src="_static/jquery.js{checksum}">') in text + checksum = '?v=2cd50e6c' if sphinx.version_info[:2] >= (7, 1) else '' assert ('') in text + f'src="_static/_sphinx_javascript_frameworks_compat.js{checksum}">') in text static_dir = out_dir / '_static' assert static_dir.joinpath('jquery.js').is_file()