From 3b9dc5df4e1ff9092c2546aeeb915048ea8ecff5 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Tue, 30 Aug 2022 20:20:10 +0530
Subject: [PATCH] test: CY xcdb path corrections

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 .github/workflows/ci-cd-v2.yml      | 8 ++++----
 package.json                        | 2 ++
 scripts/cypress-v2/plugins/index.js | 6 +++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci-cd-v2.yml b/.github/workflows/ci-cd-v2.yml
index 2a88913dce..2a537ee141 100644
--- a/.github/workflows/ci-cd-v2.yml
+++ b/.github/workflows/ci-cd-v2.yml
@@ -224,7 +224,7 @@ jobs:
 #          uses: cypress-io/github-action@v2
 #          with:
 #            start: |
-#              npm run start:xcdb-api:cache
+#              npm run start:xcdb-api:cache-v2
 #              npm run start:web-v2
 #              docker-compose -f ./scripts/docker-compose-cypress.yml up -d
 #            spec: "./scripts/cypress-v2/integration/test/xcdb-restTableOps.js"
@@ -268,7 +268,7 @@ jobs:
 #          uses: cypress-io/github-action@v2
 #          with:
 #            start: |
-#              npm run start:xcdb-api:cache
+#              npm run start:xcdb-api:cache-v2
 #              npm run start:web-v2
 #              docker-compose -f ./scripts/docker-compose-cypress.yml up -d
 #            spec: "./scripts/cypress-v2/integration/test/xcdb-restViews.js"
@@ -312,7 +312,7 @@ jobs:
           uses: cypress-io/github-action@v2
           with:
             start: |
-              npm run start:xcdb-api:cache
+              npm run start:xcdb-api:cache-v2
               npm run start:web-v2
               docker-compose -f ./scripts/docker-compose-cypress.yml up -d
             spec: "./scripts/cypress-v2/integration/test/xcdb-restRoles.js"
@@ -356,7 +356,7 @@ jobs:
           uses: cypress-io/github-action@v2
           with:
             start: |
-              npm run start:xcdb-api:cache
+              npm run start:xcdb-api:cache-v2
               npm run start:web-v2
               docker-compose -f ./scripts/docker-compose-cypress.yml up -d
             spec: "./scripts/cypress-v2/integration/test/xcdb-restMisc.js"
diff --git a/package.json b/package.json
index cbb214b7ce..5a66603580 100644
--- a/package.json
+++ b/package.json
@@ -17,10 +17,12 @@
     "install:common": "cd ./packages/nocodb; npm install ../nocodb-sdk; cd ../nc-gui; npm install ../nocodb-sdk",
     "start:api": "npm run build:common ; cd ./packages/nocodb; npm install ../nocodb-sdk; npm install; NC_DISABLE_CACHE=true NC_DISABLE_TELE=true npm run watch:run:cypress",
     "start:xcdb-api": "npm run build:common ; cd ./packages/nocodb; npm install ../nocodb-sdk;npm install; NC_DISABLE_CACHE=true NC_DISABLE_TELE=true NC_INFLECTION=camelize DATABASE_URL=sqlite:../../../scripts/cypress/fixtures/sqlite-sakila/sakila.db npm run watch:run:cypress",
+    "start:xcdb-api-v2": "npm run build:common ; cd ./packages/nocodb; npm install ../nocodb-sdk;npm install; NC_DISABLE_CACHE=true NC_DISABLE_TELE=true NC_INFLECTION=camelize DATABASE_URL=sqlite:../../../scripts/cypress-v2/fixtures/sqlite-sakila/sakila.db npm run watch:run:cypress",
     "start:api:cache": "npm run build:common ; cd ./packages/nocodb; npm install ../nocodb-sdk;npm install; NC_DISABLE_TELE=true npm run watch:run:cypress",
     "start:api:cache:pg": "npm run build:common ; cd ./packages/nocodb; npm install ../nocodb-sdk; npm install; NC_DISABLE_TELE=true npm run watch:run:cypress:pg",
     "start:api:cache:pg:cyquick": "npm run build:common ; cd ./packages/nocodb; npm install ../nocodb-sdk; npm install; NC_DISABLE_TELE=true npm run watch:run:cypress:pg:cyquick",
     "start:xcdb-api:cache": "npm run build:common ; cd ./packages/nocodb; npm install ../nocodb-sdk; npm install; NC_DISABLE_TELE=true NC_INFLECTION=camelize DATABASE_URL=sqlite:../../../scripts/cypress/fixtures/sqlite-sakila/sakila.db npm run watch:run:cypress",
+    "start:xcdb-api:cache-v2": "npm run build:common ; cd ./packages/nocodb; npm install ../nocodb-sdk; npm install; NC_DISABLE_TELE=true NC_INFLECTION=camelize DATABASE_URL=sqlite:../../../scripts/cypress-v2/fixtures/sqlite-sakila/sakila.db npm run watch:run:cypress",
     "start:web": "npm run build:common ; cd ./packages/nc-gui; npm install ../nocodb-sdk; npm install; npm run dev",
     "start:web-v2": "npm run build:common ; cd ./packages/nc-gui-v2; npm install ../nocodb-sdk; npm install; npm run dev",
     "cypress:run": "cypress run --config-file ./scripts/cypress/cypress.json",
diff --git a/scripts/cypress-v2/plugins/index.js b/scripts/cypress-v2/plugins/index.js
index 84d7ffd618..07ab95acc6 100644
--- a/scripts/cypress-v2/plugins/index.js
+++ b/scripts/cypress-v2/plugins/index.js
@@ -29,7 +29,7 @@ module.exports = (on, config) => {
         copyFile() {
           console.log("copyFile", __dirname)
           return new Promise((resolve, reject) => {
-              copyFile("./scripts/cypress/fixtures/quickTest/noco_0_91_7.db", "./packages/nocodb/noco.db", (err) => {
+              copyFile("./scripts/cypress-v2/fixtures/quickTest/noco_0_91_7.db", "./packages/nocodb/noco.db", (err) => {
                   if(err) {
                       console.log(err)
                       return reject(err)
@@ -129,7 +129,7 @@ function _sqliteExecReturnValue(query) {
     // open the database
     console.log("Current directory: " + process.cwd());
     let db = new sqlite3.Database(
-        "./scripts/cypress/fixtures/sqlite-sakila/sakila.db",
+        "./scripts/cypress-v2/fixtures/sqlite-sakila/sakila.db",
         sqlite3.OPEN_READWRITE,
         (err) => {
             if (err) {
@@ -157,7 +157,7 @@ function _sqliteExec(query) {
     // open the database
     console.log("Current directory: " + process.cwd());
     let db = new sqlite3.Database(
-        "./scripts/cypress/fixtures/sqlite-sakila/sakila.db",
+        "./scripts/cypress-v2/fixtures/sqlite-sakila/sakila.db",
         sqlite3.OPEN_READWRITE,
         (err) => {
             if (err) {