diff options
| author | bors <bors@rust-lang.org> | 2022-09-23 06:52:39 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-09-23 06:52:39 +0000 |
| commit | bc4d574ff2ffcfe76db36116cc4f193384065985 (patch) | |
| tree | bdaf7d8c895a80f9c18b04930238c970c963422a /src/test | |
| parent | 77e7e88567691068f5fba288618023368882d60b (diff) | |
| parent | dfeff64550444e7840c21de36f4ffea6d9647b90 (diff) | |
| download | rust-bc4d574ff2ffcfe76db36116cc4f193384065985.tar.gz rust-bc4d574ff2ffcfe76db36116cc4f193384065985.zip | |
Auto merge of #102150 - matthiaskrgr:rollup-6xmd8f3, r=matthiaskrgr
Rollup of 10 pull requests
Successful merges:
- #102113 (OpTy: fix a method taking self rather than &self)
- #102118 (rustdoc: clean up line numbers on code examples)
- #102123 (Add note to clippy::non_expressive_names doc)
- #102125 (rustdoc: remove no-op CSS `.content .item-info { position: relative }`)
- #102127 (Use appropriate variable names)
- #102128 (Const unification is already infallible, remove the error handling logic)
- #102133 (Use valtrees for comparison)
- #102135 (Improve some AllTypes fields name)
- #102144 (Extend const_convert with const {FormResidual, Try} for ControlFlow.)
- #102147 (rustdoc: remove no-op CSS `.location:empty { border: none }`)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/rustdoc-gui/docblock-code-block-line-number.goml | 17 | ||||
| -rw-r--r-- | src/test/rustdoc-gui/source-anchor-scroll.goml | 2 |
2 files changed, 18 insertions, 1 deletions
diff --git a/src/test/rustdoc-gui/docblock-code-block-line-number.goml b/src/test/rustdoc-gui/docblock-code-block-line-number.goml index baf9651c40d..ebfffbce715 100644 --- a/src/test/rustdoc-gui/docblock-code-block-line-number.goml +++ b/src/test/rustdoc-gui/docblock-code-block-line-number.goml @@ -20,3 +20,20 @@ assert-css: ("pre.line-number", { }) // The first code block has two lines so let's check its `<pre>` elements lists both of them. assert-text: ("pre.line-number", "1\n2") + +// Now, try changing the setting dynamically. We'll turn it off, using the settings menu, +// and make sure it goes away. + +// First, open the settings menu. +click: "#settings-menu" +wait-for: "#settings" +assert-css: ("#settings", {"display": "block"}) + +// Then, click the toggle button. +click: "input#line-numbers + .slider" +wait-for: 100 // wait-for-false does not exist +assert-false: "pre.line-number" + +// Finally, turn it on again. +click: "input#line-numbers + .slider" +wait-for: "pre.line-number" diff --git a/src/test/rustdoc-gui/source-anchor-scroll.goml b/src/test/rustdoc-gui/source-anchor-scroll.goml index 4e51c8dcac0..47e40aa8e3b 100644 --- a/src/test/rustdoc-gui/source-anchor-scroll.goml +++ b/src/test/rustdoc-gui/source-anchor-scroll.goml @@ -10,7 +10,7 @@ assert-property: ("html", {"scrollTop": "0"}) click: '//a[text() = "barbar"]' assert-property: ("html", {"scrollTop": "125"}) click: '//a[text() = "bar"]' -assert-property: ("html", {"scrollTop": "166"}) +assert-property: ("html", {"scrollTop": "156"}) click: '//a[text() = "sub_fn"]' assert-property: ("html", {"scrollTop": "53"}) |