about summary refs log tree commit diff
path: root/src/test/rustdoc-gui
diff options
context:
space:
mode:
authorYuki Okushi <huyuumi.dev+love@gmail.com>2022-12-06 12:48:50 +0900
committerGitHub <noreply@github.com>2022-12-06 12:48:50 +0900
commit532fe7b8e043115477e33ad0d97dfe9469a2c236 (patch)
treea402973ea173ff2d1ffa97bc159cd764102b08ee /src/test/rustdoc-gui
parent226202d9026b0f24b4f7aad4de398bd8378774cd (diff)
parentf7a705929aa3f40ff5c3b1e569858a7030b2e3bd (diff)
downloadrust-532fe7b8e043115477e33ad0d97dfe9469a2c236.tar.gz
rust-532fe7b8e043115477e33ad0d97dfe9469a2c236.zip
Rollup merge of #104967 - willcrichton:fix-scrape-examples, r=notriddle
Fix UI issues with Rustdoc scrape-examples feature.

A few regressions have been introduced into scrape-examples in the last few months. This commit fixes those regressions:
* Help file was being loaded from the wrong place (introduced in f9e1f6ffdf03ec33cb29e20c88fc7bcc938c7f42).
* CSS selector in JS has a typo (introduced in 14897180ae6a0506a5ad0a9f6a30ae1f75916179).
* Line numbers in scraped example code snippets are overflowing (not sure if this was ever fixed). Changing from flexbox to grid display fixed this issue.
Diffstat (limited to 'src/test/rustdoc-gui')
-rw-r--r--src/test/rustdoc-gui/scrape-examples-button-focus.goml13
-rw-r--r--src/test/rustdoc-gui/src/scrape_examples/examples/check.rs1
2 files changed, 14 insertions, 0 deletions
diff --git a/src/test/rustdoc-gui/scrape-examples-button-focus.goml b/src/test/rustdoc-gui/scrape-examples-button-focus.goml
index 2a263a87a47..a222139f1dc 100644
--- a/src/test/rustdoc-gui/scrape-examples-button-focus.goml
+++ b/src/test/rustdoc-gui/scrape-examples-button-focus.goml
@@ -1,4 +1,17 @@
 goto: "file://" + |DOC_PATH| + "/scrape_examples/fn.test.html"
+
+store-property: (initialScrollTop, ".scraped-example-list > .scraped-example pre", "scrollTop")
+focus: ".scraped-example-list > .scraped-example .next"
+press-key: "Enter"
+assert-property-false: (".scraped-example-list > .scraped-example pre", {
+	"scrollTop": |initialScrollTop|
+})
+focus: ".scraped-example-list > .scraped-example .prev"
+press-key: "Enter"
+assert-property: (".scraped-example-list > .scraped-example pre", {
+	"scrollTop": |initialScrollTop|
+})
+
 store-property: (smallOffsetHeight, ".scraped-example-list > .scraped-example pre", "offsetHeight")
 assert-property-false: (".scraped-example-list > .scraped-example pre", {
 	"scrollHeight": |smallOffsetHeight|
diff --git a/src/test/rustdoc-gui/src/scrape_examples/examples/check.rs b/src/test/rustdoc-gui/src/scrape_examples/examples/check.rs
index 3e69c6086ae..b3f682fe497 100644
--- a/src/test/rustdoc-gui/src/scrape_examples/examples/check.rs
+++ b/src/test/rustdoc-gui/src/scrape_examples/examples/check.rs
@@ -22,4 +22,5 @@ fn main() {
         println!("hello world!");
         println!("hello world!");
     }
+    scrape_examples::test();
 }