diff options
| author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2021-04-04 00:09:54 +0900 |
|---|---|---|
| committer | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2021-04-09 01:40:00 +0900 |
| commit | ffd243302a1dca5c2b17391410e9c0f96ef0cd88 (patch) | |
| tree | 5df4386955fcd286cb5301c61efc26857b9cd9cc /tests | |
| parent | ea6c62a6c5a4b2a9442c1e79988af01f06a11601 (diff) | |
| download | sphinx-git-ffd243302a1dca5c2b17391410e9c0f96ef0cd88.tar.gz | |
Fix #8870: Use title node for the caption of toctree
Since docutils-0.17, the caption node should not use for the non-figure
nodes. Therefore, this replaces it by the title node.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_environment_toctree.py | 10 | ||||
| -rw-r--r-- | tests/test_intl.py | 7 |
2 files changed, 7 insertions, 10 deletions
diff --git a/tests/test_environment_toctree.py b/tests/test_environment_toctree.py index 41b3f727c..85a98b61b 100644 --- a/tests/test_environment_toctree.py +++ b/tests/test_environment_toctree.py @@ -10,7 +10,7 @@ import pytest from docutils import nodes -from docutils.nodes import bullet_list, caption, comment, list_item, reference +from docutils.nodes import bullet_list, comment, list_item, reference, title from sphinx import addnodes from sphinx.addnodes import compact_paragraph, only @@ -211,7 +211,7 @@ def test_get_toctree_for(app): app.build() toctree = TocTree(app.env).get_toctree_for('index', app.builder, collapse=False) assert_node(toctree, - [compact_paragraph, ([caption, "Table of Contents"], + [compact_paragraph, ([title, "Table of Contents"], bullet_list, bullet_list, bullet_list)]) @@ -251,7 +251,7 @@ def test_get_toctree_for_collapse(app): app.build() toctree = TocTree(app.env).get_toctree_for('index', app.builder, collapse=True) assert_node(toctree, - [compact_paragraph, ([caption, "Table of Contents"], + [compact_paragraph, ([title, "Table of Contents"], bullet_list, bullet_list, bullet_list)]) @@ -283,7 +283,7 @@ def test_get_toctree_for_maxdepth(app): toctree = TocTree(app.env).get_toctree_for('index', app.builder, collapse=False, maxdepth=3) assert_node(toctree, - [compact_paragraph, ([caption, "Table of Contents"], + [compact_paragraph, ([title, "Table of Contents"], bullet_list, bullet_list, bullet_list)]) @@ -329,7 +329,7 @@ def test_get_toctree_for_includehidden(app): toctree = TocTree(app.env).get_toctree_for('index', app.builder, collapse=False, includehidden=False) assert_node(toctree, - [compact_paragraph, ([caption, "Table of Contents"], + [compact_paragraph, ([title, "Table of Contents"], bullet_list, bullet_list)]) diff --git a/tests/test_intl.py b/tests/test_intl.py index 3a704fd7d..0e4387025 100644 --- a/tests/test_intl.py +++ b/tests/test_intl.py @@ -622,11 +622,8 @@ def test_html_meta(app): assert expected_expr in result expected_expr = '<meta content="I18N, SPHINX, MARKUP" name="keywords" />' assert expected_expr in result - if docutils.__version_info__ < (0, 17): - expected_expr = '<p class="caption"><span class="caption-text">HIDDEN TOC</span></p>' - assert expected_expr in result - else: - expected_expr = '<p><span class="caption-text">HIDDEN TOC</span></p>' + expected_expr = '<p class="caption"><span class="caption-text">HIDDEN TOC</span></p>' + assert expected_expr in result @sphinx_intl |