Skip to content

Commit 90a7917

Browse files
authored
refactor: cleanup test for api-client (#4420)
1 parent 1142e1d commit 90a7917

26 files changed

+115
-643
lines changed

packages/api-client/.nycrc.json

Lines changed: 0 additions & 9 deletions
This file was deleted.

packages/api-client/babel.config.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,5 @@
1818
*/
1919

2020
module.exports = {
21-
plugins: [
22-
'@babel/plugin-proposal-optional-chaining',
23-
'@babel/plugin-proposal-class-properties',
24-
'@babel/plugin-proposal-object-rest-spread',
25-
],
26-
presets: ['@babel/preset-react', '@babel/preset-typescript'],
21+
presets: [['@babel/preset-env', {targets: {node: 'current'}}], '@babel/preset-typescript'],
2722
};

packages/api-client/bs-config.js

Lines changed: 0 additions & 38 deletions
This file was deleted.

packages/api-client/demo/demo.js

Lines changed: 0 additions & 140 deletions
This file was deleted.

packages/api-client/index.html

Lines changed: 0 additions & 17 deletions
This file was deleted.

packages/api-client/jasmine.json

Lines changed: 0 additions & 7 deletions
This file was deleted.
Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Wire
3-
* Copyright (C) 2018 Wire Swiss GmbH
3+
* Copyright (C) 2022 Wire Swiss GmbH
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU General Public License as published by
@@ -17,21 +17,8 @@
1717
*
1818
*/
1919

20-
module.exports = {
21-
externals: {
22-
'fs-extra': '{}',
23-
},
24-
mode: 'development',
25-
module: {
26-
rules: [
27-
{
28-
exclude: /node_modules/,
29-
loader: 'babel-loader',
30-
test: /\.[tj]s$/,
31-
},
32-
],
33-
},
34-
resolve: {
35-
extensions: ['.js', '.ts'],
36-
},
20+
export default {
21+
clearMocks: true,
22+
testMatch: ['**/?(*.)test.[t]s?(x)'],
23+
coverageDirectory: 'coverage',
3724
};

packages/api-client/karma.conf.ts

Lines changed: 0 additions & 57 deletions
This file was deleted.

packages/api-client/package.json

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@
2121
"@babel/plugin-proposal-class-properties": "7.14.5",
2222
"@babel/plugin-proposal-object-rest-spread": "7.14.7",
2323
"@babel/plugin-proposal-optional-chaining": "7.14.5",
24+
"@babel/preset-env": "^7.19.1",
2425
"@babel/preset-react": "7.14.5",
2526
"@babel/preset-typescript": "7.14.5",
26-
"@types/jasmine": "3.8.2",
27-
"@types/karma": "6.3.3",
27+
"@types/babel__preset-env": "^7",
28+
"@types/jest": "^29.0.3",
2829
"@types/node": "^14.18.29",
2930
"@types/spark-md5": "3.0.2",
3031
"@types/tough-cookie": "4.0.1",
@@ -38,14 +39,7 @@
3839
"cross-env": "7.0.3",
3940
"dotenv": "10.0.0",
4041
"istanbul": "1.1.0-alpha.1",
41-
"jasmine": "3.8.0",
42-
"karma": "6.4.1",
43-
"karma-chrome-launcher": "3.1.1",
44-
"karma-jasmine": "4.0.2",
45-
"karma-jasmine-diff-reporter": "2.0.1",
46-
"karma-sourcemap-loader": "0.3.8",
47-
"karma-spec-reporter": "0.0.34",
48-
"karma-webpack": "4.0.2",
42+
"jest": "^29.0.3",
4943
"nock": "13.1.1",
5044
"nyc": "15.1.0",
5145
"react": "18.1.0",
@@ -56,9 +50,6 @@
5650
"sinon-har-server": "0.3.0",
5751
"ts-node": "^10.9.1",
5852
"typescript": "4.8.3",
59-
"webpack": "4.46.0",
60-
"webpack-cli": "4.7.2",
61-
"webpack-dev-server": "3.11.2",
6253
"ws": "7.5.3"
6354
},
6455
"description": "Wire API Client to send and receive data.",
@@ -73,22 +64,16 @@
7364
"name": "@wireapp/api-client",
7465
"repository": "https://github.com/wireapp/wire-web-packages/tree/main/packages/api-client",
7566
"scripts": {
76-
"build": "yarn build:node && yarn build:browser",
77-
"build:browser": "webpack --config ./webpack.browser.js",
78-
"build:node": "tsc",
67+
"build": "tsc",
7968
"clean": "rimraf \"src/**/*.{js?(.map),d.ts}\"",
80-
"coverage": "istanbul cover --report html ./node_modules/jasmine/bin/jasmine.js",
8169
"demo:http401": "cross-env NODE_DEBUG='@wireapp/api-client*' ts-node src/demo/http401.ts",
8270
"demo:self": "cross-env NODE_DEBUG='@wireapp/api-client*' ts-node src/demo/self.ts",
8371
"dist": "yarn clean && yarn build",
84-
"start": "yarn build:node && concurrently \"tsc -w\" \"webpack -w\" \"browser-sync start -c bs-config.js\"",
72+
"start": "concurrently \"tsc -w\" \"webpack -w\" \"browser-sync start -c bs-config.js\"",
8573
"start:node": "cross-env NODE_DEBUG='@wireapp*' node --inspect -r ts-node/register demo.ts",
86-
"test": "yarn test:node && yarn test:browser",
87-
"test:browser": "karma start",
88-
"test:node": "nyc jasmine --config=jasmine.json",
89-
"test:project": "yarn dist && yarn test",
90-
"test:types": "tsc --noEmit",
91-
"watch": "webpack serve --config webpack.browser.js"
74+
"test": "jest",
75+
"watch": "webpack serve --config webpack.browser.js",
76+
"prepare": "yarn dist"
9277
},
9378
"version": "20.6.4",
9479
"gitHead": "5339f01fe01ef0871da8c8bc8662fbe9e604754a"

0 commit comments

Comments
 (0)