Skip to content

Commit 8849d80

Browse files
GuillaumeGomezsyphar
authored andcommitted
Update to newest browser-ui-test version
1 parent 98f5904 commit 8849d80

File tree

5 files changed

+12
-11
lines changed

5 files changed

+12
-11
lines changed

dockerfiles/Dockerfile-gui-tests

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ RUN apt-get install -y \
6464
wget
6565

6666
# Install rust
67-
RUN curl https://sh.rustup.rs -sSf | bash -s -- -y --default-toolchain nightly --no-modify-path --profile minimal
67+
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | bash -s -- -y --default-toolchain nightly --no-modify-path --profile minimal
6868
ENV PATH="/root/.cargo/bin:${PATH}"
6969

7070
RUN curl -sL https://nodejs.org/dist/v14.4.0/node-v14.4.0-linux-x64.tar.xz | tar -xJ
@@ -80,7 +80,7 @@ RUN mkdir out
8080
# https://github.com/puppeteer/puppeteer/issues/375
8181
#
8282
# We also specify the version in case we need to update it to go around cache limitations.
83-
RUN npm install -g browser-ui-test@0.8.5 --unsafe-perm=true
83+
RUN npm install -g browser-ui-test@0.16.10 --unsafe-perm=true
8484

8585
EXPOSE 3000
8686

dockerfiles/run-gui-tests.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ docker-compose build web
1616
if [ ! -f .env ]
1717
then
1818
cp .env.sample .env
19-
source .env
19+
. .env
2020
fi
2121

2222
docker-compose up -d web
@@ -32,5 +32,4 @@ sleep 5
3232
# status="docker run . -v `pwd`:/build/out:ro gui_tests"
3333
docker-compose run gui_tests
3434
status=$?
35-
kill -9 $SERVER_PID
3635
exit $status

gui-tests/404.goml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// Checks the content of the 404 page.
2-
goto: |DOC_PATH|/non-existing-crate
2+
go-to: |DOC_PATH| + "/non-existing-crate"
33
assert-text: ("#crate-title", "The requested crate does not exist")

gui-tests/basic.goml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
// Checks that the "latest" URL leads us to the last version of the `sysinfo` crate.
2-
goto: |DOC_PATH|/sysinfo
2+
go-to: |DOC_PATH| + "/sysinfo"
33
// We first check if the redirection worked as expected:
44
assert-document-property: ({"URL": "/sysinfo/latest/sysinfo/"}, ENDS_WITH)
5+
// Now we go to the actual version we're interested into.
6+
go-to: |DOC_PATH| + "/sysinfo/0.23.5/sysinfo/index.html"
57
assert: "//*[@class='title' and text()='sysinfo-0.23.5']"
68
// And we also confirm we're on a rustdoc page.
79
assert: "#rustdoc_body_wrapper"
810

911
// Let's go to the docs.rs page of the crate.
10-
goto: |DOC_PATH|/crate/sysinfo/latest
12+
go-to: |DOC_PATH| + "/crate/sysinfo/0.23.5"
1113
assert-false: "#rustdoc_body_wrapper"
1214
assert-text: ("#crate-title", "sysinfo 0.23.5", CONTAINS)

gui-tests/tester.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ async function main(argv) {
123123
try {
124124
// This is more convenient that setting fields one by one.
125125
let args = [
126-
"--no-screenshot-comparison",
127126
"--no-sandbox",
128127
];
129128
if (typeof process.env.SERVER_URL !== 'undefined') {
@@ -166,14 +165,15 @@ async function main(argv) {
166165
opts["jobs"] = 1;
167166
console.log("`--no-headless` option is active, disabling concurrency for running tests.");
168167
}
169-
170-
console.log(`Running ${files.length} docs.rs GUI (${opts["jobs"]} concurrently) ...`);
168+
let jobs = opts["jobs"];
171169

172170
if (opts["jobs"] < 1) {
171+
jobs = files.length;
173172
process.setMaxListeners(files.length + 1);
174173
} else if (headless) {
175174
process.setMaxListeners(opts["jobs"] + 1);
176175
}
176+
console.log(`Running ${files.length} docs.rs GUI (${jobs} concurrently) ...`);
177177

178178
const tests_queue = [];
179179
let results = {
@@ -185,7 +185,7 @@ async function main(argv) {
185185
for (let i = 0; i < files.length; ++i) {
186186
const file_name = files[i];
187187
const testPath = path.join(__dirname, file_name);
188-
const callback = runTest(testPath, options)
188+
const callback = runTest(testPath, {"options": options})
189189
.then(out => {
190190
const [output, nb_failures] = out;
191191
results[nb_failures === 0 ? "successful" : "failed"].push({

0 commit comments

Comments
 (0)