From d2cebf930a440374dddb376ce1c7cfe2e5f87c3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20S=C3=B3jko?= Date: Tue, 23 Aug 2022 13:40:21 +0200 Subject: [PATCH] chore(setup): fix running unit tests in all packages --- packages/api/package.json | 2 +- packages/features/package.json | 2 +- packages/filepicker/package.json | 2 +- packages/files/package.json | 2 +- packages/models/package.json | 2 +- packages/responses/package.json | 2 +- packages/services/jest.config.js | 8 ++++++++ packages/services/package.json | 2 +- .../src/Domain/Files/FileService.spec.ts | 18 +++++++++--------- packages/sncrypto-common/package.json | 2 +- packages/snjs/README.md | 2 +- packages/snjs/jest.config.js | 2 +- packages/snjs/package.json | 2 +- packages/ui-services/package.json | 2 +- packages/utils/package.json | 2 +- 15 files changed, 30 insertions(+), 22 deletions(-) diff --git a/packages/api/package.json b/packages/api/package.json index 189f3d92c..a937db2a7 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -22,7 +22,7 @@ "prebuild": "yarn clean", "build": "tsc -p tsconfig.json", "lint": "eslint . --ext .ts", - "test:unit": "jest spec --coverage" + "test": "jest spec --coverage" }, "devDependencies": { "@types/jest": "^28.1.5", diff --git a/packages/features/package.json b/packages/features/package.json index 86f5d834f..120cfd8f9 100644 --- a/packages/features/package.json +++ b/packages/features/package.json @@ -22,7 +22,7 @@ "prebuild": "yarn clean", "build": "tsc -p tsconfig.json", "lint": "eslint . --ext .ts", - "test:unit": "jest" + "test": "jest" }, "dependencies": { "@standardnotes/auth": "^3.19.4", diff --git a/packages/filepicker/package.json b/packages/filepicker/package.json index 53d27d589..b96195beb 100644 --- a/packages/filepicker/package.json +++ b/packages/filepicker/package.json @@ -20,7 +20,7 @@ "prebuild": "yarn clean", "build": "tsc -p tsconfig.json", "lint": "eslint . --ext .ts", - "test:unit": "jest" + "test": "jest" }, "devDependencies": { "@types/jest": "^28.1.5", diff --git a/packages/files/package.json b/packages/files/package.json index 9f8d242c9..f6c700a74 100644 --- a/packages/files/package.json +++ b/packages/files/package.json @@ -20,7 +20,7 @@ "prebuild": "yarn clean", "build": "tsc -p tsconfig.json", "lint": "eslint . --ext .ts", - "test:unit": "jest" + "test": "jest" }, "devDependencies": { "@types/jest": "^28.1.5", diff --git a/packages/models/package.json b/packages/models/package.json index 716de503b..1a6485f1a 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -20,7 +20,7 @@ "prebuild": "yarn clean", "build": "tsc -p tsconfig.json", "lint": "eslint . --ext .ts", - "test:unit": "jest" + "test": "jest" }, "devDependencies": { "@types/jest": "^28.1.5", diff --git a/packages/responses/package.json b/packages/responses/package.json index 7c446817f..6b9a2ac76 100644 --- a/packages/responses/package.json +++ b/packages/responses/package.json @@ -21,7 +21,7 @@ "prebuild": "yarn clean", "build": "tsc -p tsconfig.json", "lint": "eslint . --ext .ts", - "test:unit": "jest spec --coverage --passWithNoTests" + "test": "jest spec --coverage --passWithNoTests" }, "devDependencies": { "@types/jest": "^28.1.5", diff --git a/packages/services/jest.config.js b/packages/services/jest.config.js index ad1ceabb0..78e22cd24 100644 --- a/packages/services/jest.config.js +++ b/packages/services/jest.config.js @@ -7,5 +7,13 @@ module.exports = { 'ts-jest': { tsconfig: 'tsconfig.json', }, + }, + coverageThreshold: { + global: { + branches: 9, + functions: 9, + lines: 16, + statements: 16 + } } }; diff --git a/packages/services/package.json b/packages/services/package.json index 111d5b938..50eb98845 100644 --- a/packages/services/package.json +++ b/packages/services/package.json @@ -20,7 +20,7 @@ "prebuild": "yarn clean", "build": "tsc -p tsconfig.json", "lint": "eslint . --ext .ts", - "test:unit": "jest spec --coverage" + "test": "jest spec --coverage" }, "dependencies": { "@standardnotes/auth": "^3.19.4", diff --git a/packages/services/src/Domain/Files/FileService.spec.ts b/packages/services/src/Domain/Files/FileService.spec.ts index ac924f0ed..c967e0209 100644 --- a/packages/services/src/Domain/Files/FileService.spec.ts +++ b/packages/services/src/Domain/Files/FileService.spec.ts @@ -1,16 +1,16 @@ -import { - InternalEventBusInterface, - SyncServiceInterface, - ItemManagerInterface, - AlertService, - ApiServiceInterface, - ChallengeServiceInterface, -} from '@standardnotes/services' -import { FileService } from './FileService' import { PureCryptoInterface, StreamEncryptor } from '@standardnotes/sncrypto-common' import { FileItem } from '@standardnotes/models' import { EncryptionProvider } from '@standardnotes/encryption' +import { ItemManagerInterface } from '../Item/ItemManagerInterface' +import { ChallengeServiceInterface } from '../Challenge' +import { InternalEventBusInterface } from '..' +import { AlertService } from '../Alert/AlertService' +import { ApiServiceInterface } from '../Api/ApiServiceInterface' +import { SyncServiceInterface } from '../Sync/SyncServiceInterface' + +import { FileService } from './FileService' + describe('fileService', () => { let apiService: ApiServiceInterface let itemManager: ItemManagerInterface diff --git a/packages/sncrypto-common/package.json b/packages/sncrypto-common/package.json index 940eb206f..a614eafe6 100644 --- a/packages/sncrypto-common/package.json +++ b/packages/sncrypto-common/package.json @@ -21,7 +21,7 @@ "build": "tsc -p tsconfig.json", "watch": "tsc -p tsconfig.json --watch", "lint": "eslint . --ext .ts", - "test:unit": "yarn lint" + "test": "yarn lint" }, "devDependencies": { "@typescript-eslint/eslint-plugin": "^5.30.0", diff --git a/packages/snjs/README.md b/packages/snjs/README.md index 22811865f..7eb1903d8 100644 --- a/packages/snjs/README.md +++ b/packages/snjs/README.md @@ -58,5 +58,5 @@ yarn start:server:e2e From the root of the repository, run: ``` -yarn run test:unit +yarn run test ``` diff --git a/packages/snjs/jest.config.js b/packages/snjs/jest.config.js index d3e0f68ed..8ffd791ce 100644 --- a/packages/snjs/jest.config.js +++ b/packages/snjs/jest.config.js @@ -31,7 +31,7 @@ module.exports = { branches: 13, functions: 22, lines: 27, - statements: 28, + statements: 27, }, }, } diff --git a/packages/snjs/package.json b/packages/snjs/package.json index f73f5e6ca..91ca24838 100644 --- a/packages/snjs/package.json +++ b/packages/snjs/package.json @@ -25,7 +25,7 @@ "lint": "yarn lint:tsc && yarn lint:eslint", "lint:eslint": "eslint --ext .ts lib/", "lint:tsc": "tsc --noEmit --emitDeclarationOnly false --project lib/tsconfig.json", - "test:unit": "jest spec --coverage", + "test": "jest spec --coverage", "test:debug": "node --inspect-brk node_modules/.bin/jest --runInBand" }, "devDependencies": { diff --git a/packages/ui-services/package.json b/packages/ui-services/package.json index 666429560..9c4b6fd03 100644 --- a/packages/ui-services/package.json +++ b/packages/ui-services/package.json @@ -20,7 +20,7 @@ "prebuild": "yarn clean", "build": "tsc -p tsconfig.json", "lint": "eslint . --ext .ts", - "test:unit": "jest spec --coverage" + "test": "jest spec --coverage --passWithNoTests" }, "dependencies": { "@standardnotes/common": "^1.30.0", diff --git a/packages/utils/package.json b/packages/utils/package.json index 4fb5ca92e..a243069cd 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -22,7 +22,7 @@ "prebuild": "yarn clean", "build": "tsc -p tsconfig.json", "lint": "eslint . --ext .ts", - "test:unit": "jest spec" + "test": "jest spec" }, "dependencies": { "@standardnotes/common": "^1.23.1",