From d8e2488a9b261f8880106d654bbec6d0cfbbc949 Mon Sep 17 00:00:00 2001
From: yatinappsmith <84702014+yatinappsmith@users.noreply.github.com>
Date: Thu, 15 Jul 2021 16:45:53 +0530
Subject: [PATCH] Disabled maven Tests (#5882)

---
 .github/workflows/client-test.yml | 39 +++----------------------------
 app/client/cypress/setup-test.sh  |  6 ++++-
 2 files changed, 8 insertions(+), 37 deletions(-)

diff --git a/.github/workflows/client-test.yml b/.github/workflows/client-test.yml
index b682840a9f..776eb3240a 100644
--- a/.github/workflows/client-test.yml
+++ b/.github/workflows/client-test.yml
@@ -45,15 +45,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      # Setup filter for client and server
-      - uses: dorny/paths-filter@v2
-        id: filter
-        with:
-          filters: |
-            server:
-              - 'app/server/**'
-            client:
-              - 'app/client/**'
+ 
       # Checkout the code
       - name: Checkout the merged commit from PR and base branch
         if: github.event_name == 'pull_request_review'
@@ -115,10 +107,6 @@ jobs:
           echo "next_version = $next_version"
           echo ::set-output name=version::$next_version-SNAPSHOT
 
-      - name: Run the jest tests
-        if: steps.filter.outputs.client == 'true'
-        run: REACT_APP_ENVIRONMENT=${{steps.vars.outputs.REACT_APP_ENVIRONMENT}} yarn run test:unit
-
       # We burn React environment & the Segment analytics key into the build itself.
       # This is to ensure that we don't need to configure it in each installation
       - name: Create the bundle
@@ -170,15 +158,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      # Setup filter for client and server
-      - uses: dorny/paths-filter@v2
-        id: filterserver
-        with:
-          filters: |
-            server:
-              - 'app/server/**'
-            client:
-              - 'app/client/**'
+
 
       # Setup Java
       - name: Set up JDK 1.11
@@ -221,21 +201,8 @@ jobs:
           APPSMITH_ENCRYPTION_SALT: "salt"
           APPSMITH_IS_SELF_HOSTED: false
         working-directory: app/server
-        if: steps.filterserver.outputs.server == 'false'
         run: |
             ./build.sh -DskipTests
-            
-      - name: Build and test package
-        env:
-          APPSMITH_MONGODB_URI: "mongodb://localhost:27017/mobtools"
-          APPSMITH_REDIS_URL: "redis://127.0.0.1:6379"
-          APPSMITH_ENCRYPTION_PASSWORD: "password"
-          APPSMITH_ENCRYPTION_SALT: "salt"
-          APPSMITH_IS_SELF_HOSTED: false
-        working-directory: app/server
-        if: steps.filterserver.outputs.server == 'true'
-        run: |
-            ./build.sh
 
       # Upload the build artifact so that it can be used by the test & deploy job in the workflow
       - name: Upload server build bundle
@@ -510,4 +477,4 @@ jobs:
           docker build -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:nightly .
           echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
           docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:${GITHUB_SHA}
-          docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:nightly
+          docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:nightly
\ No newline at end of file
diff --git a/app/client/cypress/setup-test.sh b/app/client/cypress/setup-test.sh
index e359f5a624..abb2a006a3 100755
--- a/app/client/cypress/setup-test.sh
+++ b/app/client/cypress/setup-test.sh
@@ -53,6 +53,10 @@ while [  "$retry_count" -le "3"  -a  "$status_code" -eq "502"  ]; do
 	status_code=$(curl -o /dev/null -s -w "%{http_code}\n" https://dev.appsmith.com/api/v1/users)
 done
 
+echo "Checking if client and server have started"
+ps -ef |grep java 2>&1 
+ps -ef |grep  serve 2>&1
+
 if [ "$status_code" -eq "502" ]; then
   echo "Unable to connect to server"
   exit 1
@@ -96,4 +100,4 @@ curl -k --request POST -v 'https://dev.appsmith.com/api/v1/users' \
 
 # DEBUG=cypress:* $(npm bin)/cypress version
 # sed -i -e "s|api_url:.*$|api_url: $CYPRESS_URL|g" /github/home/.cache/Cypress/4.1.0/Cypress/resources/app/packages/server/config/app.yml
-# cat /github/home/.cache/Cypress/4.1.0/Cypress/resources/app/packages/server/config/app.yml
+# cat /github/home/.cache/Cypress/4.1.0/Cypress/resources/app/packages/server/config/app.yml
\ No newline at end of file