Skip to content

Commit ddcdd28

Browse files
Dylan-DPCDylan-DPC
authored
Rollup merge of #103237 - GuillaumeGomez:codeblock-tooltip-cleanup, r=notriddle
Clean up codeblock-tooltip rustdoc-gui test r? `@notriddle`
2 parents 5e4c91a + afccb65 commit ddcdd28

File tree

2 files changed

+77
-93
lines changed

2 files changed

+77
-93
lines changed

‎src/ci/docker/host-x86_64/x86_64-gnu-tools/browser-ui-test.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.12.6
1+
0.12.7

‎src/test/rustdoc-gui/codeblock-tooltip.goml‎

Lines changed: 76 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -2,95 +2,79 @@
22
goto: "file://" + |DOC_PATH| + "/test_docs/fn.foo.html"
33
show-text: true
44

5-
// Dark theme.
6-
local-storage: {"rustdoc-theme": "dark", "rustdoc-use-system-theme": "false"}
7-
reload:
8-
9-
// compile_fail block
10-
assert-css: (".docblock .example-wrap.compile_fail .tooltip", {"color": "rgba(255, 0, 0, 0.5)"})
11-
assert-css: (".docblock .example-wrap.compile_fail", {"border-left": "2px solid rgba(255, 0, 0, 0.5)"})
12-
13-
move-cursor-to: ".docblock .example-wrap.compile_fail"
14-
15-
assert-css: (".docblock .example-wrap.compile_fail .tooltip", {"color": "rgb(255, 0, 0)"})
16-
assert-css: (".docblock .example-wrap.compile_fail", {"border-left": "2px solid rgb(255, 0, 0)"})
17-
18-
// should_panic block
19-
assert-css: (".docblock .example-wrap.should_panic .tooltip", {"color": "rgba(255, 0, 0, 0.5)"})
20-
assert-css: (".docblock .example-wrap.should_panic", {"border-left": "2px solid rgba(255, 0, 0, 0.5)"})
21-
22-
move-cursor-to: ".docblock .example-wrap.should_panic"
23-
24-
assert-css: (".docblock .example-wrap.should_panic .tooltip", {"color": "rgb(255, 0, 0)"})
25-
assert-css: (".docblock .example-wrap.should_panic", {"border-left": "2px solid rgb(255, 0, 0)"})
26-
27-
// ignore block
28-
assert-css: (".docblock .example-wrap.ignore .tooltip", {"color": "rgba(255, 142, 0, 0.6)"})
29-
assert-css: (".docblock .example-wrap.ignore", {"border-left": "2px solid rgba(255, 142, 0, 0.6)"})
30-
31-
move-cursor-to: ".docblock .example-wrap.ignore"
32-
33-
assert-css: (".docblock .example-wrap.ignore .tooltip", {"color": "rgb(255, 142, 0)"})
34-
assert-css: (".docblock .example-wrap.ignore", {"border-left": "2px solid rgb(255, 142, 0)"})
35-
36-
37-
// Light theme.
38-
local-storage: {"rustdoc-theme": "light"}
39-
reload:
40-
41-
assert-css: (".docblock .example-wrap.compile_fail .tooltip", {"color": "rgba(255, 0, 0, 0.5)"})
42-
assert-css: (".docblock .example-wrap.compile_fail", {"border-left": "2px solid rgba(255, 0, 0, 0.5)"})
43-
44-
move-cursor-to: ".docblock .example-wrap.compile_fail"
45-
46-
assert-css: (".docblock .example-wrap.compile_fail .tooltip", {"color": "rgb(255, 0, 0)"})
47-
assert-css: (".docblock .example-wrap.compile_fail", {"border-left": "2px solid rgb(255, 0, 0)"})
48-
49-
// should_panic block
50-
assert-css: (".docblock .example-wrap.should_panic .tooltip", {"color": "rgba(255, 0, 0, 0.5)"})
51-
assert-css: (".docblock .example-wrap.should_panic", {"border-left": "2px solid rgba(255, 0, 0, 0.5)"})
52-
53-
move-cursor-to: ".docblock .example-wrap.should_panic"
54-
55-
assert-css: (".docblock .example-wrap.should_panic .tooltip", {"color": "rgb(255, 0, 0)"})
56-
assert-css: (".docblock .example-wrap.should_panic", {"border-left": "2px solid rgb(255, 0, 0)"})
57-
58-
// ignore block
59-
assert-css: (".docblock .example-wrap.ignore .tooltip", {"color": "rgba(255, 142, 0, 0.6)"})
60-
assert-css: (".docblock .example-wrap.ignore", {"border-left": "2px solid rgba(255, 142, 0, 0.6)"})
61-
62-
move-cursor-to: ".docblock .example-wrap.ignore"
63-
64-
assert-css: (".docblock .example-wrap.ignore .tooltip", {"color": "rgb(255, 142, 0)"})
65-
assert-css: (".docblock .example-wrap.ignore", {"border-left": "2px solid rgb(255, 142, 0)"})
66-
67-
68-
// Ayu theme.
69-
local-storage: {"rustdoc-theme": "ayu"}
70-
reload:
71-
72-
assert-css: (".docblock .example-wrap.compile_fail .tooltip", {"color": "rgba(255, 0, 0, 0.5)"})
73-
assert-css: (".docblock .example-wrap.compile_fail", {"border-left": "2px solid rgba(255, 0, 0, 0.5)"})
74-
75-
move-cursor-to: ".docblock .example-wrap.compile_fail"
76-
77-
assert-css: (".docblock .example-wrap.compile_fail .tooltip", {"color": "rgb(255, 0, 0)"})
78-
assert-css: (".docblock .example-wrap.compile_fail", {"border-left": "2px solid rgb(255, 0, 0)"})
79-
80-
// should_panic block
81-
assert-css: (".docblock .example-wrap.should_panic .tooltip", {"color": "rgba(255, 0, 0, 0.5)"})
82-
assert-css: (".docblock .example-wrap.should_panic", {"border-left": "2px solid rgba(255, 0, 0, 0.5)"})
83-
84-
move-cursor-to: ".docblock .example-wrap.should_panic"
85-
86-
assert-css: (".docblock .example-wrap.should_panic .tooltip", {"color": "rgb(255, 0, 0)"})
87-
assert-css: (".docblock .example-wrap.should_panic", {"border-left": "2px solid rgb(255, 0, 0)"})
88-
89-
// ignore block
90-
assert-css: (".docblock .example-wrap.ignore .tooltip", {"color": "rgba(255, 142, 0, 0.6)"})
91-
assert-css: (".docblock .example-wrap.ignore", {"border-left": "2px solid rgba(255, 142, 0, 0.6)"})
92-
93-
move-cursor-to: ".docblock .example-wrap.ignore"
94-
95-
assert-css: (".docblock .example-wrap.ignore .tooltip", {"color": "rgb(255, 142, 0)"})
96-
assert-css: (".docblock .example-wrap.ignore", {"border-left": "2px solid rgb(255, 142, 0)"})
5+
define-function: (
6+
"check-colors",
7+
(theme),
8+
[
9+
// Setting the theme.
10+
("local-storage", {"rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false"}),
11+
("reload"),
12+
13+
// compile_fail block
14+
("assert-css", (
15+
".docblock .example-wrap.compile_fail .tooltip",
16+
{"color": "rgba(255, 0, 0, 0.5)"},
17+
)),
18+
("assert-css", (
19+
".docblock .example-wrap.compile_fail",
20+
{"border-left": "2px solid rgba(255, 0, 0, 0.5)"},
21+
)),
22+
23+
("move-cursor-to", ".docblock .example-wrap.compile_fail"),
24+
25+
("assert-css", (
26+
".docblock .example-wrap.compile_fail .tooltip",
27+
{"color": "rgb(255, 0, 0)"},
28+
)),
29+
("assert-css", (
30+
".docblock .example-wrap.compile_fail",
31+
{"border-left": "2px solid rgb(255, 0, 0)"},
32+
)),
33+
34+
// should_panic block
35+
("assert-css", (
36+
".docblock .example-wrap.should_panic .tooltip",
37+
{"color": "rgba(255, 0, 0, 0.5)"},
38+
)),
39+
("assert-css", (
40+
".docblock .example-wrap.should_panic",
41+
{"border-left": "2px solid rgba(255, 0, 0, 0.5)"},
42+
)),
43+
44+
("move-cursor-to", ".docblock .example-wrap.should_panic"),
45+
46+
("assert-css", (
47+
".docblock .example-wrap.should_panic .tooltip",
48+
{"color": "rgb(255, 0, 0)"},
49+
)),
50+
("assert-css", (
51+
".docblock .example-wrap.should_panic",
52+
{"border-left": "2px solid rgb(255, 0, 0)"},
53+
)),
54+
55+
// ignore block
56+
("assert-css", (
57+
".docblock .example-wrap.ignore .tooltip",
58+
{"color": "rgba(255, 142, 0, 0.6)"},
59+
)),
60+
("assert-css", (
61+
".docblock .example-wrap.ignore",
62+
{"border-left": "2px solid rgba(255, 142, 0, 0.6)"},
63+
)),
64+
65+
("move-cursor-to", ".docblock .example-wrap.ignore"),
66+
67+
("assert-css", (
68+
".docblock .example-wrap.ignore .tooltip",
69+
{"color": "rgb(255, 142, 0)"},
70+
)),
71+
("assert-css", (
72+
".docblock .example-wrap.ignore",
73+
{"border-left": "2px solid rgb(255, 142, 0)"},
74+
)),
75+
],
76+
)
77+
78+
call-function: ("check-colors", ("ayu"))
79+
call-function: ("check-colors", ("dark"))
80+
call-function: ("check-colors", ("light"))

0 commit comments

Comments
 (0)