diff --git a/cypress/support/commands.js b/cypress/support/commands.js index 39bbad5454..a4a75bb897 100644 --- a/cypress/support/commands.js +++ b/cypress/support/commands.js @@ -42,8 +42,6 @@ Cypress.Commands.add('openOrCreateRestProject', () => { cy.get('input[type="text"]').type('pranavc@gmail.com'); cy.get('input[type="password"]').type('Password123.'); cy.get('button:contains("SIGN UP")').click() - - // handle signin } else { cy.get('input[type="text"]').type('pranavc@gmail.com'); cy.get('input[type="password"]').type('Password123.'); diff --git a/docker-compose-cypress.yml b/docker-compose-cypress.yml index 3df218e41e..aece8e5274 100644 --- a/docker-compose-cypress.yml +++ b/docker-compose-cypress.yml @@ -11,18 +11,19 @@ services: - ./packages/nocodb/tests/mysql-sakila-db:/docker-entrypoint-initdb.d xc-cypress-nocodb: network_mode: host - image: node:12.22.1-slim + image: node:14-alpine volumes: - ./packages/nocodb:/home/app command: - - /bin/bash + - /bin/sh - -c - | echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" - cd /home/app/ && rm package-lock.json && npm i && npm run run + rm /home/app/package-lock.json + cd /home/app/ && npm i && npm run run xc-cypress-nc-gui: network_mode: host - image: node:12.22.1-slim + image: node:14-alpine environment: - HOST=0.0.0.0 - PORT=3000 @@ -30,9 +31,10 @@ services: - ./packages/nc-gui:/home/app - ./packages/nc-lib-gui:/home/nc-lib-gui command: - - /bin/bash + - /bin/sh - -c - | echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" + apk --update --no-cache add git rm /home/app/package-lock.json cd /home/app/ && npm i && npm run dev diff --git a/packages/nc-gui/package.json b/packages/nc-gui/package.json index 7a117c9ca7..63a56c5027 100644 --- a/packages/nc-gui/package.json +++ b/packages/nc-gui/package.json @@ -64,7 +64,6 @@ "@nuxtjs/eslint-config": "^6.0.1", "@nuxtjs/vuetify": "^1.11.2", "babel-eslint": "^10.1.0", - "cypress": "^7.3.0", "eslint": "^7.31.0", "monaco-editor-webpack-plugin": "^1.9.1", "sass": "~1.32.12",