From 9499f3188da546f20d7e3ffbd320ba63d5151a0b Mon Sep 17 00:00:00 2001
From: Aishwarya-U-R <91450662+Aishwarya-U-R@users.noreply.github.com>
Date: Wed, 7 Sep 2022 15:44:14 +0530
Subject: [PATCH] test: Running CI on latest Chrome browser (#16613)

## Description

- This PR makes changes to run CI on latest stable Chrome always

## Type of change

- Browser update

## Checklist:

- [X] My code follows the style guidelines of this project
- [X] I have performed a self-review of my own code
- [X] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [X] My changes generate no new warnings
- [X] I have added tests that prove my fix is effective or that my feature works
- [X] New and existing unit tests pass locally with my changes
---
 .github/workflows/integration-tests-command.yml | 16 ++++++++++++----
 .github/workflows/test-build-docker-image.yml   | 16 ++++++++++++----
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/integration-tests-command.yml b/.github/workflows/integration-tests-command.yml
index 7f968de426..068716117e 100644
--- a/.github/workflows/integration-tests-command.yml
+++ b/.github/workflows/integration-tests-command.yml
@@ -633,6 +633,10 @@ jobs:
           chmod a+x ./cypress/setup-test-fat.sh
           ./cypress/setup-test-fat.sh
 
+      - uses: browser-actions/setup-chrome@latest
+      - run: |
+        echo "BROWSER_PATH=$(which chrome)" >> $GITHUB_ENV
+
       - name: Run the cypress test
         if: steps.run_result.outputs.run_result != 'success' && steps.run_result.outputs.run_result != 'failedtest'
         uses: cypress-io/github-action@v2
@@ -658,7 +662,7 @@ jobs:
           APPSMITH_GOOGLE_MAPS_API_KEY: ${{ secrets.APPSMITH_GOOGLE_MAPS_API_KEY }}
           COMMIT_INFO_MESSAGE: ${{ github.event.pull_request.title }}
         with:
-          browser: electron
+          browser: ${{ env.BROWSER_PATH }}
           headless: true
           record: true
           install: false
@@ -697,7 +701,7 @@ jobs:
           APPSMITH_GOOGLE_MAPS_API_KEY: ${{ secrets.APPSMITH_GOOGLE_MAPS_API_KEY }}
           COMMIT_INFO_MESSAGE: ${{ github.event.pull_request.title }}
         with:
-          browser: electron
+          browser: ${{ env.BROWSER_PATH }}
           headless: true
           record: true
           install: false
@@ -1016,6 +1020,10 @@ jobs:
         run: |
           ./cypress/setup-test.sh
 
+      - uses: browser-actions/setup-chrome@latest
+      - run: |
+        echo "BROWSER_PATH=$(which chrome)" >> $GITHUB_ENV
+
       - name: Run the cypress test
         if: steps.run_result.outputs.run_result != 'success'  && steps.run_result.outputs.run_result != 'failedtest'
         uses: cypress-io/github-action@v2
@@ -1041,7 +1049,7 @@ jobs:
           APPSMITH_GOOGLE_MAPS_API_KEY: ${{ secrets.APPSMITH_GOOGLE_MAPS_API_KEY }}
           COMMIT_INFO_MESSAGE: ${{ github.event.pull_request.title }}
         with:
-          browser: electron
+          browser: ${{ env.BROWSER_PATH }}
           headless: true
           record: true
           install: false
@@ -1079,7 +1087,7 @@ jobs:
           APPSMITH_GOOGLE_MAPS_API_KEY: ${{ secrets.APPSMITH_GOOGLE_MAPS_API_KEY }}
           COMMIT_INFO_MESSAGE: ${{ github.event.pull_request.title }}
         with:
-          browser: electron
+          browser: ${{ env.BROWSER_PATH }}
           headless: true
           record: true
           install: false
diff --git a/.github/workflows/test-build-docker-image.yml b/.github/workflows/test-build-docker-image.yml
index f447ef29c5..97f8ab8143 100644
--- a/.github/workflows/test-build-docker-image.yml
+++ b/.github/workflows/test-build-docker-image.yml
@@ -831,6 +831,10 @@ jobs:
           chmod a+x ./cypress/setup-test-fat.sh
           ./cypress/setup-test-fat.sh
 
+      - uses: browser-actions/setup-chrome@latest
+      - run: |
+        echo "BROWSER_PATH=$(which chrome)" >> $GITHUB_ENV
+
       - name: Run the cypress test
         if: steps.run_result.outputs.run_result != 'success' && steps.run_result.outputs.run_result != 'failedtest'
         uses: cypress-io/github-action@v2
@@ -856,7 +860,7 @@ jobs:
           APPSMITH_GOOGLE_MAPS_API_KEY: ${{ secrets.APPSMITH_GOOGLE_MAPS_API_KEY }}
           COMMIT_INFO_MESSAGE: ${{ github.event.pull_request.title }}
         with:
-          browser: electron
+          browser: ${{ env.BROWSER_PATH }}
           headless: true
           record: true
           install: false
@@ -895,7 +899,7 @@ jobs:
           APPSMITH_GOOGLE_MAPS_API_KEY: ${{ secrets.APPSMITH_GOOGLE_MAPS_API_KEY }}
           COMMIT_INFO_MESSAGE: ${{ github.event.pull_request.title }}
         with:
-          browser: electron
+          browser: ${{ env.BROWSER_PATH }}
           headless: true
           record: true
           install: false
@@ -1260,6 +1264,10 @@ jobs:
         run: |
           ./cypress/setup-test.sh
 
+      - uses: browser-actions/setup-chrome@latest
+      - run: |
+        echo "BROWSER_PATH=$(which chrome)" >> $GITHUB_ENV
+
       - name: Run the cypress test
         if: steps.run_result.outputs.run_result != 'success' && steps.run_result.outputs.run_result != 'failedtest'
         uses: cypress-io/github-action@v2
@@ -1285,7 +1293,7 @@ jobs:
           APPSMITH_GOOGLE_MAPS_API_KEY: ${{ secrets.APPSMITH_GOOGLE_MAPS_API_KEY }}
           COMMIT_INFO_MESSAGE: ${{ github.event.pull_request.title }}
         with:
-          browser: electron
+          browser: ${{ env.BROWSER_PATH }}
           headless: true
           record: true
           install: false
@@ -1323,7 +1331,7 @@ jobs:
           APPSMITH_GOOGLE_MAPS_API_KEY: ${{ secrets.APPSMITH_GOOGLE_MAPS_API_KEY }}
           COMMIT_INFO_MESSAGE: ${{ github.event.pull_request.title }}
         with:
-          browser: electron
+          browser: ${{ env.BROWSER_PATH }}
           headless: true
           record: true
           install: false