From c4083d7635c20726b87a6ca6b8e82c67ba959805 Mon Sep 17 00:00:00 2001 From: Raju Udava <86527202+dstala@users.noreply.github.com> Date: Wed, 24 Aug 2022 22:15:02 +0530 Subject: [PATCH] test: ci-cd route corrections Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> --- .github/workflows/ci-cd-v2.yml | 638 ++++++++++++++++++ package.json | 2 + scripts/cypress-v2/cypress.json | 14 +- .../integration/common/8a_webhook.js | 4 +- .../integration/spec/roleValidation.spec.js | 2 +- .../support/page_objects/navigation.js | 2 + 6 files changed, 652 insertions(+), 10 deletions(-) create mode 100644 .github/workflows/ci-cd-v2.yml diff --git a/.github/workflows/ci-cd-v2.yml b/.github/workflows/ci-cd-v2.yml new file mode 100644 index 0000000000..9b4fc4379e --- /dev/null +++ b/.github/workflows/ci-cd-v2.yml @@ -0,0 +1,638 @@ +# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node +# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions + +name: "CI/CD" +on: + push: + branches: [develop] + paths: + - "packages/nc-gui-v2/**" + - "scripts/cypress-v2/**" + - "packages/nocodb/**" + - ".github/workflows/ci-cd-v2.yml" + pull_request: + branches: [develop] + paths: + - "packages/nc-gui-v2/**" + - "scripts/cypress-v2/**" + - "packages/nocodb/**" + - ".github/workflows/ci-cd-v2.yml" + +jobs: + cypress-pg-restTableOps-run-cache: + runs-on: ubuntu-20.04 + steps: + - name: Setup Node + uses: actions/setup-node@v1 + with: + node-version: 16.15.0 + - name: Checkout + uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Cache node modules + uses: actions/cache@v2 + env: + cache-name: cache-node-modules + + with: + # npm cache files are stored in `~/.npm` on Linux/macOS + path: ~/.npm + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} + restore-keys: | + ${{ runner.os }}-build-${{ env.cache-name }}- + ${{ runner.os }}-build- + ${{ runner.os }}- + - name: Set env + run: echo "NODE_ENV=test" >> $GITHUB_ENV + - name: Cypress run + uses: cypress-io/github-action@v2 + with: + start: | + npm run start:api:cache + npm run start:web-v2 + docker-compose -f ./scripts/cypress-v2/docker-compose-pg.yml up -d + spec: "./scripts/cypress-v2/integration/test/pg-restTableOps.js" + wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/entry.mjs" + wait-on-timeout: 1200 + config-file: scripts/cypress-v2/cypress.json + - name: Upload screenshots + if: always() + uses: actions/upload-artifact@v2 + with: + name: cypress-pg-restTableOps-run-cache-snapshots + path: scripts/cypress-v2/screenshots + retention-days: 2 + cypress-pg-restViews-run-cache: + runs-on: ubuntu-20.04 + steps: + - name: Setup Node + uses: actions/setup-node@v1 + with: + node-version: 16.15.0 + - name: Checkout + uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Cache node modules + uses: actions/cache@v2 + env: + cache-name: cache-node-modules + + with: + # npm cache files are stored in `~/.npm` on Linux/macOS + path: ~/.npm + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} + restore-keys: | + ${{ runner.os }}-build-${{ env.cache-name }}- + ${{ runner.os }}-build- + ${{ runner.os }}- + - name: Set env + run: echo "NODE_ENV=test" >> $GITHUB_ENV + - name: Cypress run + uses: cypress-io/github-action@v2 + with: + start: | + npm run start:api:cache + npm run start:web-v2 + docker-compose -f ./scripts/cypress-v2/docker-compose-pg.yml up -d + spec: "./scripts/cypress-v2/integration/test/pg-restViews.js" + wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/entry.mjs" + wait-on-timeout: 1200 + config-file: scripts/cypress-v2/cypress.json + - name: Upload screenshots + if: always() + uses: actions/upload-artifact@v2 + with: + name: cypress-pg-restViews-run-cache-snapshots + path: scripts/cypress-v2/screenshots + retention-days: 2 + cypress-pg-restRoles-run-cache: + runs-on: ubuntu-20.04 + steps: + - name: Setup Node + uses: actions/setup-node@v1 + with: + node-version: 16.15.0 + - name: Checkout + uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Cache node modules + uses: actions/cache@v2 + env: + cache-name: cache-node-modules + + with: + # npm cache files are stored in `~/.npm` on Linux/macOS + path: ~/.npm + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} + restore-keys: | + ${{ runner.os }}-build-${{ env.cache-name }}- + ${{ runner.os }}-build- + ${{ runner.os }}- + - name: Set env + run: echo "NODE_ENV=test" >> $GITHUB_ENV + - name: Cypress run + uses: cypress-io/github-action@v2 + with: + start: | + npm run start:api:cache + npm run start:web-v2 + docker-compose -f ./scripts/cypress-v2/docker-compose-pg.yml up -d + spec: "./scripts/cypress-v2/integration/test/pg-restRoles.js" + wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/entry.mjs" + wait-on-timeout: 1200 + config-file: scripts/cypress-v2/cypress.json + - name: Upload screenshots + if: always() + uses: actions/upload-artifact@v2 + with: + name: cypress-pg-restRoles-run-cache-snapshots + path: scripts/cypress-v2/screenshots + retention-days: 2 + cypress-pg-restMisc-run-cache: + runs-on: ubuntu-20.04 + steps: + - name: Setup Node + uses: actions/setup-node@v1 + with: + node-version: 16.15.0 + - name: Checkout + uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Cache node modules + uses: actions/cache@v2 + env: + cache-name: cache-node-modules + + with: + # npm cache files are stored in `~/.npm` on Linux/macOS + path: ~/.npm + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} + restore-keys: | + ${{ runner.os }}-build-${{ env.cache-name }}- + ${{ runner.os }}-build- + ${{ runner.os }}- + - name: Set env + run: echo "NODE_ENV=test" >> $GITHUB_ENV + - name: Cypress run + uses: cypress-io/github-action@v2 + with: + start: | + npm run start:api:cache + npm run start:web-v2 + docker-compose -f ./scripts/cypress-v2/docker-compose-pg.yml up -d + spec: "./scripts/cypress-v2/integration/test/pg-restMisc.js" + wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/entry.mjs" + wait-on-timeout: 1200 + config-file: scripts/cypress-v2/cypress.json + - name: Upload screenshots + if: always() + uses: actions/upload-artifact@v2 + with: + name: cypress-pg-restMisc-run-cache-snapshots + path: scripts/cypress-v2/screenshots + retention-days: 2 + cypress-restTableOps-run-cache: + runs-on: ubuntu-20.04 + steps: + - name: Setup Node + uses: actions/setup-node@v1 + with: + node-version: 16.15.0 + - name: Checkout + uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Cache node modules + uses: actions/cache@v2 + env: + cache-name: cache-node-modules + + with: + # npm cache files are stored in `~/.npm` on Linux/macOS + path: ~/.npm + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} + restore-keys: | + ${{ runner.os }}-build-${{ env.cache-name }}- + ${{ runner.os }}-build- + ${{ runner.os }}- + - name: Set env + run: echo "NODE_ENV=test" >> $GITHUB_ENV + - name: Cypress run + uses: cypress-io/github-action@v2 + with: + start: | + npm run start:api:cache + npm run start:web-v2 + docker-compose -f ./scripts/docker-compose-cypress.yml up -d + spec: "./scripts/cypress-v2/integration/test/restTableOps.js" + wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/entry.mjs" + wait-on-timeout: 1200 + config-file: scripts/cypress-v2/cypress.json + - name: Upload screenshots + if: always() + uses: actions/upload-artifact@v2 + with: + name: cypress-restTableOps-run-cache-snapshots + path: scripts/cypress-v2/screenshots + retention-days: 2 + cypress-restViews-run-cache: + runs-on: ubuntu-20.04 + steps: + - name: Setup Node + uses: actions/setup-node@v1 + with: + node-version: 16.15.0 + - name: Checkout + uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Cache node modules + uses: actions/cache@v2 + env: + cache-name: cache-node-modules + + with: + # npm cache files are stored in `~/.npm` on Linux/macOS + path: ~/.npm + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} + restore-keys: | + ${{ runner.os }}-build-${{ env.cache-name }}- + ${{ runner.os }}-build- + ${{ runner.os }}- + - name: Set env + run: echo "NODE_ENV=test" >> $GITHUB_ENV + - name: Cypress run + uses: cypress-io/github-action@v2 + with: + start: | + npm run start:api:cache + npm run start:web-v2 + docker-compose -f ./scripts/docker-compose-cypress.yml up -d + spec: "./scripts/cypress-v2/integration/test/restViews.js" + wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/entry.mjs" + wait-on-timeout: 1200 + config-file: scripts/cypress-v2/cypress.json + - name: Upload screenshots + if: always() + uses: actions/upload-artifact@v2 + with: + name: cypress-restViews-run-cache-snapshots + path: scripts/cypress-v2/screenshots + retention-days: 2 + cypress-restRoles-run-cache: + runs-on: ubuntu-20.04 + steps: + - name: Setup Node + uses: actions/setup-node@v1 + with: + node-version: 16.15.0 + - name: Checkout + uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Cache node modules + uses: actions/cache@v2 + env: + cache-name: cache-node-modules + + with: + # npm cache files are stored in `~/.npm` on Linux/macOS + path: ~/.npm + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} + restore-keys: | + ${{ runner.os }}-build-${{ env.cache-name }}- + ${{ runner.os }}-build- + ${{ runner.os }}- + - name: Set env + run: echo "NODE_ENV=test" >> $GITHUB_ENV + - name: Cypress run + uses: cypress-io/github-action@v2 + with: + start: | + npm run start:api:cache + npm run start:web-v2 + docker-compose -f ./scripts/docker-compose-cypress.yml up -d + spec: "./scripts/cypress-v2/integration/test/restRoles.js" + wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/entry.mjs" + wait-on-timeout: 1200 + config-file: scripts/cypress-v2/cypress.json + - name: Upload screenshots + if: always() + uses: actions/upload-artifact@v2 + with: + name: cypress-restRoles-run-cache-snapshots + path: scripts/cypress-v2/screenshots + retention-days: 2 + cypress-restMisc-run-cache: + runs-on: ubuntu-20.04 + steps: + - name: Setup Node + uses: actions/setup-node@v1 + with: + node-version: 16.15.0 + - name: Checkout + uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Cache node modules + uses: actions/cache@v2 + env: + cache-name: cache-node-modules + + with: + # npm cache files are stored in `~/.npm` on Linux/macOS + path: ~/.npm + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} + restore-keys: | + ${{ runner.os }}-build-${{ env.cache-name }}- + ${{ runner.os }}-build- + ${{ runner.os }}- + - name: Set env + run: echo "NODE_ENV=test" >> $GITHUB_ENV + - name: Cypress run + uses: cypress-io/github-action@v2 + with: + start: | + npm run start:api:cache + npm run start:web-v2 + docker-compose -f ./scripts/docker-compose-cypress.yml up -d + spec: "./scripts/cypress-v2/integration/test/restMisc.js" + wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/entry.mjs" + wait-on-timeout: 1200 + config-file: scripts/cypress-v2/cypress.json + - name: Upload screenshots + if: always() + uses: actions/upload-artifact@v2 + with: + name: cypress-restMisc-run-cache-snapshots + path: scripts/cypress-v2/screenshots + retention-days: 2 + cypress-xcdb-restTableOps-run-cache: + runs-on: ubuntu-20.04 + steps: + - name: Setup Node + uses: actions/setup-node@v1 + with: + node-version: 16.15.0 + - name: Checkout + uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Cache node modules + uses: actions/cache@v2 + env: + cache-name: cache-node-modules + + with: + # npm cache files are stored in `~/.npm` on Linux/macOS + path: ~/.npm + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} + restore-keys: | + ${{ runner.os }}-build-${{ env.cache-name }}- + ${{ runner.os }}-build- + ${{ runner.os }}- + - name: Set env + run: echo "NODE_ENV=test" >> $GITHUB_ENV + - name: Cypress run + uses: cypress-io/github-action@v2 + with: + start: | + npm run start:xcdb-api:cache + npm run start:web-v2 + docker-compose -f ./scripts/docker-compose-cypress.yml up -d + spec: "./scripts/cypress-v2/integration/test/xcdb-restTableOps.js" + wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/entry.mjs" + wait-on-timeout: 1200 + config-file: scripts/cypress-v2/cypress.json + - name: Upload screenshots + if: always() + uses: actions/upload-artifact@v2 + with: + name: cypress-xcdb-restTableOps-run-cache-snapshots + path: scripts/cypress-v2/screenshots + retention-days: 2 + cypress-xcdb-restViews-run-cache: + runs-on: ubuntu-20.04 + steps: + - name: Setup Node + uses: actions/setup-node@v1 + with: + node-version: 16.15.0 + - name: Checkout + uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Cache node modules + uses: actions/cache@v2 + env: + cache-name: cache-node-modules + + with: + # npm cache files are stored in `~/.npm` on Linux/macOS + path: ~/.npm + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} + restore-keys: | + ${{ runner.os }}-build-${{ env.cache-name }}- + ${{ runner.os }}-build- + ${{ runner.os }}- + - name: Set env + run: echo "NODE_ENV=test" >> $GITHUB_ENV + - name: Cypress run + uses: cypress-io/github-action@v2 + with: + start: | + npm run start:xcdb-api:cache + npm run start:web-v2 + docker-compose -f ./scripts/docker-compose-cypress.yml up -d + spec: "./scripts/cypress-v2/integration/test/xcdb-restViews.js" + wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/entry.mjs" + wait-on-timeout: 1200 + config-file: scripts/cypress-v2/cypress.json + - name: Upload screenshots + if: always() + uses: actions/upload-artifact@v2 + with: + name: cypress-xcdb-restViews-run-cache-snapshots + path: scripts/cypress-v2/screenshots + retention-days: 2 + cypress-xcdb-restRoles-run-cache: + runs-on: ubuntu-20.04 + steps: + - name: Setup Node + uses: actions/setup-node@v1 + with: + node-version: 16.15.0 + - name: Checkout + uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Cache node modules + uses: actions/cache@v2 + env: + cache-name: cache-node-modules + + with: + # npm cache files are stored in `~/.npm` on Linux/macOS + path: ~/.npm + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} + restore-keys: | + ${{ runner.os }}-build-${{ env.cache-name }}- + ${{ runner.os }}-build- + ${{ runner.os }}- + - name: Set env + run: echo "NODE_ENV=test" >> $GITHUB_ENV + - name: Cypress run + uses: cypress-io/github-action@v2 + with: + start: | + npm run start:xcdb-api:cache + npm run start:web-v2 + docker-compose -f ./scripts/docker-compose-cypress.yml up -d + spec: "./scripts/cypress-v2/integration/test/xcdb-restRoles.js" + wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/entry.mjs" + wait-on-timeout: 1200 + config-file: scripts/cypress-v2/cypress.json + - name: Upload screenshots + if: always() + uses: actions/upload-artifact@v2 + with: + name: cypress-xcdb-restRoles-run-cache-snapshots + path: scripts/cypress-v2/screenshots + retention-days: 2 + cypress-xcdb-restMisc-run-cache: + runs-on: ubuntu-20.04 + steps: + - name: Setup Node + uses: actions/setup-node@v1 + with: + node-version: 16.15.0 + - name: Checkout + uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Cache node modules + uses: actions/cache@v2 + env: + cache-name: cache-node-modules + + with: + # npm cache files are stored in `~/.npm` on Linux/macOS + path: ~/.npm + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} + restore-keys: | + ${{ runner.os }}-build-${{ env.cache-name }}- + ${{ runner.os }}-build- + ${{ runner.os }}- + - name: Set env + run: echo "NODE_ENV=test" >> $GITHUB_ENV + - name: Cypress run + uses: cypress-io/github-action@v2 + with: + start: | + npm run start:xcdb-api:cache + npm run start:web-v2 + docker-compose -f ./scripts/docker-compose-cypress.yml up -d + spec: "./scripts/cypress-v2/integration/test/xcdb-restMisc.js" + wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/entry.mjs" + wait-on-timeout: 1200 + config-file: scripts/cypress-v2/cypress.json + - name: Upload screenshots + if: always() + uses: actions/upload-artifact@v2 + with: + name: cypress-xcdb-restMisc-run-cache-snapshots + path: scripts/cypress-v2/screenshots + retention-days: 2 + cy-quick-sqlite: + runs-on: ubuntu-20.04 + steps: + - name: Setup Node + uses: actions/setup-node@v1 + with: + node-version: 16.15.0 + - name: Checkout + uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Cache node modules + uses: actions/cache@v2 + env: + cache-name: cache-node-modules + + with: + # npm cache files are stored in `~/.npm` on Linux/macOS + path: ~/.npm + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} + restore-keys: | + ${{ runner.os }}-build-${{ env.cache-name }}- + ${{ runner.os }}-build- + ${{ runner.os }}- + - name: Set env + run: echo "NODE_ENV=test" >> $GITHUB_ENV + - name: Cypress run + uses: cypress-io/github-action@v2 + with: + start: | + cp ./scripts/cypress/fixtures/quickTest/noco_0_91_7.db ./packages/nocodb/noco.db + npm run start:api:cache + npm run start:web-v2 + docker-compose -f ./scripts/docker-compose-cypress.yml up -d + spec: "./scripts/cypress-v2/integration/test/quickTest.js" + wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/entry.mjs" + wait-on-timeout: 1200 + config-file: scripts/cypress-v2/cypress.json + - name: Upload screenshots + if: always() + uses: actions/upload-artifact@v2 + with: + name: cy-quick-sqlite-snapshots + path: scripts/cypress-v2/screenshots + retention-days: 2 + cy-quick-pg: + runs-on: ubuntu-20.04 + steps: + - name: Setup Node + uses: actions/setup-node@v1 + with: + node-version: 16.15.0 + - name: Checkout + uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Cache node modules + uses: actions/cache@v2 + env: + cache-name: cache-node-modules + + with: + # npm cache files are stored in `~/.npm` on Linux/macOS + path: ~/.npm + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} + restore-keys: | + ${{ runner.os }}-build-${{ env.cache-name }}- + ${{ runner.os }}-build- + ${{ runner.os }}- + - name: Set env + run: echo "NODE_ENV=test" >> $GITHUB_ENV + - name: Cypress run + uses: cypress-io/github-action@v2 + with: + start: | + docker-compose -f ./scripts/cypress/docker-compose-pg-cy-quick.yml up -d + npm run start:api:cache:pg:cyquick + npm run start:web-v2 + spec: "./scripts/cypress-v2/integration/test/quickTest.js" + wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/entry.mjs" + wait-on-timeout: 1200 + config-file: scripts/cypress-v2/cypress.json + - name: Upload screenshots + if: always() + uses: actions/upload-artifact@v2 + with: + name: cy-quick-pg-snapshots + path: scripts/cypress-v2/screenshots + retention-days: 2 diff --git a/package.json b/package.json index 074ce4f335..ec8f1794e3 100644 --- a/package.json +++ b/package.json @@ -22,8 +22,10 @@ "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: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", "cypress:open": "cypress open --config-file ./scripts/cypress/cypress.json", + "cypress-v2:open": "cypress open --config-file ./scripts/cypress-v2/cypress.json", "cypress:clear": "cypress cache clear", "test:travis": "git log --pretty=format:'%h' -n 1 --skip 1 | xargs lerna run test:travis --since", "lerna:install": "git log --pretty=format:'%h' -n 1 --skip 1 | xargs lerna bootstrap --ignore nc-cli --since", diff --git a/scripts/cypress-v2/cypress.json b/scripts/cypress-v2/cypress.json index a721aad21c..fc61d497d9 100644 --- a/scripts/cypress-v2/cypress.json +++ b/scripts/cypress-v2/cypress.json @@ -41,12 +41,12 @@ "sharedBase": "https://airtable.com/shr4z0qmh6dg5s3eB" } }, - "fixturesFolder": "scripts/cypress/fixtures", - "integrationFolder": "scripts/cypress/integration", - "pluginsFile": "scripts/cypress/plugins/index.js", - "screenshotsFolder": "scripts/cypress/screenshots", - "videosFolder": "scripts/cypress/videos", - "downloadsFolder": "scripts/cypress/downloads", - "supportFile": "scripts/cypress/support/index.js", + "fixturesFolder": "scripts/cypress-v2/fixtures", + "integrationFolder": "scripts/cypress-v2/integration", + "pluginsFile": "scripts/cypress-v2/plugins/index.js", + "screenshotsFolder": "scripts/cypress-v2/screenshots", + "videosFolder": "scripts/cypress-v2/videos", + "downloadsFolder": "scripts/cypress-v2/downloads", + "supportFile": "scripts/cypress-v2/support/index.js", "chromeWebSecurity": false } diff --git a/scripts/cypress-v2/integration/common/8a_webhook.js b/scripts/cypress-v2/integration/common/8a_webhook.js index 74f70c6ad3..a28652b01e 100644 --- a/scripts/cypress-v2/integration/common/8a_webhook.js +++ b/scripts/cypress-v2/integration/common/8a_webhook.js @@ -157,8 +157,8 @@ function clearServerData() { } function addNewRow(index, cellValue) { - cy.get(".nc-add-row:visible").should("exist"); - cy.get(".nc-add-row").click(); + cy.get(".nc-add-new-row-btn:visible").should("exist"); + cy.get(".nc-add-new-row-btn").click(); cy.wait(1000); cy.get(".nc-expand-col-Title").find(".nc-cell > input").first().type(cellValue); cy.getActiveModal() diff --git a/scripts/cypress-v2/integration/spec/roleValidation.spec.js b/scripts/cypress-v2/integration/spec/roleValidation.spec.js index b0cb0215f8..6da7fd4d27 100644 --- a/scripts/cypress-v2/integration/spec/roleValidation.spec.js +++ b/scripts/cypress-v2/integration/spec/roleValidation.spec.js @@ -83,7 +83,7 @@ export function _editData(roleType, mode) { cy.openTableTab(columnName, 25); // add row - cy.get('.nc-add-row:visible').should(validationString); + cy.get('.nc-add-new-row-btn:visible').should(validationString); mainPage.getCell(columnName, 25).scrollIntoView(); // cy.get('.nc-grid-add-new-cell').scrollIntoView(); diff --git a/scripts/cypress-v2/support/page_objects/navigation.js b/scripts/cypress-v2/support/page_objects/navigation.js index e31053efbd..2e60061475 100644 --- a/scripts/cypress-v2/support/page_objects/navigation.js +++ b/scripts/cypress-v2/support/page_objects/navigation.js @@ -154,6 +154,8 @@ export class _projectsPage { cy.get('.nc-extdb-proj-name').should('exist'); cy.get('.nc-extdb-btn-test-connection').should('exist'); + // CY goes too fast at times, so wait for the page to load + cy.wait(1000); cy.get('.nc-extdb-proj-name').clear().type(projectName);