Skip to content

Commit 20fca12

Browse files
GuillaumeGomezsyphar
authored andcommitted
Simplify version handling of browser-ui-test and update browser-ui-test version to 0.21.3
1 parent e32b37f commit 20fca12

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

dockerfiles/Dockerfile-gui-tests

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,6 @@ RUN apt-get install -y \
5757
xdg-utils \
5858
wget
5959

60-
# Install rust
61-
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | bash -s -- -y --default-toolchain nightly --no-modify-path --profile minimal
62-
ENV PATH="/root/.cargo/bin:${PATH}"
63-
6460
RUN curl -sL https://nodejs.org/dist/v22.13.1/node-v22.13.1-linux-x64.tar.xz | tar -xJ
6561
ENV PATH="/node-v22.13.1-linux-x64/bin:${PATH}"
6662
ENV NODE_PATH="/node-v22.13.1-linux-x64/lib/node_modules/"
@@ -69,13 +65,13 @@ WORKDIR /build
6965

7066
RUN mkdir out
7167

68+
COPY ../package.json /build/package.json
69+
7270
# For now, we need to use `--unsafe-perm=true` to go around an issue when npm tries
7371
# to create a new folder. For reference:
7472
# https://github.com/puppeteer/puppeteer/issues/375
7573
#
7674
# We also specify the version in case we need to update it to go around cache limitations.
77-
RUN npm install -g [email protected] --unsafe-perm=true
78-
79-
EXPOSE 3000
75+
RUN npm install --unsafe-perm=true --loglevel verbose --force
8076

8177
CMD ["node", "/build/out/gui-tests/tester.js"]

dockerfiles/run-gui-tests.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,12 @@ fi
3232

3333
. .env
3434

35+
set +e # We disable the "exit right away if command failed" setting.
3536
cargo run -- start-web-server &
3637
SERVER_PID=$!
3738

3839
# status="docker run . -v `pwd`:/build/out:ro gui_tests"
39-
docker compose run gui_tests
40+
docker compose run --rm gui_tests
4041
status=$?
4142
kill $SERVER_PID
4243
exit $status

package.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"name": "deps",
3+
"dependencies": {
4+
"browser-ui-test": "^0.21.3"
5+
}
6+
}

0 commit comments

Comments
 (0)