Browse Source

Revert "temp"

This reverts commit f4ec200973.
pull/6489/head
Pranav C 1 year ago
parent
commit
08a961e76c
  1. 10
      .github/workflows/ci-cd.yml
  2. 5
      packages/nocodb/tests/unit/rest/tests/groupby.test.ts

10
.github/workflows/ci-cd.yml

@ -130,7 +130,7 @@ jobs:
uses: ./.github/workflows/playwright-test-workflow.yml uses: ./.github/workflows/playwright-test-workflow.yml
with: with:
db: mysql db: mysql
shard: 4 shard: 4
playwright-sqlite-1: playwright-sqlite-1:
needs: pre-build-for-playwright needs: pre-build-for-playwright
if: ${{ github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'trigger-CI') || !github.event.pull_request.draft }} if: ${{ github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'trigger-CI') || !github.event.pull_request.draft }}
@ -151,14 +151,14 @@ jobs:
uses: ./.github/workflows/playwright-test-workflow.yml uses: ./.github/workflows/playwright-test-workflow.yml
with: with:
db: sqlite db: sqlite
shard: 3 shard: 3
playwright-sqlite-4: playwright-sqlite-4:
needs: pre-build-for-playwright needs: pre-build-for-playwright
if: ${{ github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'trigger-CI') || !github.event.pull_request.draft }} if: ${{ github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'trigger-CI') || !github.event.pull_request.draft }}
uses: ./.github/workflows/playwright-test-workflow.yml uses: ./.github/workflows/playwright-test-workflow.yml
with: with:
db: sqlite db: sqlite
shard: 4 shard: 4
playwright-pg-shard-1: playwright-pg-shard-1:
needs: pre-build-for-playwright needs: pre-build-for-playwright
if: ${{ github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'trigger-CI') || !github.event.pull_request.draft }} if: ${{ github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'trigger-CI') || !github.event.pull_request.draft }}
@ -179,11 +179,11 @@ jobs:
uses: ./.github/workflows/playwright-test-workflow.yml uses: ./.github/workflows/playwright-test-workflow.yml
with: with:
db: pg db: pg
shard: 3 shard: 3
playwright-pg-shard-4: playwright-pg-shard-4:
needs: pre-build-for-playwright needs: pre-build-for-playwright
if: ${{ github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'trigger-CI') || !github.event.pull_request.draft }} if: ${{ github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'trigger-CI') || !github.event.pull_request.draft }}
uses: ./.github/workflows/playwright-test-workflow.yml uses: ./.github/workflows/playwright-test-workflow.yml
with: with:
db: pg db: pg
shard: 4 shard: 4

5
packages/nocodb/tests/unit/rest/tests/groupby.test.ts

@ -273,9 +273,6 @@ function groupByTests() {
sort: `-LanguageName`, sort: `-LanguageName`,
}) })
.expect(200); .expect(200);
console.log(JSON.stringify(response.body.list, null, 2));
assert.match(response.body.list[0]['LanguageName'], /^English/); assert.match(response.body.list[0]['LanguageName'], /^English/);
expect(+response.body.list[0]['count']).to.equal(1000); expect(+response.body.list[0]['count']).to.equal(1000);
expect(response.body.list.length).to.equal(1); expect(response.body.list.length).to.equal(1);
@ -342,8 +339,6 @@ function groupByTests() {
}) })
.expect(200); .expect(200);
console.log(JSON.stringify(res.body.list, null, 2));
expect(res.body.list.length).to.equal(5); expect(res.body.list.length).to.equal(5);
expect(res.body.list[0][nestedFormulaColumnTitle]).to.be.gte( expect(res.body.list[0][nestedFormulaColumnTitle]).to.be.gte(
res.body.list[0][nestedFormulaColumnTitle], res.body.list[0][nestedFormulaColumnTitle],

Loading…
Cancel
Save