Streamline using pre_e2e locally

.github/workflows/docker.yml

@@ -332,6 +332,7 @@ jobs:
         shell: bash
         run: |
           token=$(scripts/pre_e2e.sh)
+          docker-compose stop
           echo "CYPRESS_GITEA_ADMIN_TOKEN=${token}" >> $GITHUB_ENV
 
       - name: e2e

README.md

@@ -335,22 +335,36 @@ We configure our staging servers using [Ansible](https://docs.ansible.com/ansibl
 ```console
 docker-compose -f docker-compose.yml -f docker-compose.override.yml -f docker-compose.e2e.yml up e2e
 ```
+##
+
+> 🚧 **GITEA_ADMIN_TOKEN is needed because we have hid gitea and it's inaccessible to other containers!**
 
 ### Without docker
 
+Make sure that npm packages are installed
+
+```console
+yarn --cwd e2e 
+```
+then you can run the tests with
+
 ```console
-cd e2e
-yarn
-yarn e2e
+yarn --cwd e2e e2e --env GITEA_ADMIN_TOKEN=$(scripts/pre_e2e.sh) 
 ```
 
 ### GUI
+Make sure that npm packages are installed
 
 ```console
-cd e2e
-yarn
-yarn gui
+yarn --cwd e2e
 ```
+then you can open the GUI with
+
+```console
+yarn --cwd e2e gui --env GITEA_ADMIN_TOKEN=$(scripts/pre_e2e.sh)
+```
+
+
 
 ### Recording new visual tests:
 

e2e/package.json

@@ -1,8 +1,8 @@
 {
   "name": "kitspace-e2e",
   "scripts": {
-    "e2e": "npx cypress run",
-    "gui": "npx cypress open",
+    "e2e": "yarn cypress run",
+    "gui": "yarn cypress open",
     "fmt": "prettier '*.json' cypress/ --write",
     "lint": "eslint cypress/"
   },

scripts/pre_e2e.sh

@@ -17,7 +17,5 @@ else
 fi
 
 token="$(deno run --allow-env --allow-net --allow-run ./scripts/importBoardsTxt.ts --tokenOnly)"
-docker-compose stop
-
 # reutrn the token so it can be used as $(./scripts/pre_e2e.sh)
 echo $token