From 08f478929df163797a3a92a78adc665d528cf489 Mon Sep 17 00:00:00 2001 From: Akim Mamedov Date: Tue, 8 Aug 2023 20:18:02 +0700 Subject: [PATCH 1/4] Fix test with node 18/20 error message --- .../js-peer/src/services/__test__/builtInHandler.spec.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/core/js-peer/src/services/__test__/builtInHandler.spec.ts b/packages/core/js-peer/src/services/__test__/builtInHandler.spec.ts index 9516aaec5..9209f550c 100644 --- a/packages/core/js-peer/src/services/__test__/builtInHandler.spec.ts +++ b/packages/core/js-peer/src/services/__test__/builtInHandler.spec.ts @@ -129,6 +129,12 @@ describe('Tests for default handler', () => { // act const fn = builtInServices[req.serviceId][req.fnName]; const res = await fn(req); + + // Our test cases above depends on node error message. In node 20 it changes. + // Simple and fast solution for this specific case is to unify both variations into node 18 version format. + if (result === 'Unexpected token \'i\', "incorrent" is not valid JSON') { + result = 'Unexpected token i in JSON at position 0'; + } // assert expect(res).toMatchObject({ From add29172d4b203aaa6eaedc452a3645ca98e432a Mon Sep 17 00:00:00 2001 From: Anatoly Laskaris Date: Tue, 8 Aug 2023 16:19:54 +0300 Subject: [PATCH 2/4] Run tests on node 18 and 20 --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f451d2f45..942717340 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -37,8 +37,8 @@ jobs: strategy: matrix: node-version: - - 16.x - 18.x + - 20.x steps: - name: Import secrets From ef9b949af3b4856496412623b8cc8666df67cc6c Mon Sep 17 00:00:00 2001 From: Akim Mamedov Date: Tue, 8 Aug 2023 20:20:44 +0700 Subject: [PATCH 3/4] Enhance description --- .../core/js-peer/src/services/__test__/builtInHandler.spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/core/js-peer/src/services/__test__/builtInHandler.spec.ts b/packages/core/js-peer/src/services/__test__/builtInHandler.spec.ts index 9209f550c..89ee91bfa 100644 --- a/packages/core/js-peer/src/services/__test__/builtInHandler.spec.ts +++ b/packages/core/js-peer/src/services/__test__/builtInHandler.spec.ts @@ -130,8 +130,8 @@ describe('Tests for default handler', () => { const fn = builtInServices[req.serviceId][req.fnName]; const res = await fn(req); - // Our test cases above depends on node error message. In node 20 it changes. - // Simple and fast solution for this specific case is to unify both variations into node 18 version format. + // Our test cases above depend on node error message. In node 20 error message for JSON.parse has changed. + // Simple and fast solution for this specific case is to unify both variations into node 18 version error format. if (result === 'Unexpected token \'i\', "incorrent" is not valid JSON') { result = 'Unexpected token i in JSON at position 0'; } From b80f05ca6cf7a8948861cd0b81d8fafd6a7478c1 Mon Sep 17 00:00:00 2001 From: Akim Mamedov Date: Tue, 8 Aug 2023 20:25:15 +0700 Subject: [PATCH 4/4] Fix type and obj property --- .../core/js-peer/src/services/__test__/builtInHandler.spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/core/js-peer/src/services/__test__/builtInHandler.spec.ts b/packages/core/js-peer/src/services/__test__/builtInHandler.spec.ts index 89ee91bfa..993206707 100644 --- a/packages/core/js-peer/src/services/__test__/builtInHandler.spec.ts +++ b/packages/core/js-peer/src/services/__test__/builtInHandler.spec.ts @@ -132,8 +132,8 @@ describe('Tests for default handler', () => { // Our test cases above depend on node error message. In node 20 error message for JSON.parse has changed. // Simple and fast solution for this specific case is to unify both variations into node 18 version error format. - if (result === 'Unexpected token \'i\', "incorrent" is not valid JSON') { - result = 'Unexpected token i in JSON at position 0'; + if (res.result === 'Unexpected token \'i\', "incorrect" is not valid JSON') { + res.result = 'Unexpected token i in JSON at position 0'; } // assert