diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-10-14 00:45:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-14 00:45:18 +0200 |
| commit | 5f156cc57bc192302acada61229dca907ea2bfe6 (patch) | |
| tree | e378b1f7ed277db4185d2931532fb19faa35a3bf /src | |
| parent | 059bbf7ea945d5c6dc2ca5af5abd3eb5c6677ece (diff) | |
| parent | 16cfd6cc8446215ec31dfd2e79a61e68fc8f276c (diff) | |
| download | rust-5f156cc57bc192302acada61229dca907ea2bfe6.tar.gz rust-5f156cc57bc192302acada61229dca907ea2bfe6.zip | |
Rollup merge of #103011 - GuillaumeGomez:improve-unsafe-fn-gui-test, r=notriddle
Improve rustdoc `unsafe-fn` GUI test r? ``@notriddle``
Diffstat (limited to 'src')
| -rw-r--r-- | src/ci/docker/host-x86_64/x86_64-gnu-tools/browser-ui-test.version | 2 | ||||
| -rw-r--r-- | src/test/rustdoc-gui/unsafe-fn.goml | 53 |
2 files changed, 23 insertions, 32 deletions
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 e96a87111cb..d61567cd134 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.12.2 \ No newline at end of file +0.12.3 \ No newline at end of file diff --git a/src/test/rustdoc-gui/unsafe-fn.goml b/src/test/rustdoc-gui/unsafe-fn.goml index 94f128db72e..5e43b85fce0 100644 --- a/src/test/rustdoc-gui/unsafe-fn.goml +++ b/src/test/rustdoc-gui/unsafe-fn.goml @@ -1,37 +1,28 @@ +// Check position and color of the `<sup>` for unsafe elements. goto: "file://" + |DOC_PATH| + "/test_docs/index.html" - -compare-elements-property: ( - "//a[@title='test_docs::safe_fn fn']/..", - "//a[@title='test_docs::unsafe_fn fn']/..", - ["clientHeight"] -) - // If the text isn't displayed, the browser doesn't compute color style correctly... show-text: true -// Set the theme to dark. -local-storage: {"rustdoc-theme": "dark", "rustdoc-preferred-dark-theme": "dark", "rustdoc-use-system-theme": "false"} -// We reload the page so the local storage settings are being used. -reload: - -assert-css: (".item-left sup", { - "color": "rgb(221, 221, 221)" -}) - -// Set the theme to ayu. -local-storage: {"rustdoc-theme": "ayu", "rustdoc-preferred-dark-theme": "ayu", "rustdoc-use-system-theme": "false"} -// We reload the page so the local storage settings are being used. -reload: - -assert-css: (".item-left sup", { - "color": "rgb(197, 197, 197)" -}) +compare-elements-property: ( + "//a[@title='test_docs::safe_fn fn']/..", + "//a[@title='test_docs::unsafe_fn fn']/..", + ["clientHeight"] +) -// Set the theme to light. -local-storage: {"rustdoc-theme": "light", "rustdoc-preferred-dark-theme": "light", "rustdoc-use-system-theme": "false"} -// We reload the page so the local storage settings are being used. -reload: +define-function: ( + "sup-check", + // `theme` is the theme being tested. + // `color` is the expected color of the `<sup>` element. + (theme, color), + [ + // Set the theme. + ("local-storage", {"rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false"}), + // We reload the page so the local storage settings are being used. + ("reload"), + ("assert-css", (".item-left sup", {"color": |color|})), + ], +) -assert-css: (".item-left sup", { - "color": "rgb(0, 0, 0)" -}) +call-function: ("sup-check", ("dark", "rgb(221, 221, 221)")) +call-function: ("sup-check", ("ayu", "rgb(197, 197, 197)")) +call-function: ("sup-check", ("light", "rgb(0, 0, 0)")) |
