Skip to content

Commit 91b9a92

Browse files
authored
Rollup merge of #102789 - GuillaumeGomez:update-browser-ui-test-version, r=notriddle
Update browser UI test version It added the possibility to concatenate strings and numbers and updated the `goto` command so it doesn't stand on its own anymore. r? ````@notriddle````
2 parents 140fe04 + 8d19d53 commit 91b9a92

File tree

78 files changed

+150
-150
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+150
-150
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.11.0
1+
0.12.0

src/test/rustdoc-gui/anchor-navigable.goml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// anchor and the `impl Foo`. If there were a gap, this would cause an annoying
55
// problem: you hover `impl Foo` to see the anchor, then when you move your
66
// mouse to the left, the anchor disappears before you reach it.
7-
goto: file://|DOC_PATH|/test_docs/struct.Foo.html
7+
goto: "file://" + |DOC_PATH| + "/test_docs/struct.Foo.html"
88
// We check that ".item-info" is bigger than its content.
99
move-cursor-to: ".impl"
1010
assert-property: (".impl > a.anchor", {"offsetWidth": "8"})

src/test/rustdoc-gui/anchors.goml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// This test is to ensure that the anchors (`§`) have the expected color and position.
2-
goto: file://|DOC_PATH|/staged_api/struct.Foo.html
2+
goto: "file://" + |DOC_PATH| + "/staged_api/struct.Foo.html"
33

44
// This is needed to ensure that the text color is computed.
55
show-text: true
@@ -36,7 +36,7 @@ assert-css: (
3636
{"color": "rgb(56, 115, 173)", "text-decoration": "none solid rgb(56, 115, 173)"},
3737
)
3838

39-
goto: file://|DOC_PATH|/test_docs/struct.HeavilyDocumentedStruct.html
39+
goto: "file://" + |DOC_PATH| + "/test_docs/struct.HeavilyDocumentedStruct.html"
4040

4141
assert-css: ("#top-doc-prose-title", {"color": "rgb(0, 0, 0)"})
4242

@@ -57,7 +57,7 @@ assert-css: ("#title-for-struct-impl-item-doc", {"margin-left": "0px"})
5757
// We do the same checks with the dark theme now.
5858
//
5959
local-storage: {"rustdoc-theme": "dark", "rustdoc-use-system-theme": "false"}
60-
goto: file://|DOC_PATH|/staged_api/struct.Foo.html
60+
goto: "file://" + |DOC_PATH| + "/staged_api/struct.Foo.html"
6161

6262
assert-css: ("#toggle-all-docs", {"color": "rgb(221, 221, 221)"})
6363
assert-css: (".fqn a:nth-of-type(1)", {"color": "rgb(221, 221, 221)"})
@@ -86,7 +86,7 @@ assert-css: (
8686
{"color": "rgb(210, 153, 29)", "text-decoration": "none solid rgb(210, 153, 29)"},
8787
)
8888

89-
goto: file://|DOC_PATH|/test_docs/struct.HeavilyDocumentedStruct.html
89+
goto: "file://" + |DOC_PATH| + "/test_docs/struct.HeavilyDocumentedStruct.html"
9090

9191
assert-css: ("#top-doc-prose-title", {"color": "rgb(221, 221, 221)"})
9292

@@ -107,7 +107,7 @@ assert-css: ("#title-for-struct-impl-item-doc", {"margin-left": "0px"})
107107
// We do the same checks with the ayu theme now.
108108
//
109109
local-storage: {"rustdoc-theme": "ayu", "rustdoc-use-system-theme": "false"}
110-
goto: file://|DOC_PATH|/staged_api/struct.Foo.html
110+
goto: "file://" + |DOC_PATH| + "/staged_api/struct.Foo.html"
111111

112112
assert-css: ("#toggle-all-docs", {"color": "rgb(197, 197, 197)"})
113113
assert-css: (".fqn a:nth-of-type(1)", {"color": "rgb(255, 255, 255)"})
@@ -136,7 +136,7 @@ assert-css: (
136136
{"color": "rgb(57, 175, 215)", "text-decoration": "none solid rgb(57, 175, 215)"},
137137
)
138138

139-
goto: file://|DOC_PATH|/test_docs/struct.HeavilyDocumentedStruct.html
139+
goto: "file://" + |DOC_PATH| + "/test_docs/struct.HeavilyDocumentedStruct.html"
140140

141141
assert-css: ("#top-doc-prose-title", {"color": "rgb(255, 255, 255)"})
142142

src/test/rustdoc-gui/auto-hide-trait-implementations.goml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Checks that the setting "auto hide trait implementations" is working as expected.
2-
goto: file://|DOC_PATH|/test_docs/struct.Foo.html
2+
goto: "file://" + |DOC_PATH| + "/test_docs/struct.Foo.html"
33

44
// By default, the trait implementations are not collapsed.
55
assert-attribute: ("#trait-implementations-list > details", {"open": ""}, ALL)

src/test/rustdoc-gui/basic-code.goml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
goto: file://|DOC_PATH|/test_docs/index.html
1+
goto: "file://" + |DOC_PATH| + "/test_docs/index.html"
22
click: ".srclink"
33
assert-count: (".src-line-numbers", 1)

src/test/rustdoc-gui/basic.goml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
goto: file://|DOC_PATH|/test_docs/index.html
1+
goto: "file://" + |DOC_PATH| + "/test_docs/index.html"
22
assert: ("#functions")
3-
goto: ./struct.Foo.html
3+
goto: "./struct.Foo.html"
44
assert: ("div.item-decl")

src/test/rustdoc-gui/check-code-blocks-margin.goml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// This test ensures that the docblock elements have the appropriate left margin.
2-
goto: file://|DOC_PATH|/test_docs/fn.foo.html
2+
goto: "file://" + |DOC_PATH| + "/test_docs/fn.foo.html"
33
// The top docblock elements shouldn't have left margin...
44
assert-css: ("#main-content .item-decl", {"margin-left": "0px"})
55
// ... but all the others should!

src/test/rustdoc-gui/check-stab-in-docblock.goml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// This test checks that using `.stab` attributes in `.docblock` elements doesn't
22
// create scrollable paragraphs.
3-
goto: file://|DOC_PATH|/test_docs/index.html
3+
goto: "file://" + |DOC_PATH| + "/test_docs/index.html"
44
// Needs the text to be display to check for scrollable content.
55
show-text: true
66
size: (786, 600)

src/test/rustdoc-gui/check_info_sign_position.goml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// This test checks the position of the information on the code blocks (like
22
// `compile_fail` or `ignore`).
3-
goto: file://|DOC_PATH|/test_docs/index.html
4-
goto: ./fn.check_list_code_block.html
3+
goto: "file://" + |DOC_PATH| + "/test_docs/index.html"
4+
goto: "./fn.check_list_code_block.html"
55
// If the codeblock is the first element of the docblock, the information tooltip must have
66
// have some top margin to avoid going over the toggle (the "[+]").
77
assert-css: (".docblock > .example-wrap.compile_fail .tooltip", { "margin-top": "16px" })

src/test/rustdoc-gui/code-blocks-overflow.goml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// This test ensures that codeblocks content don't overflow.
2-
goto: file://|DOC_PATH|/lib2/sub_mod/struct.Foo.html
2+
goto: "file://" + |DOC_PATH| + "/lib2/sub_mod/struct.Foo.html"
33
size: (1080, 600)
44
// There should be two codeblocks: a rust one and a non-rust one.
55
assert-count: (".docblock > .example-wrap", 2)

0 commit comments

Comments
 (0)