From 8ead066447ac13d680e28206e38caade35372cd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Girardot?= <cgi@atolcd.com> Date: Tue, 1 Sep 2020 18:29:36 +0200 Subject: [PATCH] =?UTF-8?q?Tests=20:=20Met=20=C3=A0=20jour=20Cypress=20en?= =?UTF-8?q?=20version=205.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I40d2529dba7b6a113291da68e0dc2b2d42d2ac1d --- appli_sf/tests/E2E/package.json | 2 +- appli_sf/tests/E2E/yarn.lock | 8 ++++---- docker/cypress/Dockerfile | 2 +- docker/lamp/Dockerfile | 4 +++- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/appli_sf/tests/E2E/package.json b/appli_sf/tests/E2E/package.json index 7a7afca9..f2c76fb9 100644 --- a/appli_sf/tests/E2E/package.json +++ b/appli_sf/tests/E2E/package.json @@ -1,5 +1,5 @@ { "dependencies": { - "cypress-file-upload": "^4.0.7" + "cypress-file-upload": "^4.1.1" } } diff --git a/appli_sf/tests/E2E/yarn.lock b/appli_sf/tests/E2E/yarn.lock index d9df5f55..30f99a3b 100644 --- a/appli_sf/tests/E2E/yarn.lock +++ b/appli_sf/tests/E2E/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -cypress-file-upload@^4.0.7: - version "4.0.7" - resolved "https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-4.0.7.tgz#1136139bb3c660b9c39a69f231ac1da7785acaae" - integrity sha512-rFFmnoZ2bWyWFpSV09AhkSUgYEiVy70pcQ6nf/mGTMTrVHvKCCCIfRu3TbgVYHbgBq+0hqjfjQrtz4IbgH7qZA== +cypress-file-upload@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-4.1.1.tgz#952713c8104ab7008de99c65bd63f74b244fe4df" + integrity sha512-tX6UhuJ63rNgjdzxglpX+ZYf/bM6PDhFMtt1qCBljLtAgdearqyfD1AHqyh59rOHCjfM+bf6FA3o9b/mdaX6pw== dependencies: mime "^2.4.4" diff --git a/docker/cypress/Dockerfile b/docker/cypress/Dockerfile index 284065fd..11e87184 100644 --- a/docker/cypress/Dockerfile +++ b/docker/cypress/Dockerfile @@ -1,4 +1,4 @@ -FROM cypress/included:4.11.0 +FROM cypress/included:5.1.0 RUN apt-get update && \ apt-get install --no-install-recommends -y \ diff --git a/docker/lamp/Dockerfile b/docker/lamp/Dockerfile index 52843eac..9c22ffca 100644 --- a/docker/lamp/Dockerfile +++ b/docker/lamp/Dockerfile @@ -35,6 +35,7 @@ RUN set -eux; \ ca-certificates \ libgtk2.0-0 \ libgtk-3-0 \ + libgbm-dev \ libnotify-dev \ libgconf-2-4 \ libnss3 \ @@ -50,6 +51,7 @@ RUN set -eux; \ # Install yarn ENV APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=DontWarn +RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - RUN set -eux;\ apt-get update && apt-get install -y gnupg; \ curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -; \ @@ -89,7 +91,7 @@ ENV PHP_POST_MAX_SIZE 10M ENV PHP_VERSION 7.2 # Install Cypress -RUN yarn global add --pure-lockfile cypress@4.11.0; +RUN yarn global add --pure-lockfile cypress@5.1.0; # Docker RUN curl -fsSLO https://get.docker.com/builds/Linux/x86_64/docker-17.04.0-ce.tgz && \ -- GitLab