From 7d1500f85a95bea32e30837a2e07aebd47b7f2eb Mon Sep 17 00:00:00 2001 From: Muhammed Mustafa Date: Wed, 9 Nov 2022 20:46:16 +0530 Subject: [PATCH] fix(test): Fixed issues with playwright folder change --- .github/workflows/playwright-test-workflow.yml | 2 +- ...mpose-playwright.yml => docker-compose-mysql-playwright.yml} | 2 +- .../tests/playwright/scripts/docker-compose-pg-pw-quick.yml | 2 +- packages/nc-gui/tests/playwright/scripts/docker-compose-pg.yml | 2 +- packages/nc-gui/tests/playwright/setup/db.ts | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename packages/nc-gui/tests/playwright/scripts/{docker-compose-playwright.yml => docker-compose-mysql-playwright.yml} (78%) diff --git a/.github/workflows/playwright-test-workflow.yml b/.github/workflows/playwright-test-workflow.yml index 0cb29e5402..1893b7db07 100644 --- a/.github/workflows/playwright-test-workflow.yml +++ b/.github/workflows/playwright-test-workflow.yml @@ -57,7 +57,7 @@ jobs: - name: setup mysql if: ${{ inputs.db == 'mysql' }} working-directory: ./ - run: docker-compose -f ./packages/nc-gui/tests/playwright/scripts/docker-compose-playwright.yml up -d & + run: docker-compose -f ./packages/nc-gui/tests/playwright/scripts/docker-compose-mysql-playwright.yml up -d & - name: setup pg if: ${{ inputs.db == 'pg' }} working-directory: ./ diff --git a/packages/nc-gui/tests/playwright/scripts/docker-compose-playwright.yml b/packages/nc-gui/tests/playwright/scripts/docker-compose-mysql-playwright.yml similarity index 78% rename from packages/nc-gui/tests/playwright/scripts/docker-compose-playwright.yml rename to packages/nc-gui/tests/playwright/scripts/docker-compose-mysql-playwright.yml index bed648a8b2..72c259926e 100644 --- a/packages/nc-gui/tests/playwright/scripts/docker-compose-playwright.yml +++ b/packages/nc-gui/tests/playwright/scripts/docker-compose-mysql-playwright.yml @@ -11,4 +11,4 @@ services: environment: MYSQL_ROOT_PASSWORD: password volumes: - - ../../../../packages/nocodb/tests/mysql-sakila-db:/docker-entrypoint-initdb.d \ No newline at end of file + - ../../../../../packages/nocodb/tests/mysql-sakila-db:/docker-entrypoint-initdb.d \ No newline at end of file diff --git a/packages/nc-gui/tests/playwright/scripts/docker-compose-pg-pw-quick.yml b/packages/nc-gui/tests/playwright/scripts/docker-compose-pg-pw-quick.yml index d3c0503724..4f568de089 100644 --- a/packages/nc-gui/tests/playwright/scripts/docker-compose-pg-pw-quick.yml +++ b/packages/nc-gui/tests/playwright/scripts/docker-compose-pg-pw-quick.yml @@ -9,7 +9,7 @@ services: ports: - 5432:5432 volumes: - - ../../../../packages/nocodb/tests/pg-cy-quick:/docker-entrypoint-initdb.d + - ../../../../../packages/nocodb/tests/pg-cy-quick:/docker-entrypoint-initdb.d healthcheck: test: ["CMD-SHELL", "pg_isready -U postgres"] interval: 10s diff --git a/packages/nc-gui/tests/playwright/scripts/docker-compose-pg.yml b/packages/nc-gui/tests/playwright/scripts/docker-compose-pg.yml index 03965794e9..e8c0cc1a06 100644 --- a/packages/nc-gui/tests/playwright/scripts/docker-compose-pg.yml +++ b/packages/nc-gui/tests/playwright/scripts/docker-compose-pg.yml @@ -9,7 +9,7 @@ services: ports: - 5432:5432 volumes: - - ../../../packages/nocodb/tests/pg-sakila-db:/docker-entrypoint-initdb.d + - ../../../../../packages/nocodb/tests/pg-sakila-db:/docker-entrypoint-initdb.d healthcheck: test: ["CMD-SHELL", "pg_isready -U postgres"] interval: 10s diff --git a/packages/nc-gui/tests/playwright/setup/db.ts b/packages/nc-gui/tests/playwright/setup/db.ts index 8b61ccc4c5..9b65a1262c 100644 --- a/packages/nc-gui/tests/playwright/setup/db.ts +++ b/packages/nc-gui/tests/playwright/setup/db.ts @@ -53,7 +53,7 @@ const mysqlExec = async query => { async function sqliteExec(query) { const parallelIndex = process.env.TEST_PARALLEL_INDEX; - const rootProjectDir = __dirname.replace('/scripts/playwright/setup', ''); + const rootProjectDir = __dirname.replace('/packages/nc-gui/tests/playwright/setup', ''); await sqliteDb.open(`${rootProjectDir}/packages/nocodb/test_sakila_${parallelIndex}.db`); await sqliteDb.run(query);