clone/nocodb
1
0
Fork 0
mirror of https://github.com/nocodb/nocodb.git synced 2026-04-25 06:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: move docker-compose-cypress.yml to cypress directory

Browse Source
This commit is contained in:
Wing-Kam Wong
2022-10-31 13:48:44 +08:00
parent 3063d85ac3
commit b9a4018764
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
.github/workflows/ci-cd.yml vendored
View File

@@ -59,7 +59,7 @@ jobs:
start: | start: |
npm run start:api:cache npm run start:api:cache
npm run start:web npm run start:web
docker-compose -f ./scripts/docker-compose-cypress.yml up -d docker-compose -f ./scripts/cypress/docker-compose-cypress.yml up -d
spec: "./scripts/cypress/integration/test/restTableOps.js" spec: "./scripts/cypress/integration/test/restTableOps.js"
wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/assets/img/icons/512x512-trans.png" wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/assets/img/icons/512x512-trans.png"
wait-on-timeout: 1200 wait-on-timeout: 1200
@@ -105,7 +105,7 @@ jobs:
start: | start: |
npm run start:api:cache npm run start:api:cache
npm run start:web npm run start:web
docker-compose -f ./scripts/docker-compose-cypress.yml up -d docker-compose -f ./scripts/cypress/docker-compose-cypress.yml up -d
spec: "./scripts/cypress/integration/test/restViews.js" spec: "./scripts/cypress/integration/test/restViews.js"
wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/assets/img/icons/512x512-trans.png" wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/assets/img/icons/512x512-trans.png"
wait-on-timeout: 1200 wait-on-timeout: 1200
@@ -151,7 +151,7 @@ jobs:
start: | start: |
npm run start:api:cache npm run start:api:cache
npm run start:web npm run start:web
docker-compose -f ./scripts/docker-compose-cypress.yml up -d docker-compose -f ./scripts/cypress/docker-compose-cypress.yml up -d
spec: "./scripts/cypress/integration/test/restRoles.js" spec: "./scripts/cypress/integration/test/restRoles.js"
wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/assets/img/icons/512x512-trans.png" wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/assets/img/icons/512x512-trans.png"
wait-on-timeout: 1200 wait-on-timeout: 1200
@@ -197,7 +197,7 @@ jobs:
start: | start: |
npm run start:api:cache npm run start:api:cache
npm run start:web npm run start:web
docker-compose -f ./scripts/docker-compose-cypress.yml up -d docker-compose -f ./scripts/cypress/docker-compose-cypress.yml up -d
spec: "./scripts/cypress/integration/test/restMisc.js" spec: "./scripts/cypress/integration/test/restMisc.js"
wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/assets/img/icons/512x512-trans.png" wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/assets/img/icons/512x512-trans.png"
wait-on-timeout: 1200 wait-on-timeout: 1200
@@ -243,7 +243,7 @@ jobs:
start: | start: |
npm run start:xcdb-api:cache npm run start:xcdb-api:cache
npm run start:web npm run start:web
docker-compose -f ./scripts/docker-compose-cypress.yml up -d docker-compose -f ./scripts/cypress/docker-compose-cypress.yml up -d
spec: "./scripts/cypress/integration/test/xcdb-restTableOps.js" spec: "./scripts/cypress/integration/test/xcdb-restTableOps.js"
wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/assets/img/icons/512x512-trans.png" wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/assets/img/icons/512x512-trans.png"
wait-on-timeout: 1200 wait-on-timeout: 1200
@@ -289,7 +289,7 @@ jobs:
start: | start: |
npm run start:xcdb-api:cache npm run start:xcdb-api:cache
npm run start:web npm run start:web
docker-compose -f ./scripts/docker-compose-cypress.yml up -d docker-compose -f ./scripts/cypress/docker-compose-cypress.yml up -d
spec: "./scripts/cypress/integration/test/xcdb-restViews.js" spec: "./scripts/cypress/integration/test/xcdb-restViews.js"
wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/assets/img/icons/512x512-trans.png" wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/assets/img/icons/512x512-trans.png"
wait-on-timeout: 1200 wait-on-timeout: 1200
@@ -335,7 +335,7 @@ jobs:
start: | start: |
npm run start:xcdb-api:cache npm run start:xcdb-api:cache
npm run start:web npm run start:web
docker-compose -f ./scripts/docker-compose-cypress.yml up -d docker-compose -f ./scripts/cypress/docker-compose-cypress.yml up -d
spec: "./scripts/cypress/integration/test/xcdb-restRoles.js" spec: "./scripts/cypress/integration/test/xcdb-restRoles.js"
wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/assets/img/icons/512x512-trans.png" wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/assets/img/icons/512x512-trans.png"
wait-on-timeout: 1200 wait-on-timeout: 1200
@@ -381,7 +381,7 @@ jobs:
start: | start: |
npm run start:xcdb-api:cache npm run start:xcdb-api:cache
npm run start:web npm run start:web
docker-compose -f ./scripts/docker-compose-cypress.yml up -d docker-compose -f ./scripts/cypress/docker-compose-cypress.yml up -d
spec: "./scripts/cypress/integration/test/xcdb-restMisc.js" spec: "./scripts/cypress/integration/test/xcdb-restMisc.js"
wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/assets/img/icons/512x512-trans.png" wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/assets/img/icons/512x512-trans.png"
wait-on-timeout: 1200 wait-on-timeout: 1200
@@ -612,7 +612,7 @@ jobs:
cp ./scripts/cypress/fixtures/quickTest/noco_0_91_7.db ./packages/nocodb/noco.db cp ./scripts/cypress/fixtures/quickTest/noco_0_91_7.db ./packages/nocodb/noco.db
npm run start:api:cache npm run start:api:cache
npm run start:web npm run start:web
docker-compose -f ./scripts/docker-compose-cypress.yml up -d docker-compose -f ./scripts/cypress/docker-compose-cypress.yml up -d
spec: "./scripts/cypress/integration/test/quickTest.js" spec: "./scripts/cypress/integration/test/quickTest.js"
wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/assets/img/icons/512x512-trans.png" wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/assets/img/icons/512x512-trans.png"
wait-on-timeout: 1200 wait-on-timeout: 1200
@@ -707,7 +707,7 @@ jobs:
run: npm install run: npm install
- name: setup mysql - name: setup mysql
working-directory: ./ working-directory: ./
run: docker-compose -f ./scripts/docker-compose-cypress.yml up -d run: docker-compose -f ./scripts/cypress/docker-compose-cypress.yml up -d
- name: run unit tests - name: run unit tests
working-directory: ./packages/nocodb working-directory: ./packages/nocodb
run: npm run test:unit run: npm run test:unit
@@ -745,7 +745,7 @@ jobs:
start: | start: |
npm run start:api:cache npm run start:api:cache
npm run start:web npm run start:web
docker-compose -f ./scripts/docker-compose-cypress.yml up -d docker-compose -f ./scripts/cypress/docker-compose-cypress.yml up -d
spec: "./scripts/cypress/integration/test/db-independent.js" spec: "./scripts/cypress/integration/test/db-independent.js"
wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/assets/img/icons/512x512-trans.png" wait-on: "http://localhost:8080, http://localhost:3000/_nuxt/assets/img/icons/512x512-trans.png"
wait-on-timeout: 1200 wait-on-timeout: 1200

6
packages/noco-docs/content/en/engineering/testing.md
View File

@@ -210,7 +210,7 @@ First 3 suites, each have 4 test category
# install dependencies(cypress) # install dependencies(cypress)
npm install npm install
# start MySQL database using docker compose # start MySQL database using docker compose
docker-compose -f ./scripts/docker-compose-cypress.yml up docker-compose -f ./scripts/cypress/docker-compose-cypress.yml up
# Run backend api using following command # Run backend api using following command
npm run start:xcdb-api:cache npm run start:xcdb-api:cache
@@ -234,7 +234,7 @@ npm run cypress:open
# install dependencies(cypress) # install dependencies(cypress)
npm install npm install
# start MySQL database using docker compose # start MySQL database using docker compose
docker-compose -f ./scripts/docker-compose-cypress.yml up docker-compose -f ./scripts/cypress/docker-compose-cypress.yml up
# Run backend api using following command # Run backend api using following command
npm run start:api:cache npm run start:api:cache
@@ -282,7 +282,7 @@ npm run cypress:open
# install dependencies(cypress) # install dependencies(cypress)
npm install npm install
# start MySQL database using docker compose # start MySQL database using docker compose
docker-compose -f ./scripts/docker-compose-cypress.yml up docker-compose -f ./scripts/cypress/docker-compose-cypress.yml up
# copy existing xcdb (v0.91.7) database to ./packages/nocodb/ # copy existing xcdb (v0.91.7) database to ./packages/nocodb/
cp ./scripts/cypress/fixtures/quickTest/noco_0_91_7.db ./packages/nocodb/noco.db cp ./scripts/cypress/fixtures/quickTest/noco_0_91_7.db ./packages/nocodb/noco.db

0
scripts/docker-compose-cypress.yml → scripts/cypress/docker-compose-cypress.yml
View File

2
scripts/markdown/readme/languages/chinese.md
View File

@@ -262,7 +262,7 @@ npm run dev
npm install npm install
# 使用 docker compose 运行带有所需数据库的 mysql 数据库 # 使用 docker compose 运行带有所需数据库的 mysql 数据库
docker-compose -f ./scripts/docker-compose-cypress.yml up docker-compose -f ./scripts/cypress/docker-compose-cypress.yml up
# 使用以下命令运行后端 api # 使用以下命令运行后端 api
npm run start:api npm run start:api

2
scripts/markdown/readme/languages/german.md
View File

@@ -244,7 +244,7 @@ npm run dev
npm install npm install
# MySQL-Datenbank mit der benötigten Datenbank mit Docker Compose ausführen # MySQL-Datenbank mit der benötigten Datenbank mit Docker Compose ausführen
docker-compose -f ./scripts/docker-compose-cypress.yml up docker-compose -f ./scripts/cypress/docker-compose-cypress.yml up
# Backend API mit folgendem Befehl ausführen # Backend API mit folgendem Befehl ausführen
npm run start:api npm run start:api