Skip to content

Commit d10af08

Browse files
Rollup merge of #86773 - dns2utf8:rustdoc_enable_near_tests, r=GuillaumeGomez
Enable the tests developed with #86594 This PR requires `[email protected]`. Can we centralise the version number somehow and maybe automatically install it when tests are run? r? `@GuillaumeGomez`
2 parents 881b0fe + dbfbb76 commit d10af08

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/ci/docker/host-x86_64/x86_64-gnu-tools/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ ENV PATH="/node-v14.4.0-linux-x64/bin:${PATH}"
7272
# https://github.com/puppeteer/puppeteer/issues/375
7373
#
7474
# We also specify the version in case we need to update it to go around cache limitations.
75-
RUN npm install -g [email protected].0 --unsafe-perm=true
75+
RUN npm install -g [email protected].1 --unsafe-perm=true
7676

7777
ENV RUST_CONFIGURE_ARGS \
7878
--build=x86_64-unknown-linux-gnu \

src/test/rustdoc-gui/label-next-to-symbol.goml

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,24 @@ assert-css: (".item-table .item-left .stab.portability", { "background-color": "
1313

1414
// table like view
1515
assert-css: (".item-right.docblock-short", { "padding-left": "0px" })
16-
// Requires new function: https://github.com/GuillaumeGomez/browser-UI-test/pull/202
17-
//compare-elements-position-near: ("//*[@class='item-left module-item']//a[text()='replaced_function']", ".item-left .stab.deprecated", ("y"))
16+
compare-elements-position-near: ("//*[@class='item-left module-item']//a[text()='replaced_function']", ".item-left .stab.deprecated", {"y": 2})
1817
compare-elements-position: (".item-left .stab.deprecated", ".item-left .stab.portability", ("y"))
1918

2019
// Ensure no wrap
21-
//compare-elements-position: ("//*[@class='item-left module-item']//a[text()='replaced_function']", "//*[@class='item-right docblock-short']//p[text()='a thing with a label']", ("y"))
20+
compare-elements-position-near: ("//*[@class='item-left module-item']//a[text()='replaced_function']", "//*[@class='item-right docblock-short']//p[text()='a thing with a label']", {"y": 2})
21+
// compare parent elements
2222
compare-elements-position: ("//*[@class='item-left module-item']//a[text()='replaced_function']/..", "//*[@class='item-right docblock-short']//p[text()='a thing with a label']/..", ("y"))
2323

2424

2525
// Mobile view
2626
size: (600, 600)
2727
// staggered layout with 2em spacing
2828
assert-css: (".item-right.docblock-short", { "padding-left": "32px" })
29-
// Requires new function: https://github.com/GuillaumeGomez/browser-UI-test/pull/202
30-
//compare-elements-position-near: ("//*[@class='item-left module-item']//a[text()='replaced_function']", ".item-left .stab.deprecated", ("y"))
29+
compare-elements-position-near: ("//*[@class='item-left module-item']//a[text()='replaced_function']", ".item-left .stab.deprecated", {"y": 1})
3130
compare-elements-position: (".item-left .stab.deprecated", ".item-left .stab.portability", ("y"))
3231

3332
// Ensure wrap
34-
compare-elements-position-false: ("//*[@class='item-left module-item']//a[text()='replaced_function']", "//*[@class='item-right docblock-short']//p[text()='a thing with a label']", ("y"))
33+
compare-elements-position-near-false: ("//*[@class='item-left module-item']//a[text()='replaced_function']", "//*[@class='item-right docblock-short']//p[text()='a thing with a label']", {"y": 12})
34+
// compare parent elements
3535
compare-elements-position-false: ("//*[@class='item-left module-item']//a[text()='replaced_function']/..", "//*[@class='item-right docblock-short']//p[text()='a thing with a label']/..", ("y"))
3636
compare-elements-position-false: (".item-left .stab.deprecated", "//*[@class='item-right docblock-short']//p[text()='a thing with a label']", ("y"))

0 commit comments

Comments
 (0)