diff options
| author | bors <bors@rust-lang.org> | 2021-11-26 06:44:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-11-26 06:44:00 +0000 |
| commit | a7836bf885e70aaf1a2e0d4669406b183a79acaa (patch) | |
| tree | 14ed3eef0a3ffcf0e0b8bcd41a29f2d256cd6db1 /src | |
| parent | 9adfd9db78b274bd710a94d7778cbd5db11b9241 (diff) | |
| parent | e340478f5d4b9b5552a93f60a40c0b4d44b47ae7 (diff) | |
| download | rust-a7836bf885e70aaf1a2e0d4669406b183a79acaa.tar.gz rust-a7836bf885e70aaf1a2e0d4669406b183a79acaa.zip | |
Auto merge of #91181 - GuillaumeGomez:improve-rustdoc-gui-ci, r=jsha
Improve rustdoc-gui CI As commented [here](https://github.com/rust-lang/rust/pull/91179#discussion_r756023009): 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`
Diffstat (limited to 'src')
| -rw-r--r-- | src/ci/docker/host-x86_64/x86_64-gnu-tools/Dockerfile | 2 | ||||
| -rw-r--r-- | src/test/rustdoc-gui/anchors.goml | 1 | ||||
| -rw-r--r-- | src/test/rustdoc-gui/search-filter.goml | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/ci/docker/host-x86_64/x86_64-gnu-tools/Dockerfile b/src/ci/docker/host-x86_64/x86_64-gnu-tools/Dockerfile index ba4e1ca3114..f71282a1b52 100644 --- a/src/ci/docker/host-x86_64/x86_64-gnu-tools/Dockerfile +++ b/src/ci/docker/host-x86_64/x86_64-gnu-tools/Dockerfile @@ -72,7 +72,7 @@ ENV PATH="/node-v14.4.0-linux-x64/bin:${PATH}" # https://github.com/puppeteer/puppeteer/issues/375 # # We also specify the version in case we need to update it to go around cache limitations. -RUN npm install -g browser-ui-test@0.4.5 --unsafe-perm=true +RUN npm install -g browser-ui-test@0.5.0 --unsafe-perm=true ENV RUST_CONFIGURE_ARGS \ --build=x86_64-unknown-linux-gnu \ diff --git a/src/test/rustdoc-gui/anchors.goml b/src/test/rustdoc-gui/anchors.goml index 4ce0ed1a4b8..5f809f9aa4e 100644 --- a/src/test/rustdoc-gui/anchors.goml +++ b/src/test/rustdoc-gui/anchors.goml @@ -1,5 +1,6 @@ // This test is to ensure that the anchors (`ยง`) have the expected color. goto: file://|DOC_PATH|/test_docs/struct.HeavilyDocumentedStruct.html +show-text: true // This is needed to ensure that the text color is computed. show-text: true diff --git a/src/test/rustdoc-gui/search-filter.goml b/src/test/rustdoc-gui/search-filter.goml index a098dbd9f12..7a8f8ca5311 100644 --- a/src/test/rustdoc-gui/search-filter.goml +++ b/src/test/rustdoc-gui/search-filter.goml @@ -1,9 +1,11 @@ goto: file://|DOC_PATH|/test_docs/index.html +show-text: true write: (".search-input", "test") // Waiting for the search results to appear... wait-for: "#titles" assert-text: ("#results .externcrate", "test_docs") -text: (".search-input", "") + +goto: file://|DOC_PATH|/test_docs/index.html // We now want to change the crate filter. click: "#crate-search" // We select "lib2" option then press enter to change the filter. |