From e170d8789750d6a27f41a3cfc2d124209c08f382 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Mon, 16 May 2022 21:15:19 +0200 Subject: [PATCH 1/5] Update browser-ui-test version to 0.9.2 --- .../docker/host-x86_64/x86_64-gnu-tools/browser-ui-test.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ci/docker/host-x86_64/x86_64-gnu-tools/browser-ui-test.version b/src/ci/docker/host-x86_64/x86_64-gnu-tools/browser-ui-test.version index f514a2f0bd053..f76f9131742ee 100644 --- a/src/ci/docker/host-x86_64/x86_64-gnu-tools/browser-ui-test.version +++ b/src/ci/docker/host-x86_64/x86_64-gnu-tools/browser-ui-test.version @@ -1 +1 @@ -0.9.1 \ No newline at end of file +0.9.2 \ No newline at end of file From d765b73a01870b45e2179e8a55ce1a406d8de248 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Tue, 17 May 2022 13:15:49 +0200 Subject: [PATCH 2/5] Fix duplicated "in" in the search result text --- src/librustdoc/html/static/js/search.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/librustdoc/html/static/js/search.js b/src/librustdoc/html/static/js/search.js index 0be70d77d06e4..40042f06a347b 100644 --- a/src/librustdoc/html/static/js/search.js +++ b/src/librustdoc/html/static/js/search.js @@ -1740,7 +1740,7 @@ window.initSearch = rawSearchIndex => { let output = "
" + `

Results for ${escape(results.query.userQuery)}` + - `${typeFilter}

in ${crates}
`; + `${typeFilter}${crates}`; if (results.query.error !== null) { output += `

Query parser error: "${results.query.error}".

`; output += "
" + From 56010449035eef9d80b8f76ee77b20b0a9d92e33 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Tue, 17 May 2022 13:28:22 +0200 Subject: [PATCH 3/5] Add GUI test for search result "title" --- src/test/rustdoc-gui/search-filter.goml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/test/rustdoc-gui/search-filter.goml b/src/test/rustdoc-gui/search-filter.goml index aca8390dfb3d5..63fb860d77a83 100644 --- a/src/test/rustdoc-gui/search-filter.goml +++ b/src/test/rustdoc-gui/search-filter.goml @@ -45,3 +45,6 @@ goto: file://|DOC_PATH|/test_docs/index.html?search=test&filter-crate=lib2 wait-for: "#crate-search" assert-property: ("#crate-search", {"value": "lib2"}) assert-false: "#results .externcrate" + +// Checking that the text for the "title" is correct (the "All" comes from the "`... */ + border-color: #424c57 !important; } .search-input { diff --git a/src/librustdoc/html/static/css/themes/dark.css b/src/librustdoc/html/static/css/themes/dark.css index 1525163f50281..4957f25bcf358 100644 --- a/src/librustdoc/html/static/css/themes/dark.css +++ b/src/librustdoc/html/static/css/themes/dark.css @@ -217,7 +217,8 @@ details.undocumented > summary::before { #crate-search, .search-input { color: #111; background-color: #f0f0f0; - border-color: #000; + /* Without the `!important`, the border-color is ignored for ``... */ + border-color: #e0e0e0 !important; } .search-input:focus { From 440bbce36d649a973a323ed5fd431e36f124fb59 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Tue, 17 May 2022 14:45:23 +0200 Subject: [PATCH 5/5] Add GUI test for search crate filter select CSS properties --- src/test/rustdoc-gui/search-filter.goml | 31 +++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/src/test/rustdoc-gui/search-filter.goml b/src/test/rustdoc-gui/search-filter.goml index 63fb860d77a83..d0b3175114cce 100644 --- a/src/test/rustdoc-gui/search-filter.goml +++ b/src/test/rustdoc-gui/search-filter.goml @@ -48,3 +48,34 @@ assert-false: "#results .externcrate" // Checking that the text for the "title" is correct (the "All" comes from the "