Skip to content

Commit 232dee6

Browse files
GuillaumeGomezGuillaumeGomez
committed
Update rustdoc-GUI tests
1 parent 2636f8b commit 232dee6

File tree

2 files changed

+217
-82
lines changed

2 files changed

+217
-82
lines changed

‎src/test/rustdoc-gui/anchors.goml

+7-7
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ assert-css: (".fqn .in-band a:nth-of-type(2)", {"color": "rgb(173, 68, 142)"})
1616
assert-css: (".srclink", {"color": "rgb(0, 0, 0)"})
1717
assert-css: (".srclink", {"color": "rgb(0, 0, 0)"})
1818

19-
assert-css: ("#top-doc-prose-title", {"color": "rgb(0, 0, 0)"})
19+
assert-css: ("#struct\.HeavilyDocumentedStruct\.top-doc-prose-title", {"color": "rgb(0, 0, 0)"})
2020

2121
assert-css: (".sidebar a", {"color": "rgb(0, 0, 0)"})
2222
assert-css: (".in-band a", {"color": "rgb(0, 0, 0)"})
@@ -48,19 +48,19 @@ assert-css: (".top-doc .docblock .section-header:not(:first-child)", {"margin-le
4848

4949
// Now let's check some other docblock headings...
5050
// First the impl block docs.
51-
move-cursor-to: "#title-for-struct-impl-doc"
51+
move-cursor-to: "#impl\.unknown\.title-for-struct-impl-doc"
5252
assert-css: (
53-
"#title-for-struct-impl-doc > a::before",
53+
"#impl\.unknown\.title-for-struct-impl-doc > a::before",
5454
{"left": "-25px", "padding-right": "10px"},
5555
)
56-
assert-css: ("#title-for-struct-impl-doc", {"margin-left": "0px"})
56+
assert-css: ("#impl\.unknown\.title-for-struct-impl-doc", {"margin-left": "0px"})
5757
// Now a method docs.
58-
move-cursor-to: "#title-for-struct-impl-item-doc"
58+
move-cursor-to: "#method\.do_nothing\.title-for-struct-impl-item-doc"
5959
assert-css: (
60-
"#title-for-struct-impl-item-doc > a::before",
60+
"#method\.do_nothing\.title-for-struct-impl-item-doc > a::before",
6161
{"left": "-25px", "padding-right": "10px"},
6262
)
63-
assert-css: ("#title-for-struct-impl-item-doc", {"margin-left": "0px"})
63+
assert-css: ("#method\.do_nothing\.title-for-struct-impl-item-doc", {"margin-left": "0px"})
6464

6565
// Finally, we want to ensure that if the first element of the doc block isn't a heading,
6666
// if there is a heading afterwards, it won't have the indent.

‎src/test/rustdoc-gui/headings.goml

+210-75
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,37 @@ goto: file://|DOC_PATH|/test_docs/struct.HeavilyDocumentedStruct.html
1717
assert-css: ("h1.fqn", {"font-size": "24px"})
1818
assert-css: ("h1.fqn", {"border-bottom-width": "1px"})
1919

20-
assert-css: ("h2#top-doc-prose-title", {"font-size": "20.8px"})
21-
assert-css: ("h2#top-doc-prose-title", {"border-bottom-width": "1px"})
22-
assert-css: ("h3#top-doc-prose-sub-heading", {"font-size": "18.4px"})
23-
assert-css: ("h3#top-doc-prose-sub-heading", {"border-bottom-width": "1px"})
24-
assert-css: ("h4#top-doc-prose-sub-sub-heading", {"font-size": "17.6px"})
25-
assert-css: ("h4#top-doc-prose-sub-sub-heading", {"border-bottom-width": "1px"})
20+
assert-css: (
21+
"h2#struct\.HeavilyDocumentedStruct\.top-doc-prose-title",
22+
{"font-size": "20.8px"},
23+
)
24+
assert-css: (
25+
"h2#struct\.HeavilyDocumentedStruct\.top-doc-prose-title",
26+
{"border-bottom-width": "1px"},
27+
)
28+
assert-css: (
29+
"h3#struct\.HeavilyDocumentedStruct\.top-doc-prose-sub-heading",
30+
{"font-size": "18.4px"},
31+
)
32+
assert-css: (
33+
"h3#struct\.HeavilyDocumentedStruct\.top-doc-prose-sub-heading",
34+
{"border-bottom-width": "1px"},
35+
)
36+
assert-css: (
37+
"h4#struct\.HeavilyDocumentedStruct\.top-doc-prose-sub-sub-heading",
38+
{"font-size": "17.6px"},
39+
)
40+
assert-css: (
41+
"h4#struct\.HeavilyDocumentedStruct\.top-doc-prose-sub-sub-heading",
42+
{"border-bottom-width": "1px"},
43+
)
2644

2745
assert-css: ("h2#fields", {"font-size": "22.4px"})
2846
assert-css: ("h2#fields", {"border-bottom-width": "1px"})
29-
assert-css: ("h3#title-for-field", {"font-size": "20.8px"})
30-
assert-css: ("h3#title-for-field", {"border-bottom-width": "0px"})
31-
assert-css: ("h4#sub-heading-for-field", {"font-size": "16px"})
32-
assert-css: ("h4#sub-heading-for-field", {"border-bottom-width": "0px"})
47+
assert-css: ("h3#structfield\.nothing\.title-for-field", {"font-size": "20.8px"})
48+
assert-css: ("h3#structfield\.nothing\.title-for-field", {"border-bottom-width": "0px"})
49+
assert-css: ("h4#structfield\.nothing\.sub-heading-for-field", {"font-size": "16px"})
50+
assert-css: ("h4#structfield\.nothing\.sub-heading-for-field", {"border-bottom-width": "0px"})
3351

3452
assert-css: ("h2#implementations", {"font-size": "22.4px"})
3553
assert-css: ("h2#implementations", {"border-bottom-width": "1px"})
@@ -39,53 +57,104 @@ assert-css: ("#impl > h3.code-header", {"border-bottom-width": "0px"})
3957
assert-css: ("#method\.do_nothing > h4.code-header", {"font-size": "16px"})
4058
assert-css: ("#method\.do_nothing > h4.code-header", {"border-bottom-width": "0px"})
4159

42-
assert-css: ("h4#title-for-struct-impl-doc", {"font-size": "16px"})
43-
assert-css: ("h4#title-for-struct-impl-doc", {"border-bottom-width": "0px"})
44-
assert-css: ("h5#sub-heading-for-struct-impl-doc", {"font-size": "16px"})
45-
assert-css: ("h5#sub-heading-for-struct-impl-doc", {"border-bottom-width": "0px"})
46-
assert-css: ("h6#sub-sub-heading-for-struct-impl-doc", {"font-size": "15.2px"})
47-
assert-css: ("h6#sub-sub-heading-for-struct-impl-doc", {"border-bottom-width": "0px"})
60+
assert-css: (
61+
"h4#impl\.unknown\.title-for-struct-impl-doc",
62+
{"font-size": "16px"},
63+
)
64+
assert-css: (
65+
"h4#impl\.unknown\.title-for-struct-impl-doc",
66+
{"border-bottom-width": "0px"},
67+
)
68+
assert-css: (
69+
"h5#impl\.unknown\.sub-heading-for-struct-impl-doc",
70+
{"font-size": "16px"},
71+
)
72+
assert-css: (
73+
"h5#impl\.unknown\.sub-heading-for-struct-impl-doc",
74+
{"border-bottom-width": "0px"},
75+
)
76+
assert-css: (
77+
"h6#impl\.unknown\.sub-sub-heading-for-struct-impl-doc",
78+
{"font-size": "15.2px"},
79+
)
80+
assert-css: (
81+
"h6#impl\.unknown\.sub-sub-heading-for-struct-impl-doc",
82+
{"border-bottom-width": "0px"},
83+
)
4884

49-
assert-css: ("h5#title-for-struct-impl-item-doc", {"font-size": "16px"})
50-
assert-css: ("h5#title-for-struct-impl-item-doc", {"border-bottom-width": "0px"})
51-
assert-css: ("h6#sub-heading-for-struct-impl-item-doc", {"font-size": "15.2px"})
52-
assert-css: ("h6#sub-heading-for-struct-impl-item-doc", {"border-bottom-width": "0px"})
53-
assert-css: ("h6#sub-sub-heading-for-struct-impl-item-doc", {"font-size": "15.2px"})
85+
assert-css: (
86+
"h5#method\.do_nothing\.title-for-struct-impl-item-doc",
87+
{"font-size": "16px"},
88+
)
89+
assert-css: (
90+
"h5#method\.do_nothing\.title-for-struct-impl-item-doc",
91+
{"border-bottom-width": "0px"},
92+
)
93+
assert-css: (
94+
"h6#method\.do_nothing\.sub-heading-for-struct-impl-item-doc",
95+
{"font-size": "15.2px"},
96+
)
97+
assert-css: (
98+
"h6#method\.do_nothing\.sub-heading-for-struct-impl-item-doc",
99+
{"border-bottom-width": "0px"},
100+
)
101+
assert-css: (
102+
"h6#method\.do_nothing\.sub-sub-heading-for-struct-impl-item-doc",
103+
{"font-size": "15.2px"},
104+
)
54105

55106
goto: file://|DOC_PATH|/test_docs/enum.HeavilyDocumentedEnum.html
56107

57108
assert-css: ("h1.fqn", {"font-size": "24px"})
58109
assert-css: ("h1.fqn", {"border-bottom-width": "1px"})
59110

60-
assert-css: ("h2#top-doc-prose-title", {"font-size": "20.8px"})
61-
assert-css: ("h2#top-doc-prose-title", {"border-bottom-width": "1px"})
62-
assert-css: ("h3#top-doc-prose-sub-heading", {"font-size": "18.4px"})
63-
assert-css: ("h3#top-doc-prose-sub-heading", {"border-bottom-width": "1px"})
64-
assert-css: ("h4#top-doc-prose-sub-sub-heading", {"font-size": "17.6px"})
65-
assert-css: ("h4#top-doc-prose-sub-sub-heading", {"border-bottom-width": "1px"})
111+
assert-css: (
112+
"h2#enum\.HeavilyDocumentedEnum\.top-doc-prose-title",
113+
{"font-size": "20.8px"},
114+
)
115+
assert-css: (
116+
"h2#enum\.HeavilyDocumentedEnum\.top-doc-prose-title",
117+
{"border-bottom-width": "1px"},
118+
)
119+
assert-css: (
120+
"h3#enum\.HeavilyDocumentedEnum\.top-doc-prose-sub-heading",
121+
{"font-size": "18.4px"},
122+
)
123+
assert-css: (
124+
"h3#enum\.HeavilyDocumentedEnum\.top-doc-prose-sub-heading",
125+
{"border-bottom-width": "1px"},
126+
)
127+
assert-css: (
128+
"h4#enum\.HeavilyDocumentedEnum\.top-doc-prose-sub-sub-heading",
129+
{"font-size": "17.6px"},
130+
)
131+
assert-css: (
132+
"h4#enum\.HeavilyDocumentedEnum\.top-doc-prose-sub-sub-heading",
133+
{"border-bottom-width": "1px"},
134+
)
66135

67136
assert-css: ("h2#variants", {"font-size": "22.4px"})
68137
assert-css: ("h2#variants", {"border-bottom-width": "1px"})
69138

70-
assert-css: ("h4#none-prose-title", {"font-size": "16px"})
71-
assert-css: ("h4#none-prose-title", {"border-bottom-width": "0px"})
72-
assert-css: ("h5#none-prose-sub-heading", {"font-size": "16px"})
73-
assert-css: ("h5#none-prose-sub-heading", {"border-bottom-width": "0px"})
139+
assert-css: ("h4#variant\.None\.none-prose-title", {"font-size": "16px"})
140+
assert-css: ("h4#variant\.None\.none-prose-title", {"border-bottom-width": "0px"})
141+
assert-css: ("h5#variant\.None\.none-prose-sub-heading", {"font-size": "16px"})
142+
assert-css: ("h5#variant\.None\.none-prose-sub-heading", {"border-bottom-width": "0px"})
74143

75-
assert-css: ("h4#wrapped-prose-title", {"font-size": "16px"})
76-
assert-css: ("h4#wrapped-prose-title", {"border-bottom-width": "0px"})
77-
assert-css: ("h5#wrapped-prose-sub-heading", {"font-size": "16px"})
78-
assert-css: ("h5#wrapped-prose-sub-heading", {"border-bottom-width": "0px"})
144+
assert-css: ("h4#variant\.Wrapped\.wrapped-prose-title", {"font-size": "16px"})
145+
assert-css: ("h4#variant\.Wrapped\.wrapped-prose-title", {"border-bottom-width": "0px"})
146+
assert-css: ("h5#variant\.Wrapped\.wrapped-prose-sub-heading", {"font-size": "16px"})
147+
assert-css: ("h5#variant\.Wrapped\.wrapped-prose-sub-heading", {"border-bottom-width": "0px"})
79148

80-
assert-css: ("h5#wrapped0-prose-title", {"font-size": "16px"})
81-
assert-css: ("h5#wrapped0-prose-title", {"border-bottom-width": "0px"})
82-
assert-css: ("h6#wrapped0-prose-sub-heading", {"font-size": "15.2px"})
83-
assert-css: ("h6#wrapped0-prose-sub-heading", {"border-bottom-width": "0px"})
149+
assert-css: ("h5#structfield\.0\.wrapped0-prose-title", {"font-size": "16px"})
150+
assert-css: ("h5#structfield\.0\.wrapped0-prose-title", {"border-bottom-width": "0px"})
151+
assert-css: ("h6#structfield\.0\.wrapped0-prose-sub-heading", {"font-size": "15.2px"})
152+
assert-css: ("h6#structfield\.0\.wrapped0-prose-sub-heading", {"border-bottom-width": "0px"})
84153

85-
assert-css: ("h5#structy-prose-title", {"font-size": "16px"})
86-
assert-css: ("h5#structy-prose-title", {"border-bottom-width": "0px"})
87-
assert-css: ("h6#structy-prose-sub-heading", {"font-size": "15.2px"})
88-
assert-css: ("h6#structy-prose-sub-heading", {"border-bottom-width": "0px"})
154+
assert-css: ("h5#structfield\.alpha\.structy-prose-title", {"font-size": "16px"})
155+
assert-css: ("h5#structfield\.alpha\.structy-prose-title", {"border-bottom-width": "0px"})
156+
assert-css: ("h6#structfield\.alpha\.structy-prose-sub-heading", {"font-size": "15.2px"})
157+
assert-css: ("h6#structfield\.alpha\.structy-prose-sub-heading", {"border-bottom-width": "0px"})
89158

90159
assert-css: ("h2#implementations", {"font-size": "22.4px"})
91160
assert-css: ("h2#implementations", {"border-bottom-width": "1px"})
@@ -95,19 +164,37 @@ assert-css: ("#impl > h3.code-header", {"border-bottom-width": "0px"})
95164
assert-css: ("#method\.do_nothing > h4.code-header", {"font-size": "16px"})
96165
assert-css: ("#method\.do_nothing > h4.code-header", {"border-bottom-width": "0px"})
97166

98-
assert-css: ("h4#title-for-enum-impl-doc", {"font-size": "16px"})
99-
assert-css: ("h4#title-for-enum-impl-doc", {"border-bottom-width": "0px"})
100-
assert-css: ("h5#sub-heading-for-enum-impl-doc", {"font-size": "16px"})
101-
assert-css: ("h5#sub-heading-for-enum-impl-doc", {"border-bottom-width": "0px"})
102-
assert-css: ("h6#sub-sub-heading-for-enum-impl-doc", {"font-size": "15.2px"})
103-
assert-css: ("h6#sub-sub-heading-for-enum-impl-doc", {"border-bottom-width": "0px"})
167+
assert-css: ("h4#impl\.unknown\.title-for-enum-impl-doc", {"font-size": "16px"})
168+
assert-css: ("h4#impl\.unknown\.title-for-enum-impl-doc", {"border-bottom-width": "0px"})
169+
assert-css: ("h5#impl\.unknown\.sub-heading-for-enum-impl-doc", {"font-size": "16px"})
170+
assert-css: ("h5#impl\.unknown\.sub-heading-for-enum-impl-doc", {"border-bottom-width": "0px"})
171+
assert-css: ("h6#impl\.unknown\.sub-sub-heading-for-enum-impl-doc", {"font-size": "15.2px"})
172+
assert-css: ("h6#impl\.unknown\.sub-sub-heading-for-enum-impl-doc", {"border-bottom-width": "0px"})
104173

105-
assert-css: ("h5#title-for-enum-impl-item-doc", {"font-size": "16px"})
106-
assert-css: ("h5#title-for-enum-impl-item-doc", {"border-bottom-width": "0px"})
107-
assert-css: ("h6#sub-heading-for-enum-impl-item-doc", {"font-size": "15.2px"})
108-
assert-css: ("h6#sub-heading-for-enum-impl-item-doc", {"border-bottom-width": "0px"})
109-
assert-css: ("h6#sub-sub-heading-for-enum-impl-item-doc", {"font-size": "15.2px"})
110-
assert-css: ("h6#sub-sub-heading-for-enum-impl-item-doc", {"border-bottom-width": "0px"})
174+
assert-css: (
175+
"h5#method\.do_nothing\.title-for-enum-impl-item-doc",
176+
{"font-size": "16px"},
177+
)
178+
assert-css: (
179+
"h5#method\.do_nothing\.title-for-enum-impl-item-doc",
180+
{"border-bottom-width": "0px"},
181+
)
182+
assert-css: (
183+
"h6#method\.do_nothing\.sub-heading-for-enum-impl-item-doc",
184+
{"font-size": "15.2px"},
185+
)
186+
assert-css: (
187+
"h6#method\.do_nothing\.sub-heading-for-enum-impl-item-doc",
188+
{"border-bottom-width": "0px"},
189+
)
190+
assert-css: (
191+
"h6#method\.do_nothing\.sub-sub-heading-for-enum-impl-item-doc",
192+
{"font-size": "15.2px"},
193+
)
194+
assert-css: (
195+
"h6#method\.do_nothing\.sub-sub-heading-for-enum-impl-item-doc",
196+
{"border-bottom-width": "0px"},
197+
)
111198

112199
assert-text: (".sidebar .others h3", "Modules")
113200
assert-css: (".sidebar .others h3", {"border-bottom-width": "1px"}, ALL)
@@ -117,40 +204,88 @@ goto: file://|DOC_PATH|/test_docs/union.HeavilyDocumentedUnion.html
117204
assert-css: ("h1.fqn", {"font-size": "24px"})
118205
assert-css: ("h1.fqn", {"border-bottom-width": "1px"})
119206

120-
assert-css: ("h2#top-doc-prose-title", {"font-size": "20.8px"})
121-
assert-css: ("h2#top-doc-prose-title", {"border-bottom-width": "1px"})
122-
assert-css: ("h3#top-doc-prose-sub-heading", {"font-size": "18.4px"})
123-
assert-css: ("h3#top-doc-prose-sub-heading", {"border-bottom-width": "1px"})
207+
assert-css: (
208+
"h2#union\.HeavilyDocumentedUnion\.top-doc-prose-title",
209+
{"font-size": "20.8px"},
210+
)
211+
assert-css: (
212+
"h2#union\.HeavilyDocumentedUnion\.top-doc-prose-title",
213+
{"border-bottom-width": "1px"},
214+
)
215+
assert-css: (
216+
"h3#union\.HeavilyDocumentedUnion\.top-doc-prose-sub-heading",
217+
{"font-size": "18.4px"},
218+
)
219+
assert-css: (
220+
"h3#union\.HeavilyDocumentedUnion\.top-doc-prose-sub-heading",
221+
{"border-bottom-width": "1px"},
222+
)
124223

125224
assert-css: ("h2#fields", {"font-size": "22.4px"})
126225
assert-css: ("h2#fields", {"border-bottom-width": "1px"})
127226

128-
assert-css: ("h3#title-for-union-variant", {"font-size": "20.8px"})
129-
assert-css: ("h3#title-for-union-variant", {"border-bottom-width": "0px"})
130-
assert-css: ("h4#sub-heading-for-union-variant", {"font-size": "16px"})
131-
assert-css: ("h4#sub-heading-for-union-variant", {"border-bottom-width": "0px"})
227+
assert-css: (
228+
"h3#structfield\.nothing\.title-for-union-variant",
229+
{"font-size": "20.8px"},
230+
)
231+
assert-css: (
232+
"h3#structfield\.nothing\.title-for-union-variant",
233+
{"border-bottom-width": "0px"},
234+
)
235+
assert-css: (
236+
"h4#structfield\.nothing\.sub-heading-for-union-variant",
237+
{"font-size": "16px"},
238+
)
239+
assert-css: (
240+
"h4#structfield\.nothing\.sub-heading-for-union-variant",
241+
{"border-bottom-width": "0px"},
242+
)
132243

133244
assert-css: ("h2#implementations", {"font-size": "22.4px"})
134245
assert-css: ("h2#implementations", {"border-bottom-width": "1px"})
135246

136247
assert-css: ("#impl > h3.code-header", {"font-size": "17.6px"})
137248
assert-css: ("#impl > h3.code-header", {"border-bottom-width": "0px"})
138-
assert-css: ("h4#title-for-union-impl-doc", {"font-size": "16px"})
139-
assert-css: ("h4#title-for-union-impl-doc", {"border-bottom-width": "0px"})
140-
assert-css: ("h5#sub-heading-for-union-impl-doc", {"font-size": "16px"})
141-
assert-css: ("h5#sub-heading-for-union-impl-doc", {"border-bottom-width": "0px"})
249+
assert-css: ("h4#impl\.unknown\.title-for-union-impl-doc", {"font-size": "16px"})
250+
assert-css: ("h4#impl\.unknown\.title-for-union-impl-doc", {"border-bottom-width": "0px"})
251+
assert-css: ("h5#impl\.unknown\.sub-heading-for-union-impl-doc", {"font-size": "16px"})
252+
assert-css: ("h5#impl\.unknown\.sub-heading-for-union-impl-doc", {"border-bottom-width": "0px"})
142253

143-
assert-css: ("h5#title-for-union-impl-item-doc", {"font-size": "16px"})
144-
assert-css: ("h5#title-for-union-impl-item-doc", {"border-bottom-width": "0px"})
145-
assert-css: ("h6#sub-heading-for-union-impl-item-doc", {"font-size": "15.2px"})
146-
assert-css: ("h6#sub-heading-for-union-impl-item-doc", {"border-bottom-width": "0px"})
254+
assert-css: (
255+
"h5#method\.do_nothing\.title-for-union-impl-item-doc",
256+
{"font-size": "16px"},
257+
)
258+
assert-css: (
259+
"h5#method\.do_nothing\.title-for-union-impl-item-doc",
260+
{"border-bottom-width": "0px"},
261+
)
262+
assert-css: (
263+
"h6#method\.do_nothing\.sub-heading-for-union-impl-item-doc",
264+
{"font-size": "15.2px"},
265+
)
266+
assert-css: (
267+
"h6#method\.do_nothing\.sub-heading-for-union-impl-item-doc",
268+
{"border-bottom-width": "0px"},
269+
)
147270

148271
goto: file://|DOC_PATH|/test_docs/macro.heavily_documented_macro.html
149272

150273
assert-css: ("h1.fqn", {"font-size": "24px"})
151274
assert-css: ("h1.fqn", {"border-bottom-width": "1px"})
152275

153-
assert-css: ("h2#top-doc-prose-title", {"font-size": "20.8px"})
154-
assert-css: ("h2#top-doc-prose-title", {"border-bottom-width": "1px"})
155-
assert-css: ("h3#top-doc-prose-sub-heading", {"font-size": "18.4px"})
156-
assert-css: ("h3#top-doc-prose-sub-heading", {"border-bottom-width": "1px"})
276+
assert-css: (
277+
"h2#macro\.heavily_documented_macro\.top-doc-prose-title",
278+
{"font-size": "20.8px"},
279+
)
280+
assert-css: (
281+
"h2#macro\.heavily_documented_macro\.top-doc-prose-title",
282+
{"border-bottom-width": "1px"},
283+
)
284+
assert-css: (
285+
"h3#macro\.heavily_documented_macro\.top-doc-prose-sub-heading",
286+
{"font-size": "18.4px"},
287+
)
288+
assert-css: (
289+
"h3#macro\.heavily_documented_macro\.top-doc-prose-sub-heading",
290+
{"border-bottom-width": "1px"},
291+
)

0 commit comments

Comments
 (0)