diff --git a/.github/workflows/playwright-test-workflow.yml b/.github/workflows/playwright-test-workflow.yml index 8947773b96..b3b0026d62 100644 --- a/.github/workflows/playwright-test-workflow.yml +++ b/.github/workflows/playwright-test-workflow.yml @@ -94,62 +94,59 @@ jobs: sleep 2 done - # - name: Run Playwright tests - # working-directory: ./tests/playwright - # run: E2E_DB_TYPE=${{ inputs.db }} npm run ci:test:shard:${{ inputs.shard }} + - name: Run Playwright tests + working-directory: ./tests/playwright + run: E2E_DB_TYPE=${{ inputs.db }} npm run ci:test:shard:${{ inputs.shard }} # Stress test added/modified tests - name: Fetch develop branch working-directory: ./tests/playwright run: git fetch origin develop - # - name: Pull develop branch - # working-directory: ./tests/playwright - # run: git pull origin develop - name: Stress test working-directory: ./tests/playwright run: E2E_DB_TYPE=${{ inputs.db }} node ./scripts/stressTestNewlyAddedTest.js # Quick tests (pg on sqlite shard 0 and sqlite on sqlite shard 1) - # - name: Run quick server and tests (pg) - # if: ${{ inputs.db == 'sqlite' && inputs.shard == '1' }} - # working-directory: ./packages/nocodb - # run: | - # kill -9 $(lsof -t -i:8080) - # npm run watch:run:playwright:pg:cyquick & - # - name: Run quick server and tests (sqlite) - # if: ${{ inputs.db == 'sqlite' && inputs.shard == '2' }} - # working-directory: ./packages/nocodb - # run: | - # kill -9 $(lsof -t -i:8080) - # npm run watch:run:playwright:quick > quick_${{ inputs.shard }}_test_backend.log & - # - name: Wait for backend & run quick tests - # if: ${{ inputs.db == 'sqlite' }} - # working-directory: ./tests/playwright - # run: | - # while ! curl --output /dev/null --silent --head --fail http://localhost:8080; do - # printf '.' - # sleep 2 - # done - # PLAYWRIGHT_HTML_REPORT=playwright-report-quick npm run test:quick - # - uses: actions/upload-artifact@v3 - # if: ${{ inputs.db == 'sqlite' }} - # with: - # name: quick-backend-log-${{ inputs.shard }} - # path: ./packages/nocodb/quick_${{ inputs.shard }}_test_backend.log - # retention-days: 2 - # - uses: actions/upload-artifact@v3 - # if: ${{ inputs.db == 'sqlite' }} - # with: - # name: playwright-report-quick-${{ inputs.shard }} - # path: ./tests/playwright/playwright-report-quick/ - # retention-days: 2 + - name: Run quick server and tests (pg) + if: ${{ inputs.db == 'sqlite' && inputs.shard == '1' }} + working-directory: ./packages/nocodb + run: | + kill -9 $(lsof -t -i:8080) + npm run watch:run:playwright:pg:cyquick & + - name: Run quick server and tests (sqlite) + if: ${{ inputs.db == 'sqlite' && inputs.shard == '2' }} + working-directory: ./packages/nocodb + run: | + kill -9 $(lsof -t -i:8080) + npm run watch:run:playwright:quick > quick_${{ inputs.shard }}_test_backend.log & + - name: Wait for backend & run quick tests + if: ${{ inputs.db == 'sqlite' }} + working-directory: ./tests/playwright + run: | + while ! curl --output /dev/null --silent --head --fail http://localhost:8080; do + printf '.' + sleep 2 + done + PLAYWRIGHT_HTML_REPORT=playwright-report-quick npm run test:quick + - uses: actions/upload-artifact@v3 + if: ${{ inputs.db == 'sqlite' }} + with: + name: quick-backend-log-${{ inputs.shard }} + path: ./packages/nocodb/quick_${{ inputs.shard }}_test_backend.log + retention-days: 2 + - uses: actions/upload-artifact@v3 + if: ${{ inputs.db == 'sqlite' }} + with: + name: playwright-report-quick-${{ inputs.shard }} + path: ./tests/playwright/playwright-report-quick/ + retention-days: 2 - # - uses: actions/upload-artifact@v3 - # if: always() - # with: - # name: playwright-report-${{ inputs.db }}-${{ inputs.shard }} - # path: ./tests/playwright/playwright-report/ - # retention-days: 2 + - uses: actions/upload-artifact@v3 + if: always() + with: + name: playwright-report-${{ inputs.db }}-${{ inputs.shard }} + path: ./tests/playwright/playwright-report/ + retention-days: 2 - uses: actions/upload-artifact@v3 if: always() with: diff --git a/tests/playwright/tests/columnSingleSelect.spec.ts b/tests/playwright/tests/columnSingleSelect.spec.ts index e60c0c4ea7..2b2d737889 100644 --- a/tests/playwright/tests/columnSingleSelect.spec.ts +++ b/tests/playwright/tests/columnSingleSelect.spec.ts @@ -70,19 +70,7 @@ test.describe('Single select', () => { await grid.column.delete({ title: 'SingleSelect' }); }); - test('Old Add new option directly from cell', async () => { - await grid.cell.selectOption.addNewOption({ - index: 0, - columnHeader: 'SingleSelect', - option: 'Option added from cell', - }); - - await grid.cell.selectOption.verify({ index: 0, columnHeader: 'SingleSelect', option: 'Option added from cell' }); - - await grid.column.delete({ title: 'SingleSelect' }); - }); - - test('New Add new option directly from cell', async () => { + test('Add new option directly from cell', async () => { await grid.cell.selectOption.addNewOption({ index: 0, columnHeader: 'SingleSelect', diff --git a/tests/playwright/tests/views.spec.ts b/tests/playwright/tests/views.spec.ts index 727d8e70b7..6db52ecc57 100644 --- a/tests/playwright/tests/views.spec.ts +++ b/tests/playwright/tests/views.spec.ts @@ -1,6 +1,5 @@ import { test } from '@playwright/test'; import { DashboardPage } from '../pages/Dashboard'; - import setup from '../setup'; test.describe('Views CRUD Operations', () => {