From 67a8872587f6a4823070998fa0818f47a142ee14 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Mon, 14 Feb 2022 10:15:27 +0530
Subject: [PATCH] test: cypress pg- fix toast check, ci-cd for xcdb without
 docker-compose

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 .github/workflows/ci-cd.yml                           | 8 --------
 scripts/cypress/integration/common/1e_pg_meta_sync.js | 3 ++-
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
index 239c18858f..4444b9f33f 100644
--- a/.github/workflows/ci-cd.yml
+++ b/.github/workflows/ci-cd.yml
@@ -397,7 +397,6 @@ jobs:
                   start: |
                       npm run start:xcdb-api
                       npm run start:web
-                      docker-compose -f ./scripts/docker-compose-cypress.yml up -d
                   spec: "./scripts/cypress/integration/test/xcdb-restTableOps.js"
                   wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/runtime.js"
                   wait-on-timeout: 1200
@@ -441,7 +440,6 @@ jobs:
                   start: |
                       npm run start:xcdb-api
                       npm run start:web
-                      docker-compose -f ./scripts/docker-compose-cypress.yml up -d
                   spec: "./scripts/cypress/integration/test/xcdb-restViews.js"
                   wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/runtime.js"
                   wait-on-timeout: 1200
@@ -485,7 +483,6 @@ jobs:
                   start: |
                       npm run start:xcdb-api
                       npm run start:web
-                      docker-compose -f ./scripts/docker-compose-cypress.yml up -d
                   spec: "./scripts/cypress/integration/test/xcdb-restRoles.js"
                   wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/runtime.js"
                   wait-on-timeout: 1200
@@ -529,7 +526,6 @@ jobs:
                   start: |
                       npm run start:xcdb-api
                       npm run start:web
-                      docker-compose -f ./scripts/docker-compose-cypress.yml up -d
                   spec: "./scripts/cypress/integration/test/xcdb-restMisc.js"
                   wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/runtime.js"
                   wait-on-timeout: 1200
@@ -749,7 +745,6 @@ jobs:
                   start: |
                       npm run start:xcdb-api
                       npm run start:web
-                      docker-compose -f ./scripts/docker-compose-cypress.yml up -d
                   spec: "./scripts/cypress/integration/test/xcdb-gqlTableOps.js"
                   wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/runtime.js"
                   wait-on-timeout: 1200
@@ -793,7 +788,6 @@ jobs:
                   start: |
                       npm run start:xcdb-api
                       npm run start:web
-                      docker-compose -f ./scripts/docker-compose-cypress.yml up -d
                   spec: "./scripts/cypress/integration/test/xcdb-gqlViews.js"
                   wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/runtime.js"
                   wait-on-timeout: 1200
@@ -837,7 +831,6 @@ jobs:
                   start: |
                       npm run start:xcdb-api
                       npm run start:web
-                      docker-compose -f ./scripts/docker-compose-cypress.yml up -d
                   spec: "./scripts/cypress/integration/test/xcdb-gqlRoles.js"
                   wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/runtime.js"
                   wait-on-timeout: 1200
@@ -881,7 +874,6 @@ jobs:
                   start: |
                       npm run start:xcdb-api
                       npm run start:web
-                      docker-compose -f ./scripts/docker-compose-cypress.yml up -d
                   spec: "./scripts/cypress/integration/test/xcdb-gqlMisc.js"
                   wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/runtime.js"
                   wait-on-timeout: 1200
diff --git a/scripts/cypress/integration/common/1e_pg_meta_sync.js b/scripts/cypress/integration/common/1e_pg_meta_sync.js
index cdac756e47..d21fa84d32 100644
--- a/scripts/cypress/integration/common/1e_pg_meta_sync.js
+++ b/scripts/cypress/integration/common/1e_pg_meta_sync.js
@@ -172,7 +172,8 @@ export const genTest = (apiType, dbType) => {
             );
 
             cy.openTableTab("Table1", 9);
-            cy.deleteTable("Table1", dbType);
+            // kludge- delete table triggered post sql backend operations doesnt carry any trigger toast
+            cy.deleteTable("Table1", "mysql");
         });
     });
 };