Skip to content

Commit 45ea024

Browse files
committed
fix tests
1 parent c3d7006 commit 45ea024

File tree

4 files changed

+30
-34
lines changed

4 files changed

+30
-34
lines changed

tests/test_build.py

+7-10
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ def test_primary_logo_is_light_when_no_default_mode(sphinx_build_factory) -> Non
184184
index_html = sphinx_build.html_tree("index.html")
185185
navbar_brand = index_html.select(".navbar-brand")[0]
186186
assert navbar_brand.find("img", class_="only-light") is not None
187-
assert navbar_brand.find("script", string=re.compile("only-dark")) is not None
187+
assert navbar_brand.find("img", class_="only-dark") is not None
188188

189189

190190
def test_primary_logo_is_light_when_default_mode_is_set_to_auto(
@@ -199,7 +199,7 @@ def test_primary_logo_is_light_when_default_mode_is_set_to_auto(
199199
index_html = sphinx_build.html_tree("index.html")
200200
navbar_brand = index_html.select(".navbar-brand")[0]
201201
assert navbar_brand.find("img", class_="only-light") is not None
202-
assert navbar_brand.find("script", string=re.compile("only-dark")) is not None
202+
assert navbar_brand.find("img", class_="only-dark") is not None
203203

204204

205205
def test_primary_logo_is_light_when_default_mode_is_light(sphinx_build_factory) -> None:
@@ -212,7 +212,7 @@ def test_primary_logo_is_light_when_default_mode_is_light(sphinx_build_factory)
212212
index_html = sphinx_build.html_tree("index.html")
213213
navbar_brand = index_html.select(".navbar-brand")[0]
214214
assert navbar_brand.find("img", class_="only-light") is not None
215-
assert navbar_brand.find("script", string=re.compile("only-dark")) is not None
215+
assert navbar_brand.find("img", class_="only-dark") is not None
216216

217217

218218
def test_primary_logo_is_dark_when_default_mode_is_dark(sphinx_build_factory) -> None:
@@ -225,7 +225,7 @@ def test_primary_logo_is_dark_when_default_mode_is_dark(sphinx_build_factory) ->
225225
index_html = sphinx_build.html_tree("index.html")
226226
navbar_brand = index_html.select(".navbar-brand")[0]
227227
assert navbar_brand.find("img", class_="only-dark") is not None
228-
assert navbar_brand.find("script", string=re.compile("only-light")) is not None
228+
assert navbar_brand.find("img", class_="only-light") is not None
229229

230230

231231
def test_logo_missing_image(sphinx_build_factory) -> None:
@@ -805,8 +805,9 @@ def test_version_switcher_error_states(
805805
if url == "switcher.json": # this should work
806806
index = sphinx_build.html_tree("index.html")
807807
switcher = index.select(".navbar-header-items")[0].find(
808-
"script", string=re.compile(".version-switcher__container")
808+
"div", class_="version-switcher__container"
809809
)
810+
assert switcher is not None
810811
file_regression.check(
811812
switcher.prettify(), basename="navbar_switcher", extension=".html"
812813
)
@@ -826,11 +827,7 @@ def test_version_switcher_error_states(
826827
def test_theme_switcher(sphinx_build_factory, file_regression) -> None:
827828
"""Regression test for the theme switcher button."""
828829
sphinx_build = sphinx_build_factory("base").build()
829-
switcher = (
830-
sphinx_build.html_tree("index.html")
831-
.find(string=re.compile("theme-switch-button"))
832-
.find_parent("script")
833-
)
830+
switcher = sphinx_build.html_tree("index.html").find(class_="theme-switch-button")
834831
file_regression.check(
835832
switcher.prettify(), basename="navbar_theme", extension=".html"
836833
)

tests/test_build/navbar_switcher.html

+9-16
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,11 @@
11
<div class="version-switcher__container dropdown jsonly">
2-
<button id="pst-version-switcher-button-2"
3-
type="button"
4-
class="version-switcher__button btn btn-sm dropdown-toggle"
5-
data-bs-toggle="dropdown"
6-
aria-haspopup="listbox"
7-
aria-controls="pst-version-switcher-list-2"
8-
aria-label="Version switcher list"
9-
>
10-
Choose version <!-- this text may get changed later by javascript -->
11-
<span class="caret"></span>
12-
</button>
13-
<div id="pst-version-switcher-list-2"
14-
class="version-switcher__menu dropdown-menu list-group-flush py-0"
15-
role="listbox" aria-labelledby="pst-version-switcher-button-2">
16-
<!-- dropdown will be populated by javascript on page load -->
17-
</div>
2+
<button aria-controls="pst-version-switcher-list-2" aria-haspopup="listbox" aria-label="Version switcher list" class="version-switcher__button btn btn-sm dropdown-toggle" data-bs-toggle="dropdown" id="pst-version-switcher-button-2" type="button">
3+
Choose version
4+
<!-- this text may get changed later by javascript -->
5+
<span class="caret">
6+
</span>
7+
</button>
8+
<div aria-labelledby="pst-version-switcher-button-2" class="version-switcher__menu dropdown-menu list-group-flush py-0" id="pst-version-switcher-list-2" role="listbox">
9+
<!-- dropdown will be populated by javascript on page load -->
10+
</div>
1811
</div>

tests/test_build/navbar_theme.html

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
<button class="btn btn-sm nav-link pst-navbar-icon theme-switch-button jsonly" title="light/dark" aria-label="light/dark" data-bs-placement="bottom" data-bs-toggle="tooltip">
2-
<i class="theme-switch fa-solid fa-sun fa-lg" data-mode="light"></i>
3-
<i class="theme-switch fa-solid fa-moon fa-lg" data-mode="dark"></i>
4-
<i class="theme-switch fa-solid fa-circle-half-stroke fa-lg" data-mode="auto"></i>
1+
<button aria-label="light/dark" class="btn btn-sm nav-link pst-navbar-icon theme-switch-button jsonly" data-bs-placement="bottom" data-bs-toggle="tooltip" title="light/dark">
2+
<i class="theme-switch fa-solid fa-sun fa-lg" data-mode="light">
3+
</i>
4+
<i class="theme-switch fa-solid fa-moon fa-lg" data-mode="dark">
5+
</i>
6+
<i class="theme-switch fa-solid fa-circle-half-stroke fa-lg" data-mode="auto">
7+
</i>
58
</button>

tests/test_build/sidebar_subpage.html

+7-4
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,13 @@
3333
</div>
3434
<div class="sidebar-header-items__end">
3535
<div class="navbar-item">
36-
<button class="btn btn-sm nav-link pst-navbar-icon theme-switch-button jsonly" title="light/dark" aria-label="light/dark" data-bs-placement="bottom" data-bs-toggle="tooltip">
37-
<i class="theme-switch fa-solid fa-sun fa-lg" data-mode="light"></i>
38-
<i class="theme-switch fa-solid fa-moon fa-lg" data-mode="dark"></i>
39-
<i class="theme-switch fa-solid fa-circle-half-stroke fa-lg" data-mode="auto"></i>
36+
<button aria-label="light/dark" class="btn btn-sm nav-link pst-navbar-icon theme-switch-button jsonly" data-bs-placement="bottom" data-bs-toggle="tooltip" title="light/dark">
37+
<i class="theme-switch fa-solid fa-sun fa-lg" data-mode="light">
38+
</i>
39+
<i class="theme-switch fa-solid fa-moon fa-lg" data-mode="dark">
40+
</i>
41+
<i class="theme-switch fa-solid fa-circle-half-stroke fa-lg" data-mode="auto">
42+
</i>
4043
</button>
4144
</div>
4245
</div>

0 commit comments

Comments
 (0)