From ab337409a12bb7a4b567bce09386c3fa9faaf2e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20N=C3=A9grier?= <d.negrier@thecodingmachine.com>
Date: Tue, 23 Nov 2021 18:42:25 +0100
Subject: [PATCH] Trying to fix issue with Github rights

---
 .github/workflows/end_to_end_tests.yml | 5 ++++-
 docker-compose.testcafe.yml            | 3 ++-
 tests/README.md                        | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/end_to_end_tests.yml b/.github/workflows/end_to_end_tests.yml
index 32ebaf46..daeeaf2f 100644
--- a/.github/workflows/end_to_end_tests.yml
+++ b/.github/workflows/end_to_end_tests.yml
@@ -26,5 +26,8 @@ jobs:
       - name: "Start environment"
         run: docker-compose up -d
 
+      - name: "Wait for environment to build"
+        run: docker-compose logs -f --tail=0 front | grep -m 1 "Compiled successfully"
+
       - name: "Run tests"
-        run: docker-compose -f docker-compose.testcafe.yml up
+        run: UID=$(id -u) GID=$(id -g) docker-compose -f docker-compose.testcafe.yml up
diff --git a/docker-compose.testcafe.yml b/docker-compose.testcafe.yml
index c6a89dd3..705b8e0f 100644
--- a/docker-compose.testcafe.yml
+++ b/docker-compose.testcafe.yml
@@ -7,7 +7,8 @@ services:
       BROWSER: "chromium --use-fake-device-for-media-stream"
     volumes:
       - ./tests:/tests
-      - ./tests/.testcaferc.json:/.testcaferc.json
       - ./maps:/maps
+    user: "${UID}:${GID}"
+
   #  security_opt:
   #    - seccomp:unconfined
diff --git a/tests/README.md b/tests/README.md
index 2ee6154a..e4f4a8db 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -12,7 +12,7 @@ $ npm test
 Alternatively, you can use docker-compose to run the tests:
 
 ```console
-$ docker-compose -f docker-compose.testcafe.yml up
+$ UID=$(id -u) GID=$(id -g) docker-compose -f docker-compose.testcafe.yml up
 ```
 
 Note: by default, tests are running in Chrome locally and in Chromium in the Docker image.