Skip to content

Commit a7836bf

Browse files
committed
Auto merge of #91181 - GuillaumeGomez:improve-rustdoc-gui-ci, r=jsha
Improve rustdoc-gui CI As commented [here](#91179 (comment)): When the text isn't displayed, the color returned by puppeteer is always `rgba(0,0,0,0)`, which is definitely not the right value. To prevent this error from happening again, `browser-ui-test` will now fail if a CSS color check is run when the text isn't displayed. Either this PR or #91179 is merged first, they'll conflict because I made changes to the same test file. cc `@jyn514` r? `@jsha`
2 parents 9adfd9d + e340478 commit a7836bf

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

src/ci/docker/host-x86_64/x86_64-gnu-tools/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ ENV PATH="/node-v14.4.0-linux-x64/bin:${PATH}"
7272
# https://github.com/puppeteer/puppeteer/issues/375
7373
#
7474
# We also specify the version in case we need to update it to go around cache limitations.
75-
RUN npm install -g browser-ui-test@0.4.5 --unsafe-perm=true
75+
RUN npm install -g browser-ui-test@0.5.0 --unsafe-perm=true
7676

7777
ENV RUST_CONFIGURE_ARGS \
7878
--build=x86_64-unknown-linux-gnu \

src/test/rustdoc-gui/anchors.goml

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// This test is to ensure that the anchors (`§`) have the expected color.
22
goto: file://|DOC_PATH|/test_docs/struct.HeavilyDocumentedStruct.html
3+
show-text: true
34

45
// This is needed to ensure that the text color is computed.
56
show-text: true

src/test/rustdoc-gui/search-filter.goml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
goto: file://|DOC_PATH|/test_docs/index.html
2+
show-text: true
23
write: (".search-input", "test")
34
// Waiting for the search results to appear...
45
wait-for: "#titles"
56
assert-text: ("#results .externcrate", "test_docs")
6-
text: (".search-input", "")
7+
8+
goto: file://|DOC_PATH|/test_docs/index.html
79
// We now want to change the crate filter.
810
click: "#crate-search"
911
// We select "lib2" option then press enter to change the filter.

0 commit comments

Comments
 (0)