[chore] cypress folder re-org

Signed-off-by: Raju Udava <sivadstala@gmail.com>

.github/workflows/ci-cd.yml

@@ -4,22 +4,22 @@
 name: "CI/CD"
 on:
   push:
-    branches: [ master, cypress ]
+    branches: [master, cypress]
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
 jobs:
   cypress-rest--run:
     runs-on: ubuntu-20.04
     steps:
-     - name: Checkout
-       uses: actions/checkout@v2 
-       with:
-         fetch-depth: 0
-     - name: Check for update     
-       run: |
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Check for update
+        run: |
           echo "CHANGED=$([[ $(lerna ls --since ${{github.event.before}} | grep nc-gui) = nc-gui ]] && echo 'OK')" >> $GITHUB_ENV
-     -  name: Cache node modules
+      - name: Cache node modules
         uses: actions/cache@v2
         env:
           cache-name: cache-node-modules
@@ -33,28 +33,28 @@ jobs:
             ${{ runner.os }}-build-
             ${{ runner.os }}-
 
-     - name: Cypress run
-       if: ${{ env.CHANGED == 'OK' }}
-       uses: cypress-io/github-action@v2
-       with:
-         start: |
-           npm run start:api
-           npm run start:web
-           docker-compose -f ./scripts/docker-compose-cypress.yml up -d
-         spec: 'cypress/integration/test/masterSuiteRest.js'
-         wait-on: 'http://localhost:8080, http://localhost:3000/_nuxt/runtime.js'
-         wait-on-timeout: 1200
+      - name: Cypress run
+        if: ${{ env.CHANGED == 'OK' }}
+        uses: cypress-io/github-action@v2
+        with:
+          start: |
+            npm run start:api
+            npm run start:web
+            docker-compose -f ./scripts/docker-compose-cypress.yml up -d
+          spec: "./scripts/cypress/integration/test/masterSuiteRest.js"
+          wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/runtime.js"
+          wait-on-timeout: 1200
   cypress-graphql-run:
     runs-on: ubuntu-20.04
     steps:
-     - name: Checkout
-       uses: actions/checkout@v2
-       with:
-         fetch-depth: 0
-     - name: Check for update     
-       run: |
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Check for update
+        run: |
           echo "CHANGED=$([[ $(lerna ls --since ${{github.event.before}} | grep nc-gui) = nc-gui ]] && echo 'OK')" >> $GITHUB_ENV
-     -  name: Cache node modules
+      - name: Cache node modules
         uses: actions/cache@v2
         env:
           cache-name: cache-node-modules
@@ -67,45 +67,45 @@ jobs:
             ${{ runner.os }}-build-${{ env.cache-name }}-
             ${{ runner.os }}-build-
             ${{ runner.os }}-
-     - name: Cypress run
-       if: ${{ env.CHANGED == 'OK' }}
-       uses: cypress-io/github-action@v2
-       with:
-         start: |
-           npm run start:api
-           npm run start:web
-           docker-compose -f ./scripts/docker-compose-cypress.yml up -d
-         spec: 'cypress/integration/test/masterSuiteGql.js'
-         wait-on: 'http://localhost:8080, http://localhost:3000/_nuxt/runtime.js'
-         wait-on-timeout: 1200
+      - name: Cypress run
+        if: ${{ env.CHANGED == 'OK' }}
+        uses: cypress-io/github-action@v2
+        with:
+          start: |
+            npm run start:api
+            npm run start:web
+            docker-compose -f ./scripts/docker-compose-cypress.yml up -d
+          spec: "./scripts/cypress/integration/test/masterSuiteGql.js"
+          wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/runtime.js"
+          wait-on-timeout: 1200
   docker:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-    - name: Check for update
-      run: |
-        echo "CHANGED=$([[ $(lerna ls --since ${{github.event.before}} | grep nocodb) = nocodb ]] && echo 'OK')" >> $GITHUB_ENV
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Check for update
+        run: |
+          echo "CHANGED=$([[ $(lerna ls --since ${{github.event.before}} | grep nocodb) = nocodb ]] && echo 'OK')" >> $GITHUB_ENV
 
-    - name: Test Mysql REST APIs
-      if: ${{ env.CHANGED == 'OK' }}
-      run: cd ./packages/nocodb/  && docker-compose run xc-test-mysql
-    - name: Test Mysql GraphQL APIs
-      if: ${{ env.CHANGED == 'OK' }}
-      run: cd ./packages/nocodb/  && docker-compose run xc-test-gql-mysql
+      - name: Test Mysql REST APIs
+        if: ${{ env.CHANGED == 'OK' }}
+        run: cd ./packages/nocodb/  && docker-compose run xc-test-mysql
+      - name: Test Mysql GraphQL APIs
+        if: ${{ env.CHANGED == 'OK' }}
+        run: cd ./packages/nocodb/  && docker-compose run xc-test-gql-mysql
 
-#    - name: Test MSSQL REST APIs 
-#      run: cd ./packages/nocodb/  && docker-compose run xc-test-mssql
-#    - name: Test MSSQL GraphQL APIs
-#      run: cd ./packages/nocodb/  && docker-compose run xc-test-gql-mssql
-#
-    - name: Test PostgreSQL REST APIs
-      if: ${{ env.CHANGED == 'OK' }}
-      run: cd ./packages/nocodb/  && docker-compose run xc-test-pg
-    - name: Test PostgreSQL GraphQL APIs
-      if: ${{ env.CHANGED == 'OK' }}
-      run: cd ./packages/nocodb/  && docker-compose run xc-test-gql-pg
+      #    - name: Test MSSQL REST APIs
+      #      run: cd ./packages/nocodb/  && docker-compose run xc-test-mssql
+      #    - name: Test MSSQL GraphQL APIs
+      #      run: cd ./packages/nocodb/  && docker-compose run xc-test-gql-mssql
+      #
+      - name: Test PostgreSQL REST APIs
+        if: ${{ env.CHANGED == 'OK' }}
+        run: cd ./packages/nocodb/  && docker-compose run xc-test-pg
+      - name: Test PostgreSQL GraphQL APIs
+        if: ${{ env.CHANGED == 'OK' }}
+        run: cd ./packages/nocodb/  && docker-compose run xc-test-gql-pg
 #
 #    - name: Test SQLite3 REST APIs
 #      run: cd ./packages/nocodb/  && docker-compose run xc-test-sqlite

scripts/cypress/integration/common/6d_language_validation.js

@@ -15,7 +15,7 @@ export const genTest = (type, xcdb) => {
         const langVerification = (idx, lang) => {
             // pick json from the file specified
             it(`Language verification: ${lang} > Projects page`, () => {
-                let json = require(`../../../packages/nc-gui/lang/${lang}`);
+                let json = require(`../../../../packages/nc-gui/lang/${lang}`);
             
                 // toggle menu as per index
                 cy.get('.nc-menu-translate').click()

scripts/cypress/support/page_objects/mainPage.js

@@ -61,7 +61,7 @@ export class _mainPage {
         //
         cy.getActiveMenu().contains(roleType).click()
         cy.getActiveMenu().contains('editor').click()
-        cy.get('.mdi-menu-down').click()
+        cy.get('.mdi-menu-down').last().click()
         cy.get('.nc-invite-or-save-btn').click()
 
         // get URL, invoke