From e83da1449dfc3abea168b21e3f9f5c1e2ce93ff1 Mon Sep 17 00:00:00 2001 From: Jaco Date: Mon, 20 Feb 2023 12:42:11 +0200 Subject: [PATCH] Swap Jest test runner (#719) --- jest.config.cjs | 17 ----------------- package.json | 6 +++--- packages/ui-keyring/src/options/index.spec.ts | 6 +++--- .../src/icons/beachball/svg/circle.spec.ts | 4 ++-- .../src/icons/beachball/svg/element.spec.ts | 4 ++-- .../src/icons/beachball/svg/rect.spec.ts | 4 ++-- .../src/icons/beachball/svg/svg.spec.ts | 4 ++-- yarn.lock | 10 +++++----- 8 files changed, 19 insertions(+), 36 deletions(-) delete mode 100644 jest.config.cjs diff --git a/jest.config.cjs b/jest.config.cjs deleted file mode 100644 index d2e6cf68..00000000 --- a/jest.config.cjs +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright 2017-2023 @polkadot/ui authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -const config = require('@polkadot/dev/config/jest.cjs'); - -module.exports = { - ...config, - moduleNameMapper: { - '@polkadot/react-(identicon|qr)(.*)$': '/packages/react-$1/src/$2', - '@polkadot/reactnative-(identicon)(.*)$': '/packages/reactnative-$1/src/$2', - '@polkadot/ui-(assets|keyring|settings|shared)(.*)$': '/packages/ui-$1/src/$2', - '\\.(css|less)$': 'empty/object', - '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': 'empty/object' - }, - setupFilesAfterEnv: ['/jest/setupEnv.js'], - testEnvironment: 'jsdom' -}; diff --git a/package.json b/package.json index c93fd589..acd2cf6e 100644 --- a/package.json +++ b/package.json @@ -28,13 +28,13 @@ "example:vue": "yarn build && cd packages/example-vue && yarn polkadot-exec-webpack --config webpack.config.cjs", "lint": "polkadot-dev-run-lint", "postinstall": "polkadot-dev-yarn-only", - "test": "polkadot-dev-run-test --env jest -- --coverage --runInBand", - "test:one": "polkadot-dev-run-test" + "test": "polkadot-dev-run-test --env browser", + "test:one": "polkadot-dev-run-test --env browser" }, "devDependencies": { "@babel/core": "^7.20.12", "@babel/runtime": "^7.20.13", - "@polkadot/dev": "^0.68.40", + "@polkadot/dev": "^0.68.41", "@polkadot/x-bundle": "^10.4.2", "@types/jest": "^29.4.0", "babel-loader": "^8.3.0", diff --git a/packages/ui-keyring/src/options/index.spec.ts b/packages/ui-keyring/src/options/index.spec.ts index 46bf4e0e..f6338424 100644 --- a/packages/ui-keyring/src/options/index.spec.ts +++ b/packages/ui-keyring/src/options/index.spec.ts @@ -15,8 +15,8 @@ describe('KeyringOption', (): void => { keyringOption.init(state as KeyringStruct); // second call - expect((): void => { - keyringOption.init(state as KeyringStruct); - }).toThrowError('Unable to initialise options more than once'); + expect( + () => keyringOption.init(state as KeyringStruct) + ).toThrow('Unable to initialise options more than once'); }); }); diff --git a/packages/ui-shared/src/icons/beachball/svg/circle.spec.ts b/packages/ui-shared/src/icons/beachball/svg/circle.spec.ts index 4f59e6a3..34ca0742 100644 --- a/packages/ui-shared/src/icons/beachball/svg/circle.spec.ts +++ b/packages/ui-shared/src/icons/beachball/svg/circle.spec.ts @@ -1,14 +1,14 @@ // Copyright 2017-2023 @polkadot/ui-shared authors & contributors // SPDX-License-Identifier: Apache-2.0 -import { serializeToString } from 'xmlserializer'; +import xs from 'xmlserializer'; import { circle } from './circle'; describe('circle', (): void => { it('creates a basic SVG circle element', (): void => { expect( - serializeToString( + xs.serializeToString( // eslint-disable-next-line @typescript-eslint/no-unsafe-argument,@typescript-eslint/no-explicit-any circle(123, 12, 34) as any ) diff --git a/packages/ui-shared/src/icons/beachball/svg/element.spec.ts b/packages/ui-shared/src/icons/beachball/svg/element.spec.ts index 95134119..d2c97f5e 100644 --- a/packages/ui-shared/src/icons/beachball/svg/element.spec.ts +++ b/packages/ui-shared/src/icons/beachball/svg/element.spec.ts @@ -1,14 +1,14 @@ // Copyright 2017-2023 @polkadot/ui-shared authors & contributors // SPDX-License-Identifier: Apache-2.0 -import { serializeToString } from 'xmlserializer'; +import xs from 'xmlserializer'; import { element } from './element'; describe('element', (): void => { it('creates a basic SVG element', (): void => { expect( - serializeToString( + xs.serializeToString( // eslint-disable-next-line @typescript-eslint/no-unsafe-argument,@typescript-eslint/no-explicit-any element(123) as any ) diff --git a/packages/ui-shared/src/icons/beachball/svg/rect.spec.ts b/packages/ui-shared/src/icons/beachball/svg/rect.spec.ts index baaa9ff4..0f8a211a 100644 --- a/packages/ui-shared/src/icons/beachball/svg/rect.spec.ts +++ b/packages/ui-shared/src/icons/beachball/svg/rect.spec.ts @@ -1,14 +1,14 @@ // Copyright 2017-2023 @polkadot/ui-shared authors & contributors // SPDX-License-Identifier: Apache-2.0 -import { serializeToString } from 'xmlserializer'; +import xs from 'xmlserializer'; import { rect } from './rect'; describe('rect', (): void => { it('creates a basic SVG rect element', (): void => { expect( - serializeToString( + xs.serializeToString( // eslint-disable-next-line @typescript-eslint/no-unsafe-argument,@typescript-eslint/no-explicit-any rect(123) as any ) diff --git a/packages/ui-shared/src/icons/beachball/svg/svg.spec.ts b/packages/ui-shared/src/icons/beachball/svg/svg.spec.ts index 0da0573e..f4888bc9 100644 --- a/packages/ui-shared/src/icons/beachball/svg/svg.spec.ts +++ b/packages/ui-shared/src/icons/beachball/svg/svg.spec.ts @@ -1,14 +1,14 @@ // Copyright 2017-2023 @polkadot/ui-shared authors & contributors // SPDX-License-Identifier: Apache-2.0 -import { serializeToString } from 'xmlserializer'; +import xs from 'xmlserializer'; import { svg } from './svg'; describe('svg', (): void => { it('creates a basic SVG element', (): void => { expect( - serializeToString( + xs.serializeToString( // eslint-disable-next-line @typescript-eslint/no-unsafe-argument,@typescript-eslint/no-explicit-any svg('rect') as any ) diff --git a/yarn.lock b/yarn.lock index d8528231..afcf09d2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2182,9 +2182,9 @@ __metadata: languageName: node linkType: hard -"@polkadot/dev@npm:^0.68.40": - version: 0.68.40 - resolution: "@polkadot/dev@npm:0.68.40" +"@polkadot/dev@npm:^0.68.41": + version: 0.68.41 + resolution: "@polkadot/dev@npm:0.68.41" dependencies: "@babel/cli": ^7.20.7 "@babel/core": ^7.20.12 @@ -2286,7 +2286,7 @@ __metadata: polkadot-exec-swc: scripts/polkadot-exec-swc.mjs polkadot-exec-tsc: scripts/polkadot-exec-tsc.mjs polkadot-exec-webpack: scripts/polkadot-exec-webpack.mjs - checksum: efa0673933e2fec834b2d0a29c454c3d95e54c4608ea6eea8b4dc3730344234219afb61840d475771b873d6d34a67ae537e8451f73b0dd43eb82e440a1733966 + checksum: a3e5d0acca6393c0d2cda36d5000ce605bf7cc0da6dd427947a82fe7d7783ce3ba2711bf4167d69178fc227e5ab86bd8ef75b3292d71328a817d0c3030305e95 languageName: node linkType: hard @@ -13928,7 +13928,7 @@ __metadata: dependencies: "@babel/core": ^7.20.12 "@babel/runtime": ^7.20.13 - "@polkadot/dev": ^0.68.40 + "@polkadot/dev": ^0.68.41 "@polkadot/x-bundle": ^10.4.2 "@types/jest": ^29.4.0 babel-loader: ^8.3.0