From 6988c9f18abd9ef7a32be954342bc4e00984098c Mon Sep 17 00:00:00 2001
From: Dinika Saxena <dinikasaxenas@gmail.com>
Date: Thu, 6 Jul 2023 21:49:09 +0200
Subject: [PATCH] Run cypress container as user

---
 .github/workflows/review.yml | 2 +-
 ci/docker-compose.yml        | 1 +
 cypress/e2e/Studios.cy.ts    | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml
index c01fe87cb5..85a5b9a83c 100644
--- a/.github/workflows/review.yml
+++ b/.github/workflows/review.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: it
 
     steps:
-      - run: docker run --rm --volume $PWD/cypress/screenshots:/videos:rw bash chown -R $UID /videos
+      - run: docker run --rm --volume $PWD/cypress/videos:/videos:rw bash chown -R $UID /videos
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
diff --git a/ci/docker-compose.yml b/ci/docker-compose.yml
index a0d77bc7b0..64e255177a 100644
--- a/ci/docker-compose.yml
+++ b/ci/docker-compose.yml
@@ -15,6 +15,7 @@ services:
     entrypoint: ['bash']
     stdin_open: true
     tty: true
+    user: $USER
   fusion:
     depends_on:
       - delta
diff --git a/cypress/e2e/Studios.cy.ts b/cypress/e2e/Studios.cy.ts
index 0533f11b61..88f0554a12 100644
--- a/cypress/e2e/Studios.cy.ts
+++ b/cypress/e2e/Studios.cy.ts
@@ -63,6 +63,9 @@ describe('Studios', () => {
   });
 
   it('saves changes made by user to table columns and shows them correctly', function() {
+    cy.intercept({ method: 'PUT', path: /resources/ }).as(
+      'saveDashboardRequest'
+    );
     studioDetailsPage
       .getAnyDashboard(Cypress.env('ORG_LABEL'), this.projectLabel)
       .then(() => {
@@ -74,6 +77,7 @@ describe('Studios', () => {
       })
       .then(() => {
         studioDetailsPage.openEditDashboard();
+        cy.wait('@saveDashboardRequest');
 
         cy.findByLabelText(/Enable Filter/i).should('be.checked');
       });