From f6c728f5e75a9d165b6432a1bad1e0745a096203 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Wed, 24 Nov 2021 18:01:20 +0100 Subject: [PATCH 1/2] Update browser-ui-test version to enforce that text is displayed before checking colors --- src/ci/docker/host-x86_64/x86_64-gnu-tools/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ba4e1ca31148c..f71282a1b52d4 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 \ From e340478f5d4b9b5552a93f60a40c0b4d44b47ae7 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Wed, 24 Nov 2021 18:01:34 +0100 Subject: [PATCH 2/2] Improve tests --- src/test/rustdoc-gui/anchors.goml | 1 + src/test/rustdoc-gui/search-filter.goml | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/test/rustdoc-gui/anchors.goml b/src/test/rustdoc-gui/anchors.goml index 4ce0ed1a4b8fd..5f809f9aa4ed4 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 a098dbd9f129b..7a8f8ca5311ad 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.