Skip to content

Commit fb15056

Browse files
authored
Rollup merge of #114348 - GuillaumeGomez:migrate-gui-test-color-25, r=notriddle
Migrate GUI colors test to original CSS color format Follow-up of #111459. r? `@notriddle`
2 parents 1f076fe + c7db0f4 commit fb15056

File tree

1 file changed

+30
-43
lines changed

1 file changed

+30
-43
lines changed

tests/rustdoc-gui/pocket-menu.goml

+30-43
Original file line numberDiff line numberDiff line change
@@ -29,52 +29,39 @@ click: "#help-button"
2929
assert-css: ("#help-button .popover", {"display": "none"})
3030
assert-css: ("#settings-menu .popover", {"display": "none"})
3131

32-
// We check the borders color now:
33-
34-
// Ayu theme
35-
set-local-storage: {
36-
"rustdoc-theme": "ayu",
37-
"rustdoc-use-system-theme": "false",
38-
}
39-
reload:
40-
41-
click: "#help-button"
42-
assert-css: (
43-
"#help-button .popover",
44-
{"display": "block", "border-color": "rgb(92, 103, 115)"},
45-
)
46-
compare-elements-css: ("#help-button .popover", "#help-button .top", ["border-color"])
47-
compare-elements-css: ("#help-button .popover", "#help-button .bottom", ["border-color"])
48-
49-
// Dark theme
50-
set-local-storage: {
51-
"rustdoc-theme": "dark",
52-
"rustdoc-use-system-theme": "false",
53-
}
54-
reload:
32+
define-function: (
33+
"check-popover-colors",
34+
(theme, border_color),
35+
block {
36+
set-local-storage: {
37+
"rustdoc-theme": |theme|,
38+
"rustdoc-use-system-theme": "false",
39+
}
40+
reload:
5541

56-
click: "#help-button"
57-
assert-css: (
58-
"#help-button .popover",
59-
{"display": "block", "border-color": "rgb(224, 224, 224)"},
42+
click: "#help-button"
43+
assert-css: (
44+
"#help-button .popover",
45+
{"display": "block", "border-color": |border_color|},
46+
)
47+
compare-elements-css: ("#help-button .popover", "#help-button .top", ["border-color"])
48+
compare-elements-css: ("#help-button .popover", "#help-button .bottom", ["border-color"])
49+
}
6050
)
61-
compare-elements-css: ("#help-button .popover", "#help-button .top", ["border-color"])
62-
compare-elements-css: ("#help-button .popover", "#help-button .bottom", ["border-color"])
63-
64-
// Light theme
65-
set-local-storage: {
66-
"rustdoc-theme": "light",
67-
"rustdoc-use-system-theme": "false",
68-
}
69-
reload:
7051

71-
click: "#help-button"
72-
assert-css: (
73-
"#help-button .popover",
74-
{"display": "block", "border-color": "rgb(224, 224, 224)"},
75-
)
76-
compare-elements-css: ("#help-button .popover", "#help-button .top", ["border-color"])
77-
compare-elements-css: ("#help-button .popover", "#help-button .bottom", ["border-color"])
52+
// We check the borders color now:
53+
call-function: ("check-popover-colors", {
54+
"theme": "ayu",
55+
"border_color": "#5c6773",
56+
})
57+
call-function: ("check-popover-colors", {
58+
"theme": "dark",
59+
"border_color": "#e0e0e0",
60+
})
61+
call-function: ("check-popover-colors", {
62+
"theme": "light",
63+
"border_color": "#e0e0e0",
64+
})
7865

7966
// Opening the mobile sidebar should close the settings popover.
8067
set-window-size: (650, 600)

0 commit comments

Comments
 (0)