cypress upgrade

jesperancinha · Sep 1, 2023 · 0fae8e3 · 0fae8e3
1 parent 5491bfe
commit 0fae8e3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -96,7 +96,7 @@ dcup: dcd docker-clean docker vma-wait
 dcup-full: docker-clean-build-start vma-wait
 dcup-full-action: docker-clean b docker-action vma-wait
 cypress-open:
-	cd e2e && yarn && npm run cypress
+	cd e2e && yarn && npm run cypress:open:electron
 cypress-electron:
 	cd e2e && make cypress-electron
 cypress-chrome:

diff --git a/e2e/Makefile b/e2e/Makefile
@@ -2,7 +2,7 @@ SHELL := /bin/bash
 GITHUB_RUN_ID ?=123
 
 cypress-open:
-	yarn && npm run cypress
+	yarn && npm run cypress:open:electron
 cypress-electron:
 	yarn && docker-compose -p "${GITHUB_RUN_ID}" -f ../docker-compose.yml -f docker-compose.yml up --exit-code-from e2e-electron e2e-electron
 cypress-chrome:

diff --git a/e2e/docker-compose.yml b/e2e/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   e2e-electron:
-    image: "cypress/included:12.13.0"
+    image: "cypress/included:13.1.0"
     working_dir: /e2e
     command: "--browser electron --env host=jofisaes-vma-nginx-lb"
     volumes:
@@ -9,7 +9,7 @@ services:
       - vma_net
 
   e2e-chrome:
-    image: "cypress/included:12.13.0"
+    image: "cypress/included:13.1.0"
     working_dir: /e2e
     command: "--browser chrome --env host=jofisaes-vma-nginx-lb"
     volumes:
@@ -18,7 +18,7 @@ services:
       - vma_net
 
   e2e-firefox:
-    image: "cypress/included:12.13.0"
+    image: "cypress/included:13.1.0"
     working_dir: /e2e
     command: "--browser firefox --env host=jofisaes-vma-nginx-lb"
     volumes:
@@ -27,7 +27,7 @@ services:
       - vma_net
 
   e2e-edge:
-    image: "cypress/included:12.13.0"
+    image: "cypress/included:13.1.0"
     working_dir: /e2e
     command: "--browser edge --env host=jofisaes-vma-nginx-lb"
     volumes:

diff --git a/e2e/package.json b/e2e/package.json
@@ -5,7 +5,7 @@
   "main": "index.js",
   "scripts": {
     "test": "test",
-    "cypress": "npx cypress open --browser electron",
+    "cypress:open:electron": "npx cypress open --browser electron",
     "cypress:run": "npx cypress run --browser electron",
     "cypress:run:chrome": "npx cypress run --browser chrome",
     "cypress:run:firefox": "npx cypress run --browser firefox",
@@ -17,7 +17,7 @@
   "author": "João Esperancinha",
   "license": "ISC",
   "devDependencies": {
-    "cypress": "13.0.0",
+    "cypress": "13.1.0",
     "ts-node": "^10.9.1",
     "typescript": "^5.2.2"
   },