From 443206bc0a9dfc61c19eafacd78e4cc880fcbc1a Mon Sep 17 00:00:00 2001 From: Marcos Defendi Date: Tue, 5 Dec 2023 06:46:20 -0300 Subject: [PATCH 1/4] test: skip some api tests to check api coverage --- apps/meteor/tests/end-to-end/api/01-users.js | 2 +- apps/meteor/tests/end-to-end/api/02-channels.js | 2 +- apps/meteor/tests/end-to-end/api/03-groups.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/meteor/tests/end-to-end/api/01-users.js b/apps/meteor/tests/end-to-end/api/01-users.js index eaafc97527a3..d5b596fa25cd 100644 --- a/apps/meteor/tests/end-to-end/api/01-users.js +++ b/apps/meteor/tests/end-to-end/api/01-users.js @@ -30,7 +30,7 @@ async function joinChannel(userCredentials, roomId) { const targetUser = {}; -describe('[Users]', function () { +describe.skip('[Users]', function () { this.retries(0); before((done) => getCredentials(done)); diff --git a/apps/meteor/tests/end-to-end/api/02-channels.js b/apps/meteor/tests/end-to-end/api/02-channels.js index 6976caa849bf..77ac970a1f7d 100644 --- a/apps/meteor/tests/end-to-end/api/02-channels.js +++ b/apps/meteor/tests/end-to-end/api/02-channels.js @@ -24,7 +24,7 @@ function getRoomInfo(roomId) { }); } -describe('[Channels]', function () { +describe.skip('[Channels]', function () { this.retries(0); before((done) => getCredentials(done)); diff --git a/apps/meteor/tests/end-to-end/api/03-groups.js b/apps/meteor/tests/end-to-end/api/03-groups.js index df736ecbeb86..203334954987 100644 --- a/apps/meteor/tests/end-to-end/api/03-groups.js +++ b/apps/meteor/tests/end-to-end/api/03-groups.js @@ -24,7 +24,7 @@ function getRoomInfo(roomId) { }); } -describe('[Groups]', function () { +describe.skip('[Groups]', function () { this.retries(0); before((done) => getCredentials(done)); From 669d51ca86b3f34ba0ecfbfea721706b0089d823 Mon Sep 17 00:00:00 2001 From: Marcos Defendi Date: Tue, 5 Dec 2023 08:26:58 -0300 Subject: [PATCH 2/4] test: skip other cases --- apps/meteor/tests/end-to-end/api/01-users.js | 2 +- apps/meteor/tests/end-to-end/api/02-channels.js | 2 +- apps/meteor/tests/end-to-end/api/03-groups.js | 2 +- apps/meteor/tests/end-to-end/api/30-calendar.ts | 2 +- apps/meteor/tests/end-to-end/api/31-failed-login-attempts.ts | 2 +- apps/meteor/tests/end-to-end/api/32-assets.ts | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/meteor/tests/end-to-end/api/01-users.js b/apps/meteor/tests/end-to-end/api/01-users.js index d5b596fa25cd..eaafc97527a3 100644 --- a/apps/meteor/tests/end-to-end/api/01-users.js +++ b/apps/meteor/tests/end-to-end/api/01-users.js @@ -30,7 +30,7 @@ async function joinChannel(userCredentials, roomId) { const targetUser = {}; -describe.skip('[Users]', function () { +describe('[Users]', function () { this.retries(0); before((done) => getCredentials(done)); diff --git a/apps/meteor/tests/end-to-end/api/02-channels.js b/apps/meteor/tests/end-to-end/api/02-channels.js index 77ac970a1f7d..6976caa849bf 100644 --- a/apps/meteor/tests/end-to-end/api/02-channels.js +++ b/apps/meteor/tests/end-to-end/api/02-channels.js @@ -24,7 +24,7 @@ function getRoomInfo(roomId) { }); } -describe.skip('[Channels]', function () { +describe('[Channels]', function () { this.retries(0); before((done) => getCredentials(done)); diff --git a/apps/meteor/tests/end-to-end/api/03-groups.js b/apps/meteor/tests/end-to-end/api/03-groups.js index 203334954987..df736ecbeb86 100644 --- a/apps/meteor/tests/end-to-end/api/03-groups.js +++ b/apps/meteor/tests/end-to-end/api/03-groups.js @@ -24,7 +24,7 @@ function getRoomInfo(roomId) { }); } -describe.skip('[Groups]', function () { +describe('[Groups]', function () { this.retries(0); before((done) => getCredentials(done)); diff --git a/apps/meteor/tests/end-to-end/api/30-calendar.ts b/apps/meteor/tests/end-to-end/api/30-calendar.ts index 73c534d98ebd..cc2e5db64437 100644 --- a/apps/meteor/tests/end-to-end/api/30-calendar.ts +++ b/apps/meteor/tests/end-to-end/api/30-calendar.ts @@ -6,7 +6,7 @@ import { getCredentials, api, request, credentials } from '../../data/api-data.j import { password } from '../../data/user'; import { createUser, login } from '../../data/users.helper'; -describe('[Calendar Events]', function () { +describe.skip('[Calendar Events]', function () { this.retries(0); let user2: Awaited> | undefined; diff --git a/apps/meteor/tests/end-to-end/api/31-failed-login-attempts.ts b/apps/meteor/tests/end-to-end/api/31-failed-login-attempts.ts index 92ea1ac56ed3..84aad218b3bf 100644 --- a/apps/meteor/tests/end-to-end/api/31-failed-login-attempts.ts +++ b/apps/meteor/tests/end-to-end/api/31-failed-login-attempts.ts @@ -7,7 +7,7 @@ import { updateSetting, updatePermission } from '../../data/permissions.helper'; import { password } from '../../data/user'; import { createUser, deleteUser } from '../../data/users.helper'; -describe('[Failed Login Attempts]', function () { +describe.skip('[Failed Login Attempts]', function () { this.retries(0); const maxAttemptsByUser = 2; diff --git a/apps/meteor/tests/end-to-end/api/32-assets.ts b/apps/meteor/tests/end-to-end/api/32-assets.ts index 76c24a99765b..ce11e2e12106 100644 --- a/apps/meteor/tests/end-to-end/api/32-assets.ts +++ b/apps/meteor/tests/end-to-end/api/32-assets.ts @@ -2,7 +2,7 @@ import { describe, it } from 'mocha'; import { request } from '../../data/api-data.js'; -describe('assets', function () { +describe.skip('assets', function () { this.retries(0); it('should always have CORS headers for assets', async () => { From 7840a9d8721a02d44c88d58f197aa8a6ed71c644 Mon Sep 17 00:00:00 2001 From: Marcos Defendi Date: Tue, 5 Dec 2023 16:27:56 -0300 Subject: [PATCH 3/4] ci: change codecov action version --- .github/workflows/ci-test-e2e.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-test-e2e.yml b/.github/workflows/ci-test-e2e.yml index eb7b228022c3..cb5706c0851f 100644 --- a/.github/workflows/ci-test-e2e.yml +++ b/.github/workflows/ci-test-e2e.yml @@ -254,7 +254,7 @@ jobs: working-directory: ./apps/meteor run: yarn test:e2e:nyc - - uses: codecov/codecov-action@v3 + - uses: codecov/codecov-action@v4 if: inputs.type == 'ui' && inputs.release == 'ee' with: directory: ./apps/meteor @@ -262,7 +262,7 @@ jobs: verbose: true token: ${{ secrets.CODECOV_TOKEN }} - - uses: codecov/codecov-action@v3 + - uses: codecov/codecov-action@v4 if: inputs.type == 'api' && inputs.release == 'ee' with: directory: /tmp/coverage From 081daf2b13d1e6194f984919e3070f9826c8fb20 Mon Sep 17 00:00:00 2001 From: Marcos Defendi Date: Wed, 6 Dec 2023 05:24:58 -0300 Subject: [PATCH 4/4] ci: undo action v4 --- .github/workflows/ci-test-e2e.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-test-e2e.yml b/.github/workflows/ci-test-e2e.yml index cb5706c0851f..eb7b228022c3 100644 --- a/.github/workflows/ci-test-e2e.yml +++ b/.github/workflows/ci-test-e2e.yml @@ -254,7 +254,7 @@ jobs: working-directory: ./apps/meteor run: yarn test:e2e:nyc - - uses: codecov/codecov-action@v4 + - uses: codecov/codecov-action@v3 if: inputs.type == 'ui' && inputs.release == 'ee' with: directory: ./apps/meteor @@ -262,7 +262,7 @@ jobs: verbose: true token: ${{ secrets.CODECOV_TOKEN }} - - uses: codecov/codecov-action@v4 + - uses: codecov/codecov-action@v3 if: inputs.type == 'api' && inputs.release == 'ee' with: directory: /tmp/coverage