Fix search engine test cases

Author: notriddle

src/librustdoc/html/static/css/rustdoc.css

@@ -219,6 +219,7 @@ a.anchor,
 .mobile-topbar h2 a,
 h1 a,
 .search-results a,
+.search-results li,
 .stab,
 .result-name i {
 	color: var(--main-color);
@@ -2070,10 +2071,10 @@ in src-script.js and main.js
 	}
 
 	/* Display an alternating layout on tablets and phones */
-	.search-results > a {
+	.search-results > li {
 		padding: 5px 0px;
 	}
-	.search-results > a > div.desc, .item-table > li > div.desc {
+	.search-results > li > div.desc, .item-table > li > div.desc {
 		padding-left: 2em;
 	}
 	.search-results .result-name {
@@ -2747,17 +2748,19 @@ Original by Dempfi (https://github.com/dempfi/ayu)
 	border-right: 1px solid #ffb44c;
 }
 
-:root[data-theme="ayu"] .search-results a:hover,
-:root[data-theme="ayu"] .search-results a:focus {
+:root[data-theme="ayu"] .search-results li:hover > a,
+:root[data-theme="ayu"] .search-results li:focus > a,
+:root[data-theme="ayu"] .search-results li > a:hover,
+:root[data-theme="ayu"] .search-results li > a:focus {
 	color: #fff !important;
 	background-color: #3c3c3c;
 }
 
-:root[data-theme="ayu"] .search-results a {
+:root[data-theme="ayu"] .search-results li > a {
 	color: #0096cf;
 }
 
-:root[data-theme="ayu"] .search-results a div.desc {
+:root[data-theme="ayu"] .search-results li div.desc {
 	color: #c5c5c5;
 }
 

tests/rustdoc-gui/search-keyboard.goml

@@ -11,18 +11,18 @@ wait-for: "#search-tabs"
 press-key: "ArrowDown"
 press-key: "ArrowDown"
 press-key: "ArrowDown"
-assert: ".search-results.active > a:focus:nth-of-type(3)"
+assert: ".search-results.active > li:nth-of-type(3) > a:focus"
 
 // Now switch to the second tab, then back to the first one, then arrow back up.
 press-key: "ArrowRight"
-assert: ".search-results.active:nth-of-type(2) > a:focus:nth-of-type(1)"
+assert: ".search-results.active:nth-of-type(2) > li:nth-of-type(1) > a:focus"
 press-key: "ArrowLeft"
-assert: ".search-results.active:nth-of-type(1) > a:focus:nth-of-type(3)"
+assert: ".search-results.active:nth-of-type(1) > li:nth-of-type(3) > a:focus"
 press-key: "ArrowUp"
-assert: ".search-results.active > a:focus:nth-of-type(2)"
+assert: ".search-results.active > li:nth-of-type(2) > a:focus"
 press-key: "ArrowUp"
-assert: ".search-results.active > a:focus:nth-of-type(1)"
+assert: ".search-results.active > li:nth-of-type(1) > a:focus"
 press-key: "ArrowUp"
 assert: ".search-input:focus"
 press-key: "ArrowDown"
-assert: ".search-results.active > a:focus:nth-of-type(1)"
+assert: ".search-results.active > li:nth-of-type(1) > a:focus"

tests/rustdoc-gui/search-reexport.goml

@@ -9,25 +9,25 @@ assert-css: ("//*[@id='reexport.TheStdReexport']", {"background-color": "rgba(0,
 write-into: (".search-input", "TheStdReexport")
 // To be SURE that the search will be run.
 press-key: 'Enter'
-wait-for: "//a[@class='result-import']"
+wait-for: "//li[@class='result-import']"
 assert-attribute: (
-    "//a[@class='result-import']",
+    "//li[@class='result-import']/a",
     {"href": "../test_docs/index.html#reexport.TheStdReexport"},
 )
-assert-text: ("a.result-import .result-name", "re-export test_docs::TheStdReexport")
-click: "//a[@class='result-import']"
+assert-text: ("li.result-import .result-name", "re-export test_docs::TheStdReexport")
+click: "//li[@class='result-import']"
 // We check that it has the background modified thanks to the focus.
 wait-for-css: ("//*[@id='reexport.TheStdReexport']", {"background-color": "#494a3d"})
 
 // We now check that the alias is working as well on the reexport.
 // To be SURE that the search will be run.
 press-key: 'Enter'
 write-into: (".search-input", "AliasForTheStdReexport")
-wait-for: "//a[@class='result-import']"
+wait-for: "//li[@class='result-import']"
 assert-text: (
-    "a.result-import .result-name",
+    "li.result-import .result-name",
     "re-export AliasForTheStdReexport - see test_docs::TheStdReexport",
 )
 // Same thing again, we click on it to ensure the background is once again set as expected.
-click: "//a[@class='result-import']"
+click: "//li[@class='result-import']"
 wait-for-css: ("//*[@id='reexport.TheStdReexport']", {"background-color": "#494a3d"})

tests/rustdoc-gui/search-result-color.goml

@@ -30,7 +30,7 @@ define-function: (
 
         // Checking the color of the bottom border.
         assert-css: (
-            ".search-results > a",
+            ".search-results > li",
             {"border-bottom-color": |bottom_border_color|}
         )
 
@@ -85,7 +85,7 @@ define-function: (
         move-cursor-to: ".search-input"
         focus: ".search-input" // To ensure the `<a>` container isn't focused or hovered.
         assert-css: (
-            "//*[@class='result-name']//*[text()='test_docs::']/ancestor::a",
+            "//*[@class='result-name']//*[text()='test_docs::']/ancestor::li/a",
             {"color": |path_color|, "background-color": "transparent"},
             ALL,
         )
@@ -97,7 +97,7 @@ define-function: (
             {"color": |hover_path_color|},
         )
         assert-css: (
-            "//*[@class='result-name']//*[text()='test_docs::']/ancestor::a",
+            "//*[@class='result-name']//*[text()='test_docs::']/ancestor::li/a",
             {"color": |hover_path_color|, "background-color": |hover_background|},
         )
     }
@@ -109,26 +109,26 @@ define-function: (
     block {
         assert-css: (".result-" + |result_kind| + " ." + |result_kind|, {"color": |color|}, ALL)
         assert-css: (
-            ".result-" + |result_kind|,
+            ".result-" + |result_kind| + ">  a",
             {"color": |entry_color|, "background-color": |background_color|},
         )
-        move-cursor-to: ".result-" + |result_kind|
+        move-cursor-to: ".result-" + |result_kind| + ">  a"
         assert-css: (
-            ".result-" + |result_kind| + ":hover",
+            ".result-" + |result_kind| + " > a:hover",
             {"color": |hover_entry_color|, "background-color": |hover_background_color|},
         )
         assert-css: (
-            ".result-" + |result_kind| + ":hover ." + |result_kind|,
+            ".result-" + |result_kind| + " > a:hover ." + |result_kind|,
             {"color": |hover_color|},
         )
         move-cursor-to: ".search-input"
-        focus: ".result-" + |result_kind|
+        focus: ".result-" + |result_kind| + " > a"
         assert-css: (
-            ".result-" + |result_kind| + ":focus",
+            ".result-" + |result_kind| + " > a:focus",
             {"color": |hover_entry_color|, "background-color": |hover_background_color|},
         )
         assert-css: (
-            ".result-" + |result_kind| + ":focus ." + |result_kind|,
+            ".result-" + |result_kind| + "> a:focus ." + |result_kind|,
             {"color": |hover_color|},
         )
         // color of the typename (struct, module, method, ...) before search results

tests/rustdoc-gui/search-result-impl-disambiguation.goml

@@ -11,11 +11,11 @@ press-key: 'Enter'
 // Waiting for the search results to appear...
 wait-for: "#search-tabs"
 // Check the disambiguated link.
-assert-count: ("a.result-method", 1)
-assert-attribute: ("a.result-method", {
+assert-count: ("li.result-method > a", 1)
+assert-attribute: ("li.result-method > a", {
     "href": "../test_docs/struct.ZyxwvutMethodDisambiguation.html#impl-ZyxwvutMethodDisambiguation/method.method_impl_disambiguation"
 })
-click: "a.result-method"
+click: "li.result-method > a"
 wait-for: "#impl-ZyxwvutMethodDisambiguation"
 assert-document-property: ({
     "URL": "struct.ZyxwvutMethodDisambiguation.html#method.method_impl_disambiguation"
@@ -31,11 +31,11 @@ press-key: 'Enter'
 // Waiting for the search results to appear...
 wait-for: "#search-tabs"
 // Check the disambiguated link.
-assert-count: ("a.result-method", 1)
-assert-attribute: ("a.result-method", {
+assert-count: ("li.result-method > a", 1)
+assert-attribute: ("li.result-method > a", {
     "href": "../test_docs/struct.ZyxwvutMethodDisambiguation.html#impl-ZyxwvutTrait-for-ZyxwvutMethodDisambiguation/method.method_impl_disambiguation"
 })
-click: "a.result-method"
+click: "li.result-method > a"
 wait-for: "#impl-ZyxwvutMethodDisambiguation"
 assert-document-property: ({
     "URL": "struct.ZyxwvutMethodDisambiguation.html#method.method_impl_disambiguation-1"

tests/rustdoc-gui/search-tab-change-title-fn-sig.goml

@@ -11,7 +11,7 @@ assert-text: ("#search-tabs > button:nth-of-type(1)", "In Names", STARTS_WITH)
 assert: "input.search-input:focus"
 // Use left-right keys
 press-key: "ArrowDown"
-assert: "#results > .search-results.active > a:nth-of-type(1):focus"
+assert: "#results > .search-results.active > li:nth-of-type(1) > a:focus"
 press-key: "ArrowRight"
 wait-for-attribute: ("#search-tabs > button:nth-of-type(2)", {"class": "selected"})
 press-key: "ArrowRight"
@@ -33,7 +33,7 @@ assert-text: ("#search-tabs > button:nth-of-type(1)", "In Function Return Types"
 assert: "input.search-input:focus"
 // Use left-right keys
 press-key: "ArrowDown"
-assert: "#results > .search-results.active > a:nth-of-type(1):focus"
+assert: "#results > .search-results.active > li:nth-of-type(1) > a:focus"
 press-key: "ArrowRight"
 wait-for-attribute: ("#search-tabs > button:nth-of-type(1)", {"class": "selected"})
 press-key: "ArrowRight"