mirrors/insomnia
1
0
Fork 0
mirror of https://github.com/Kong/insomnia synced 2024-11-07 14:19:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(deps): upgrades jest to 28 (#4783)

Browse Source
This commit is contained in:
Dimitri Mitropoulos 2022-05-17 05:18:06 -07:00 committed by GitHub
parent db672f82a9
commit 52393eccc0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
74 changed files with 19934 additions and 45882 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jest-preset.js
View File

@ -3,7 +3,7 @@ module.exports = {
collectCoverage: false,
globals: {
'ts-jest': {
isolatedModules: true,
isolatedModules: false,
},
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],

7261
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

7
package.json
View File

@ -40,7 +40,8 @@
},
"devDependencies": {
"@babel/plugin-proposal-decorators": "^7.4.0",
"@types/jest": "^26.0.23",
"@jest/types": "^28.1.0",
"@jest/globals": "^28.1.0",
"@types/node": "^17.0.21",
"@types/svgo": "^2.6.3",
"@typescript-eslint/eslint-plugin": "^5.10.2",
@ -56,13 +57,13 @@
"eslint-plugin-react": "^7.28.0",
"eslint-plugin-react-hooks": "^4.3.0",
"eslint-plugin-simple-import-sort": "^7.0.0",
"jest": "^26.6.3",
"jest": "^28.1.0",
"lerna": "^4.0.0",
"markdownlint-cli2": "^0.2.0",
"rimraf": "^3.0.2",
"svg-text-to-path": "^1.1.2",
"svgo": "^2.8.0",
"ts-jest": "^26.5.6",
"ts-jest": "^28.0.1",
"type-fest": "^2.12.0",
"typescript": "^4.5.5"
},

5
packages/insomnia-common/jest.config.js
View File

@ -1,9 +1,4 @@
/** @type { import('@jest/types').Config.InitialOptions } */
module.exports = {
preset: '../../jest-preset.js',
globals: {
'ts-jest': {
isolatedModules: false,
},
},
};

8
packages/insomnia-components/jest.config.js
View File

@ -1,6 +1,14 @@
/** @type { import('@jest/types').Config.InitialOptions } */
module.exports = {
preset: '../../jest-preset.js',
globals: {
'ts-jest': {
isolatedModules: true,
},
},
fakeTimers: {
enableGlobally: true,
},
setupFilesAfterEnv: ['./src/jest/setup-after-env.ts'],
testEnvironment: 'jsdom',
};

9767
packages/insomnia-components/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

9
packages/insomnia-components/package.json
View File

@ -39,18 +39,19 @@
"watch": "cross-env ESBUILD_WATCH=true esr esbuild.ts"
},
"devDependencies": {
"@jest/globals": "^28.1.0",
"@svgr/cli": "^5.5.0",
"@testing-library/jest-dom": "^5.12.0",
"@testing-library/react": "^11.2.6",
"@testing-library/jest-dom": "^5.16.4",
"@testing-library/react": "^12.1.5",
"@types/ramda": "^0.27.44",
"@types/react": "^17.0.39",
"@types/react-dom": "^17.0.11",
"@types/testing-library__jest-dom": "^5.9.5",
"concurrently": "^7.0.0",
"cross-env": "^7.0.3",
"esbuild": "^0.14.27",
"esbuild-runner": "^2.2.1",
"jest": "^26.6.3",
"jest": "^28.1.0",
"jest-environment-jsdom": "^28.0.2",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-use": "^17.2.4",

7
packages/insomnia-components/src/tooltip.test.tsx
View File

@ -1,10 +1,9 @@
import { jest } from '@jest/globals';
import { ByRoleMatcher, ByRoleOptions, fireEvent, render } from '@testing-library/react';
import React from 'react';
import { Tooltip } from './tooltip';
const pause = (time: number) => new Promise(resolve => setTimeout(resolve, time));
type QueryByRole = (
text: ByRoleMatcher,
options?: ByRoleOptions | undefined,
@ -32,14 +31,14 @@ describe('<Tooltip />', () => {
fireEvent.mouseEnter(getByText(childText));
// Should open after the configured delay, wait a sufficient amount
await pause(delay * 2);
jest.advanceTimersByTime(delay * 2);
expect(getByRole('tooltip')).toBeTruthy();
fireEvent.mouseLeave(getByText(childText));
// Should close after 100ms default, wait a sufficient amount
await pause(200);
jest.advanceTimersByTime(delay);
expect(getByRole('tooltip', { hidden: true })).toBeTruthy();

5
packages/insomnia-config/jest.config.js
View File

@ -1,9 +1,4 @@
/** @type { import('@jest/types').Config.InitialOptions } */
module.exports = {
preset: '../../jest-preset.js',
globals: {
'ts-jest': {
isolatedModules: false,
},
},
};

8327
packages/insomnia-config/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
packages/insomnia-config/package.json
View File

@ -33,7 +33,7 @@
"insomnia-common": "3.1.0-beta.1"
},
"devDependencies": {
"jest": "^26.6.3",
"jest": "^28.1.0",
"ts-node": "^10.2.1",
"typescript": "^4.5.5",
"typescript-json-schema": "^0.50.1"

2
packages/insomnia-config/src/validate.test.ts
View File

@ -1,3 +1,5 @@
import { describe, expect, it } from '@jest/globals';
import { InsomniaConfig } from '.';
import { ingest, validate } from './validate';

5
packages/insomnia-cookies/jest.config.js
View File

@ -1,4 +1,9 @@
/** @type { import('@jest/types').Config.InitialOptions } */
module.exports = {
preset: '../../jest-preset.js',
globals: {
'ts-jest': {
isolatedModules: true,
},
},
};

5
packages/insomnia-importers/jest.config.js
View File

@ -1,4 +1,9 @@
/** @type { import('@jest/types').Config.InitialOptions } */
module.exports = {
preset: '../../jest-preset.js',
globals: {
'ts-jest': {
isolatedModules: true,
},
},
};

5
packages/insomnia-inso/jest.config.js
View File

@ -1,6 +1,11 @@
/** @type { import('@jest/types').Config.InitialOptions } */
module.exports = {
preset: '../../jest-preset.js',
globals: {
'ts-jest': {
isolatedModules: true,
},
},
collectCoverage: true,
coveragePathIgnorePatterns: ['/node_modules/'],
coverageThreshold: {

5560
packages/insomnia-inso/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
packages/insomnia-inso/package.json
View File

@ -54,7 +54,7 @@
"@types/yaml": "^1.9.7",
"execa": "^5.0.0",
"get-bin-path": "^5.1.0",
"jest": "^26.6.3",
"jest": "^28.1.0",
"node-loader": "1.0.2",
"pkg": "^5.3.2",
"rimraf": "^3.0.2",

1
packages/insomnia-inso/tsconfig.build.json
View File

@ -13,7 +13,6 @@
"node_modules",
"dist",
"src/jest",
".babelrc.js",
"jest.config.js",
"webpack",
"bin",

5
packages/insomnia-prettify/jest.config.js
View File

@ -1,4 +1,9 @@
/** @type { import('@jest/types').Config.InitialOptions } */
module.exports = {
preset: '../../jest-preset.js',
globals: {
'ts-jest': {
isolatedModules: true,
},
},
};

7
packages/insomnia-smoke-test/__jest__/setup.ts
View File

@ -1,7 +0,0 @@
// @ts-expect-error TSMIGRATION
jasmine.getEnv().addReporter({
// @ts-expect-error TSMIGRATION
specStarted: result => (jasmine.currentTest = result),
// @ts-expect-error TSMIGRATION
specDone: result => (jasmine.currentTest = result),
});

1
packages/insomnia-smoke-test/cli/app.test.ts
View File

@ -1,3 +1,4 @@
import { describe, expect, it } from '@jest/globals';
import execa from 'execa';
import fs from 'fs';
import { getBinPathSync } from 'get-bin-path';

8
packages/insomnia-smoke-test/jest.config.js
View File

@ -1,7 +1,9 @@
/** @type { import('@jest/types').Config.InitialOptions } */
module.exports = {
preset: '../../jest-preset.js',
setupFilesAfterEnv: [
'./__jest__/setup.ts',
],
globals: {
'ts-jest': {
isolatedModules: true,
},
},
};

8776
packages/insomnia-smoke-test/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
packages/insomnia-smoke-test/package.json
View File

@ -45,7 +45,7 @@
"express-basic-auth": "^1.2.0",
"faker": "^5.1.0",
"get-bin-path": "^5.1.0",
"jest": "^26.6.3",
"jest": "^28.1.0",
"mkdirp": "^1.0.4",
"oidc-provider": "^7.10.6",
"ramda": "^0.27.1",

3
packages/insomnia-smoke-test/tsconfig.build.json
View File

@ -16,6 +16,7 @@
"server"
],
"exclude": [
"dist"
"dist",
"**/*.test.ts",
]
}

5
packages/insomnia-smoke-test/tsconfig.json
View File

@ -13,6 +13,9 @@
"playwright",
"server",
"jest.config.js",
".eslintrc.js"
".eslintrc.js",
],
"exclude": [
"dist"
]
}

5
packages/insomnia-testing/jest.config.js
View File

@ -1,4 +1,9 @@
/** @type { import('@jest/types').Config.InitialOptions } */
module.exports = {
preset: '../../jest-preset.js',
globals: {
'ts-jest': {
isolatedModules: true,
},
},
};

369
packages/insomnia-testing/package-lock.json generated
View File

@ -17,15 +17,75 @@
"@types/chai": "^4.2.15",
"@types/mkdirp": "^1.0.1",
"@types/mocha": "^8.2.1",
"jest-mock": "^28.0.2",
"typescript": "^4.5.5"
}
},
"node_modules/@jest/schemas": {
"version": "28.0.2",
"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.0.2.tgz",
"integrity": "sha512-YVDJZjd4izeTDkij00vHHAymNXQ6WWsdChFRK86qck6Jpr3DCL5W3Is3vslviRlP+bLuMYRLbdp98amMvqudhA==",
"dev": true,
"dependencies": {
"@sinclair/typebox": "^0.23.3"
},
"engines": {
"node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
}
},
"node_modules/@jest/types": {
"version": "28.1.0",
"resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.0.tgz",
"integrity": "sha512-xmEggMPr317MIOjjDoZ4ejCSr9Lpbt/u34+dvc99t7DS8YirW5rwZEhzKPC2BMUFkUhI48qs6qLUSGw5FuL0GA==",
"dev": true,
"dependencies": {
"@jest/schemas": "^28.0.2",
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^3.0.0",
"@types/node": "*",
"@types/yargs": "^17.0.8",
"chalk": "^4.0.0"
},
"engines": {
"node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
}
},
"node_modules/@sinclair/typebox": {
"version": "0.23.5",
"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.23.5.tgz",
"integrity": "sha512-AFBVi/iT4g20DHoujvMH1aEDn8fGJh4xsRGCP6d8RpLPMqsNPvW01Jcn0QysXTsg++/xj25NmJsGyH9xug/wKg==",
"dev": true
},
"node_modules/@types/chai": {
"version": "4.2.15",
"resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.2.15.tgz",
"integrity": "sha512-rYff6FI+ZTKAPkJUoyz7Udq3GaoDZnxYDEvdEdFZASiA7PoErltHezDishqQiSDWrGxvxmplH304jyzQmjp0AQ==",
"dev": true
},
"node_modules/@types/istanbul-lib-coverage": {
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz",
"integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==",
"dev": true
},
"node_modules/@types/istanbul-lib-report": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
"integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
"dev": true,
"dependencies": {
"@types/istanbul-lib-coverage": "*"
}
},
"node_modules/@types/istanbul-reports": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
"integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
"dev": true,
"dependencies": {
"@types/istanbul-lib-report": "*"
}
},
"node_modules/@types/mkdirp": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/@types/mkdirp/-/mkdirp-1.0.1.tgz",
@ -47,6 +107,21 @@
"integrity": "sha512-syUgf67ZQpaJj01/tRTknkMNoBBLWJOBODF0Zm4NrXmiSuxjymFrxnTu1QVYRubhVkRcZLYZG8STTwJRdVm/WQ==",
"dev": true
},
"node_modules/@types/yargs": {
"version": "17.0.10",
"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.10.tgz",
"integrity": "sha512-gmEaFwpj/7f/ROdtIlci1R1VYU1J4j95m8T+Tj3iBgiBFKg1foE/PSl93bBd5T9LDXNPo8UlNN6W0qwD8O5OaA==",
"dev": true,
"dependencies": {
"@types/yargs-parser": "*"
}
},
"node_modules/@types/yargs-parser": {
"version": "21.0.0",
"resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz",
"integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==",
"dev": true
},
"node_modules/@ungap/promise-all-settled": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz",
@ -68,6 +143,20 @@
"node": ">=4"
}
},
"node_modules/ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dependencies": {
"color-convert": "^2.0.1"
},
"engines": {
"node": ">=8"
},
"funding": {
"url": "https://github.com/chalk/ansi-styles?sponsor=1"
}
},
"node_modules/anymatch": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
@ -142,6 +231,21 @@
"node": ">=4"
}
},
"node_modules/chalk": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
"dependencies": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
},
"engines": {
"node": ">=10"
},
"funding": {
"url": "https://github.com/chalk/chalk?sponsor=1"
}
},
"node_modules/check-error": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
@ -183,6 +287,22 @@
"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
}
},
"node_modules/color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dependencies": {
"color-name": "~1.1.4"
},
"engines": {
"node": ">=7.0.0"
}
},
"node_modules/color-name": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
"node_modules/concat-map": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@ -395,6 +515,19 @@
"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
},
"node_modules/jest-mock": {
"version": "28.1.0",
"resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-28.1.0.tgz",
"integrity": "sha512-H7BrhggNn77WhdL7O1apG0Q/iwl0Bdd5E1ydhCJzL3oBLh/UYxAwR3EJLsBZ9XA3ZU4PA3UNw4tQjduBTCTmLw==",
"dev": true,
"dependencies": {
"@jest/types": "^28.1.0",
"@types/node": "*"
},
"engines": {
"node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
}
},
"node_modules/log-symbols": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz",
@ -406,51 +539,6 @@
"node": ">=10"
}
},
"node_modules/log-symbols/node_modules/ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dependencies": {
"color-convert": "^2.0.1"
},
"engines": {
"node": ">=8"
},
"funding": {
"url": "https://github.com/chalk/ansi-styles?sponsor=1"
}
},
"node_modules/log-symbols/node_modules/chalk": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
"dependencies": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
},
"engines": {
"node": ">=10"
},
"funding": {
"url": "https://github.com/chalk/chalk?sponsor=1"
}
},
"node_modules/log-symbols/node_modules/color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dependencies": {
"color-name": "~1.1.4"
},
"engines": {
"node": ">=7.0.0"
}
},
"node_modules/log-symbols/node_modules/color-name": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
"node_modules/minimatch": {
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
@ -524,20 +612,6 @@
"node": ">=8"
}
},
"node_modules/mocha/node_modules/ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dependencies": {
"color-convert": "^2.0.1"
},
"engines": {
"node": ">=8"
},
"funding": {
"url": "https://github.com/chalk/ansi-styles?sponsor=1"
}
},
"node_modules/mocha/node_modules/argparse": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
@ -553,22 +627,6 @@
"wrap-ansi": "^7.0.0"
}
},
"node_modules/mocha/node_modules/color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dependencies": {
"color-name": "~1.1.4"
},
"engines": {
"node": ">=7.0.0"
}
},
"node_modules/mocha/node_modules/color-name": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
"node_modules/mocha/node_modules/emoji-regex": {
"version": "8.0.0",
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
@ -1029,12 +1087,65 @@
}
},
"dependencies": {
"@jest/schemas": {
"version": "28.0.2",
"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.0.2.tgz",
"integrity": "sha512-YVDJZjd4izeTDkij00vHHAymNXQ6WWsdChFRK86qck6Jpr3DCL5W3Is3vslviRlP+bLuMYRLbdp98amMvqudhA==",
"dev": true,
"requires": {
"@sinclair/typebox": "^0.23.3"
}
},
"@jest/types": {
"version": "28.1.0",
"resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.0.tgz",
"integrity": "sha512-xmEggMPr317MIOjjDoZ4ejCSr9Lpbt/u34+dvc99t7DS8YirW5rwZEhzKPC2BMUFkUhI48qs6qLUSGw5FuL0GA==",
"dev": true,
"requires": {
"@jest/schemas": "^28.0.2",
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^3.0.0",
"@types/node": "*",
"@types/yargs": "^17.0.8",
"chalk": "^4.0.0"
}
},
"@sinclair/typebox": {
"version": "0.23.5",
"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.23.5.tgz",
"integrity": "sha512-AFBVi/iT4g20DHoujvMH1aEDn8fGJh4xsRGCP6d8RpLPMqsNPvW01Jcn0QysXTsg++/xj25NmJsGyH9xug/wKg==",
"dev": true
},
"@types/chai": {
"version": "4.2.15",
"resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.2.15.tgz",
"integrity": "sha512-rYff6FI+ZTKAPkJUoyz7Udq3GaoDZnxYDEvdEdFZASiA7PoErltHezDishqQiSDWrGxvxmplH304jyzQmjp0AQ==",
"dev": true
},
"@types/istanbul-lib-coverage": {
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz",
"integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==",
"dev": true
},
"@types/istanbul-lib-report": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
"integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
"dev": true,
"requires": {
"@types/istanbul-lib-coverage": "*"
}
},
"@types/istanbul-reports": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
"integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
"dev": true,
"requires": {
"@types/istanbul-lib-report": "*"
}
},
"@types/mkdirp": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/@types/mkdirp/-/mkdirp-1.0.1.tgz",
@ -1056,6 +1167,21 @@
"integrity": "sha512-syUgf67ZQpaJj01/tRTknkMNoBBLWJOBODF0Zm4NrXmiSuxjymFrxnTu1QVYRubhVkRcZLYZG8STTwJRdVm/WQ==",
"dev": true
},
"@types/yargs": {
"version": "17.0.10",
"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.10.tgz",
"integrity": "sha512-gmEaFwpj/7f/ROdtIlci1R1VYU1J4j95m8T+Tj3iBgiBFKg1foE/PSl93bBd5T9LDXNPo8UlNN6W0qwD8O5OaA==",
"dev": true,
"requires": {
"@types/yargs-parser": "*"
}
},
"@types/yargs-parser": {
"version": "21.0.0",
"resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz",
"integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==",
"dev": true
},
"@ungap/promise-all-settled": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz",
@ -1071,6 +1197,14 @@
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
"integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw=="
},
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"requires": {
"color-convert": "^2.0.1"
}
},
"anymatch": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
@ -1130,6 +1264,15 @@
"type-detect": "^4.0.5"
}
},
"chalk": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"check-error": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
@ -1158,6 +1301,19 @@
}
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"requires": {
"color-name": "~1.1.4"
}
},
"color-name": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
"concat-map": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@ -1310,44 +1466,22 @@
"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
},
"jest-mock": {
"version": "28.1.0",
"resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-28.1.0.tgz",
"integrity": "sha512-H7BrhggNn77WhdL7O1apG0Q/iwl0Bdd5E1ydhCJzL3oBLh/UYxAwR3EJLsBZ9XA3ZU4PA3UNw4tQjduBTCTmLw==",
"dev": true,
"requires": {
"@jest/types": "^28.1.0",
"@types/node": "*"
}
},
"log-symbols": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz",
"integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==",
"requires": {
"chalk": "^4.0.0"
},
"dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"requires": {
"color-convert": "^2.0.1"
}
},
"chalk": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"requires": {
"color-name": "~1.1.4"
}
},
"color-name": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
}
}
},
"minimatch": {
@ -1400,14 +1534,6 @@
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
},
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"requires": {
"color-convert": "^2.0.1"
}
},
"argparse": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
@ -1423,19 +1549,6 @@
"wrap-ansi": "^7.0.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"requires": {
"color-name": "~1.1.4"
}
},
"color-name": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
"emoji-regex": {
"version": "8.0.0",
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",

1
packages/insomnia-testing/package.json
View File

@ -29,6 +29,7 @@
"@types/chai": "^4.2.15",
"@types/mkdirp": "^1.0.1",
"@types/mocha": "^8.2.1",
"jest-mock": "^28.0.2",
"typescript": "^4.5.5"
},
"dependencies": {

2
packages/insomnia-testing/src/run/run.test.ts
View File

@ -1,4 +1,4 @@
import { mocked } from 'ts-jest/utils';
import { mocked } from 'jest-mock';
import { SendRequestCallback } from './insomnia';
import { runTests } from './run';

2
packages/insomnia-testing/src/test-helpers/send-request-mock.ts
View File

@ -1,4 +1,4 @@
import { mocked } from 'ts-jest/utils';
import { mocked } from 'jest-mock';
import { SendRequestCallback } from '../run/insomnia';

5
packages/insomnia-url/jest.config.js
View File

@ -1,4 +1,9 @@
/** @type { import('@jest/types').Config.InitialOptions } */
module.exports = {
preset: '../../jest-preset.js',
globals: {
'ts-jest': {
isolatedModules: true,
},
},
};

5
packages/insomnia-xpath/jest.config.js
View File

@ -1,4 +1,9 @@
/** @type { import('@jest/types').Config.InitialOptions } */
module.exports = {
preset: '../../jest-preset.js',
globals: {
'ts-jest': {
isolatedModules: true,
},
},
};

15
packages/insomnia/.babelrc.js
View File

@ -1,15 +0,0 @@
/** @type { import('@babel/core').TransformOptions } */
module.exports = {
presets: [
['@babel/preset-env',{targets: {electron: '18.1.0'}}],
'@babel/preset-typescript',
'@babel/preset-react',
],
plugins: [
["@babel/plugin-proposal-nullish-coalescing-operator"],
['@babel/plugin-proposal-decorators', { legacy: true }],
['@babel/plugin-proposal-class-properties', { loose: true }],
['@babel/plugin-proposal-private-property-in-object', { loose: true }],
['@babel/plugin-proposal-private-methods', { loose: true }]
],
}

23
packages/insomnia/jest.config.js
View File

@ -1,29 +1,20 @@
/** @type { import('@jest/types').Config.InitialOptions } */
module.exports = {
// preset: '../../jest-preset.js', // DOES NOT WORK
// same as preset:
collectCoverage: false,
preset: '../../jest-preset.js',
globals: {
'ts-jest': {
isolatedModules: true,
},
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
resetMocks: true,
resetModules: true,
testRegex: ['.+\\.test\\.tsx?$'],
transform: { '^.+\\.tsx?$': 'ts-jest' },
// extended from preset:
cache: false,
modulePathIgnorePatterns: ['<rootDir>/network/.*/__mocks__'],
rootDir: 'src',
setupFiles: ['./__jest__/setup.ts'],
setupFilesAfterEnv: ['./__jest__/setup-after-env.ts'],
modulePathIgnorePatterns: ['./src/network/.*/__mocks__'],
setupFiles: ['./src/__jest__/setup.ts'],
setupFilesAfterEnv: ['./src/__jest__/setup-after-env.ts'],
testEnvironment: 'jsdom',
verbose: true,
moduleNameMapper: {
'\\.(css|less|png)$': '<rootDir>/__mocks__/dummy.ts',
'styled-components': '<rootDir>/../node_modules/styled-components',
'\\.(css|less|png)$': '<rootDir>/src/__mocks__/dummy.ts',
'styled-components': '<rootDir>/node_modules/styled-components',
'jsonpath-plus': '<rootDir>/node_modules/jsonpath-plus/dist/index-node-cjs.cjs',
},
};

11498
packages/insomnia/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

18
packages/insomnia/package.json
View File

@ -22,7 +22,7 @@
"build": "npm run build:sr && npm run build:app",
"build:app": "esr --cache ./scripts/build.ts --noErrorTruncation",
"build:main.min.js": "cross-env NODE_ENV=development esr esbuild.main.ts",
"build:sr": " esr esbuild.sr.ts",
"build:sr": "esr esbuild.sr.ts",
"bump-version": "esr scripts/bumpVersion.ts",
"clean": "tsc --build tsconfig.build.json --clean",
"postclean": "rimraf build dist src/main.min.js",
@ -109,10 +109,11 @@
"@babel/preset-react": "^7.14.5",
"@babel/preset-typescript": "^7.15.0",
"@develohpanda/fluent-builder": "^2.1.2",
"@testing-library/jest-dom": "^5.11.5",
"@testing-library/react": "^11.2.6",
"@testing-library/react-hooks": "^5.1.2",
"@testing-library/user-event": "^14.0.0-beta.7",
"@testing-library/dom": "^8.13.0",
"@testing-library/jest-dom": "^5.16.4",
"@testing-library/react": "^12.1.5",
"@testing-library/react-hooks": "^8.0.0",
"@testing-library/user-event": "^14.2.0",
"@types/analytics-node": "^3.1.7",
"@types/aws4": "^1.11.1",
"@types/clone": "^2.1.0",
@ -140,13 +141,12 @@
"@types/redux-mock-store": "^1.0.2",
"@types/styled-components": "^5.1.23",
"@types/swagger-ui-react": "^4.1.1",
"@types/testing-library__jest-dom": "^5.9.5",
"@types/testing-library__react-hooks": "^4.0.0",
"@types/tough-cookie": "^2.3.7",
"@types/uuid": "^8.3.4",
"@types/vkbeautify": "^0.99.2",
"@types/yaml": "^1.9.7",
"@vitejs/plugin-react": "^1.2.0",
"buffer": "^6.0.3",
"class-autobind-decorator": "^3.0.1",
"classnames": "^2.3.1",
"codemirror": "^5.65.2",
@ -168,7 +168,9 @@
"graphql-language-service": "^4.1.5",
"highlight.js": "^11.5.1",
"insomnia-components": "3.1.0-beta.1",
"jest": "^26.6.3",
"jest": "^28.1.0",
"jest-environment-jsdom": "^28.0.2",
"jest-mock": "^28.0.2",
"json-order": "^1.1.0",
"jwt-authentication": "^0.4.0",
"less": "^3.8.1",

1
packages/insomnia/src/__jest__/before-each.ts
View File

@ -5,6 +5,7 @@ import * as models from '../models';
export async function globalBeforeEach() {
// Setup the local database in case it's used
fetch.setup('insomnia-tests', 'http://localhost:8000');
await db.init(
models.types(),
{

7
packages/insomnia/src/account/__tests__/crypt.test.ts
View File

@ -1,3 +1,5 @@
import buffer from 'buffer/';
import * as crypt from '../crypt';
describe('crypt', () => {
@ -33,9 +35,10 @@ describe('crypt', () => {
key_ops: ['encrypt', 'decrypt'],
k: '5hs1f2xuiNPHUp11i6SWlsqYpWe_hWPcEKucZlwBfFE',
};
const resultEncrypted = crypt.encryptAESBuffer(key, Buffer.from('Hello World!', 'utf8'));
const source = buffer.Buffer.from('Hello World!', 'utf8');
const resultEncrypted = crypt.encryptAESBuffer(key, source);
const resultDecrypted = crypt.decryptAESToBuffer(key, resultEncrypted);
expect(resultDecrypted).toEqual(Buffer.from('Hello World!', 'utf8'));
expect(resultDecrypted.toString()).toEqual(source.toString());
});
});

28
packages/insomnia/src/common/__tests__/local-storage.test.ts
View File

@ -1,16 +1,12 @@
import { jest } from '@jest/globals';
import fs from 'fs';
import path from 'path';
import { globalBeforeEach } from '../../__jest__/before-each';
import LocalStorage from '../../main/local-storage';
jest.spyOn(global, 'setTimeout');
describe('LocalStorage()', () => {
beforeEach(async () => {
await globalBeforeEach();
jest.useFakeTimers();
});
beforeEach(globalBeforeEach);
afterEach(() => {
jest.clearAllTimers();
@ -74,8 +70,6 @@ describe('LocalStorage()', () => {
fs.rmdirSync(basePath);
localStorage.setItem('key', 'value');
jest.runAllTimers();
// Since the above operation failed to write, we should now get back
// the default value
expect(localStorage.getItem('key', 'different')).toBe('different');
@ -83,16 +77,13 @@ describe('LocalStorage()', () => {
});
it('stores a key', () => {
jest.useFakeTimers();
const basePath = `/tmp/insomnia-localstorage-${Math.random()}`;
const localStorage = new LocalStorage(basePath);
localStorage.setItem('foo', 'bar');
// Assert timeouts are called
expect(setTimeout).toHaveBeenCalledTimes(1);
expect(setTimeout).toHaveBeenCalledWith(expect.anything(), 100);
// Force debouncer to flush
jest.runAllTimers();
jest.runOnlyPendingTimers();
// Assert there is one item stored
expect(fs.readdirSync(basePath).length).toEqual(1);
@ -103,21 +94,16 @@ describe('LocalStorage()', () => {
});
it('debounces key sets', () => {
jest.useFakeTimers();
const basePath = `/tmp/insomnia-localstorage-${Math.random()}`;
const localStorage = new LocalStorage(basePath);
localStorage.setItem('foo', 'bar1');
localStorage.setItem('another', 10);
localStorage.setItem('foo', 'bar3');
// Assert timeouts are called
expect(setTimeout).toHaveBeenCalledTimes(3);
expect(setTimeout).nthCalledWith(1, expect.anything(), 100);
expect(setTimeout).nthCalledWith(2, expect.anything(), 100);
expect(setTimeout).nthCalledWith(3, expect.anything(), 100);
expect(fs.readdirSync(basePath).length).toEqual(0);
// Force flush
jest.runAllTimers();
// Force debouncer to flush
jest.runOnlyPendingTimers();
// Make sure only one item exists
expect(fs.readdirSync(basePath).length).toEqual(2);

30
packages/insomnia/src/common/__tests__/misc.test.ts
View File

@ -1,3 +1,5 @@
import { jest } from '@jest/globals';
import { globalBeforeEach } from '../../__jest__/before-each';
import {
capitalize,
@ -19,8 +21,6 @@ import {
xmlDecode,
} from '../misc';
jest.spyOn(global, 'setTimeout');
describe('hasAuthHeader()', () => {
beforeEach(globalBeforeEach);
@ -142,22 +142,25 @@ describe('filterHeaders()', () => {
describe('keyedDebounce()', () => {
beforeEach(async () => {
await globalBeforeEach();
jest.useFakeTimers();
});
it('debounces correctly', () => {
const resultsList = [];
const fn = keyedDebounce(results => {
resultsList.push(results);
}, 100);
it('debounces correctly', async () => {
jest.useFakeTimers();
const resultsList: Record<string, string[]>[] = [];
const setter = jest.fn((result: Record<string, string[]>) => {
resultsList.push(result);
});
jest.clearAllTimers();
const fn = keyedDebounce<string>(setter, 100);
fn('foo', 'bar');
fn('baz', 'bar');
fn('foo', 'bar2');
fn('foo', 'bar3');
fn('multi', 'foo', 'bar', 'baz');
expect(setTimeout).toHaveBeenCalledTimes(5);
expect(resultsList).toEqual([]);
jest.runAllTimers();
expect(resultsList).toEqual([
{
foo: ['bar3'],
@ -169,12 +172,10 @@ describe('keyedDebounce()', () => {
});
describe('debounce()', () => {
beforeEach(async () => {
await globalBeforeEach();
jest.useFakeTimers();
});
beforeEach(globalBeforeEach);
it('debounces correctly', () => {
jest.useFakeTimers();
const resultList = [];
const fn = debounce((...args) => {
resultList.push(args);
@ -184,9 +185,8 @@ describe('debounce()', () => {
fn('multi', 'foo', 'bar', 'baz');
fn('baz', 'bar');
fn('foo', 'bar3');
expect(setTimeout).toHaveBeenCalledTimes(5);
expect(resultList).toEqual([]);
jest.runAllTimers();
jest.runOnlyPendingTimers();
expect(resultList).toEqual([['foo', 'bar3']]);
});
});

2
packages/insomnia/src/common/__tests__/validate-insomnia-config.test.ts
View File

@ -1,4 +1,4 @@
import { mocked } from 'ts-jest/utils';
import { mocked } from 'jest-mock';
import { ConfigError, getConfigSettings as _getConfigSettings } from '../../models/helpers/settings';
import { validateInsomniaConfig } from '../validate-insomnia-config';

10
packages/insomnia/src/common/database.ts
View File

@ -276,12 +276,6 @@ export const database = {
}
},
flushChangesAsync: async (fake = false) => {
process.nextTick(async () => {
await database.flushChanges(0, fake);
});
},
get: async function<T extends BaseModel>(type: string, id?: string) {
if (db._empty) {
return _send<T>('get', ...arguments);
@ -348,7 +342,9 @@ export const database = {
config,
),
);
collection.persistence.setAutocompactionInterval(DB_PERSIST_INTERVAL);
if (!config.inMemoryOnly) {
collection.persistence.setAutocompactionInterval(DB_PERSIST_INTERVAL);
}
db[modelType] = collection;
}

17
packages/insomnia/src/common/misc.ts
View File

@ -132,18 +132,21 @@ export function formatMethodName(method: string) {
return methodName;
}
export function keyedDebounce<T extends Function>(callback: T, millis: number = DEBOUNCE_MILLIS): T {
let timeout;
let results = {};
// @ts-expect-error -- TSCONVERSION
const t: T = function(key, ...args) {
export function keyedDebounce<T>(
callback: (t: Record<string, T[]>) => void,
millis: number = DEBOUNCE_MILLIS
) {
let timeout: NodeJS.Timeout;
let results: Record<string, T[]> = {};
const t = function(key: string, ...args: T[]) {
results[key] = args;
clearTimeout(timeout);
if (timeout) {
clearTimeout(timeout);
}
timeout = setTimeout(() => {
if (!Object.keys(results).length) {
return;
}
callback(results);
results = {};
}, millis);

4
packages/insomnia/src/main/local-storage.ts
View File

@ -14,13 +14,13 @@ class LocalStorage {
console.log(`[localstorage] Initialized at ${basePath}`);
}
setItem(key, obj) {
setItem<T>(key: string, obj?: T) {
clearTimeout(this._timeouts[key]);
this._buffer[key] = JSON.stringify(obj);
this._timeouts[key] = setTimeout(this._flush.bind(this), 100);
}
getItem(key, defaultObj) {
getItem<T>(key: string, defaultObj?: T) {
// Make sure things are flushed before we read
this._flush();

173
packages/insomnia/src/models/__tests__/response.test.ts
View File

@ -7,87 +7,7 @@ import { getDataDirectory } from '../../common/electron-helpers';
import * as models from '../../models';
describe('migrate()', () => {
beforeEach(async () => {
await globalBeforeEach();
Date.now = jest.fn(() => 1234567890);
jest.useFakeTimers();
});
afterEach(async () => {
// Reset to real timers so that other test suites don't fail.
jest.useRealTimers();
});
it('migrates utf8 body correctly', async () => {
const initialModel = {
body: 'hello world!',
encoding: 'utf8',
};
const newModel = await models.initModel(models.response.type, initialModel);
const expectedBodyPath = path.join(
getDataDirectory(),
'responses/fc3ff98e8c6a0d3087d515c0473f8677.zip',
);
const storedBody = models.response.getBodyBuffer(newModel);
// Should have set bodyPath and stored the body
expect(newModel.bodyPath).toBe(expectedBodyPath);
expect(storedBody.toString()).toBe('hello world!');
// Should have stripped these
expect(newModel.body).toBeUndefined();
expect(newModel.encoding).toBeUndefined();
});
it('migrates base64 body correctly', async () => {
const initialModel = {
body: 'aGVsbG8gd29ybGQh',
encoding: 'base64',
};
const newModel = await models.initModel(models.response.type, initialModel);
jest.runAllTimers();
const expectedBodyPath = path.join(
getDataDirectory(),
'responses/fc3ff98e8c6a0d3087d515c0473f8677.zip',
);
const storedBody = models.response.getBodyBuffer(newModel);
// Should have stripped these
expect(newModel.body).toBeUndefined();
expect(newModel.encoding).toBeUndefined();
// Should have set bodyPath and stored the body
expect(newModel.bodyPath).toBe(expectedBodyPath);
expect(storedBody.toString()).toBe('hello world!');
});
it('migrates empty body', async () => {
const initialModel = {
body: '',
};
const newModel = await models.initModel(models.response.type, initialModel);
jest.runAllTimers();
jest.runAllTimers();
const expectedBodyPath = path.join(
getDataDirectory(),
'responses/d41d8cd98f00b204e9800998ecf8427e.zip',
);
const storedBody = models.response.getBodyBuffer(newModel);
// Should have stripped these
expect(newModel.body).toBeUndefined();
expect(newModel.encoding).toBeUndefined();
// Should have set bodyPath and stored the body
expect(newModel.bodyPath).toBe(expectedBodyPath);
expect(storedBody.toString()).toBe('');
});
it('does not migrate body again', async () => {
const initialModel = {
bodyPath: '/foo/bar',
};
const newModel = await models.initModel(models.response.type, initialModel);
// Should have stripped these
expect(newModel.body).toBeUndefined();
expect(newModel.encoding).toBeUndefined();
// Should have set bodyPath and stored the body
expect(newModel.bodyPath).toBe('/foo/bar');
});
beforeEach(globalBeforeEach);
it('does it', async () => {
const bodyPath = path.join(getDataDirectory(), 'foo.zip');
@ -100,16 +20,6 @@ describe('migrate()', () => {
expect(body).toBe('Hello World!');
});
it('migrates old bodies', async () => {
const response = await models.initModel(models.response.type, {
body: 'aGVsbG8gd29ybGQh',
encoding: 'base64',
});
const body = await models.response.getBodyBuffer(response).toString();
expect(response.bodyCompression).toBe(null);
expect(body).toBe('hello world!');
});
it('migrates leaves bodyCompression for null', async () => {
expect(
(
@ -142,84 +52,3 @@ describe('migrate()', () => {
).toBe('zip');
});
});
describe('cleanDeletedResponses()', function() {
beforeEach(globalBeforeEach);
afterEach(function() {
jest.restoreAllMocks();
});
it('deletes nothing if there is no files in directory', async function() {
const mockReaddirSync = jest.spyOn(fs, 'readdirSync');
const mockUnlinkSync = jest.spyOn(fs, 'unlinkSync');
mockReaddirSync.mockReturnValueOnce([]);
mockUnlinkSync.mockImplementation();
await models.response.cleanDeletedResponses();
expect(fs.unlinkSync.mock.calls.length).toBe(0);
});
it('only deletes response files that are not in db', async function() {
const responsesDir = path.join(getDataDirectory(), 'responses');
const dbResponseIds = await createModels(responsesDir, 10);
const notDbResponseIds = [];
for (let index = 100; index < 110; index++) {
notDbResponseIds.push('res_' + index);
}
const mockReaddirSync = jest.spyOn(fs, 'readdirSync');
const mockUnlinkSync = jest.spyOn(fs, 'unlinkSync');
mockReaddirSync.mockReturnValueOnce([...dbResponseIds, ...notDbResponseIds]);
mockUnlinkSync.mockImplementation();
await models.response.cleanDeletedResponses();
expect(fs.unlinkSync.mock.calls.length).toBe(notDbResponseIds.length);
Object.keys(notDbResponseIds).map(index => {
const resId = notDbResponseIds[index];
const bodyPath = path.join(responsesDir, resId);
expect(fs.unlinkSync.mock.calls[index][0]).toBe(bodyPath);
});
});
});
/**
* Create mock workspaces, requests, and responses as many as {@code count}.
* @param responsesDir
* @param count
* @returns {Promise<string[]>} the created response ids
*/
async function createModels(responsesDir, count) {
if (count < 1) {
return [];
}
const responseIds = [];
for (let index = 0; index < count; index++) {
const workspaceId = 'wrk_' + index;
const requestId = 'req_' + index;
const responseId = 'res_' + index;
await models.workspace.create({
_id: workspaceId,
created: 111,
modified: 222,
});
await models.request.create({
_id: requestId,
parentId: workspaceId,
created: 111,
modified: 222,
metaSortKey: 0,
url: 'https://insomnia.rest',
});
await models.response.create({
_id: responseId,
parentId: requestId,
statusCode: 200,
body: 'foo',
bodyPath: path.join(responsesDir, responseId),
});
responseIds.push(responseId);
}
return responseIds;
}

2
packages/insomnia/src/models/helpers/__tests__/settings.test.ts
View File

@ -1,6 +1,6 @@
import { Settings } from 'insomnia-common';
import { mocked } from 'jest-mock';
import { identity } from 'ramda';
import { mocked } from 'ts-jest/utils';
import * as _constants from '../../../common/constants';
import * as electronHelpers from '../../../common/electron-helpers';

88
packages/insomnia/src/models/response.ts
View File

@ -1,13 +1,9 @@
import crypto from 'crypto';
import fs from 'fs';
import mkdirp from 'mkdirp';
import path from 'path';
import { Readable } from 'stream';
import { ValueOf } from 'type-fest';
import zlib from 'zlib';
import { database as db, Query } from '../common/database';
import { getDataDirectory } from '../common/electron-helpers';
import { LIBCURL_DEBUG_MIGRATION_MAP } from '../common/misc';
import type { BaseModel } from './index';
import * as models from './index';
@ -94,17 +90,12 @@ export function init(): BaseResponse {
}
export async function migrate(doc: Response) {
doc = await migrateBodyToFileSystem(doc);
doc = await migrateBodyCompression(doc);
doc = await migrateTimelineToFileSystem(doc);
return doc;
}
export function hookDatabaseInit(consoleLog: typeof console.log = console.log) {
consoleLog('[db] Init responses DB');
process.nextTick(async () => {
await models.response.cleanDeletedResponses();
});
}
export function hookRemove(doc: Response, consoleLog: typeof console.log = console.log) {
@ -306,34 +297,6 @@ function getBodyBufferFromPath<T>(
}
}
async function migrateBodyToFileSystem(doc: Response) {
if (doc.hasOwnProperty('body') && doc._id && !doc.bodyPath) {
// @ts-expect-error -- TSCONVERSION previously doc.body and doc.encoding did exist but are now removed, and if they exist we want to migrate away from them
const bodyBuffer = Buffer.from(doc.body, doc.encoding || 'utf8');
const dir = path.join(getDataDirectory(), 'responses');
mkdirp.sync(dir);
const hash = crypto
.createHash('md5')
.update(bodyBuffer || '')
.digest('hex');
const bodyPath = path.join(dir, `${hash}.zip`);
try {
const buff = bodyBuffer || Buffer.from('');
fs.writeFileSync(bodyPath, buff);
} catch (err) {
console.warn('Failed to write response body to file', err.message);
}
return db.docUpdate(doc, {
bodyPath,
bodyCompression: null,
});
} else {
return doc;
}
}
function migrateBodyCompression(doc: Response) {
if (doc.bodyCompression === '__NEEDS_MIGRATION__') {
doc.bodyCompression = 'zip';
@ -341,54 +304,3 @@ function migrateBodyCompression(doc: Response) {
return doc;
}
async function migrateTimelineToFileSystem(doc: Response) {
if (doc.hasOwnProperty('timeline') && doc._id && !doc.timelinePath) {
const dir = path.join(getDataDirectory(), 'responses');
mkdirp.sync(dir);
// @ts-expect-error -- TSCONVERSION previously doc.timeline did exist but is now removed, and if it exists we want to migrate away from it
const timelineStr = JSON.stringify(doc.timeline, null, '\t');
const fsPath = doc.bodyPath + '.timeline';
try {
fs.writeFileSync(fsPath, timelineStr);
} catch (err) {
console.warn('Failed to write response body to file', err.message);
}
return db.docUpdate(doc, {
timelinePath: fsPath,
});
} else {
return doc;
}
}
export async function cleanDeletedResponses() {
const responsesDir = path.join(getDataDirectory(), 'responses');
mkdirp.sync(responsesDir);
const files = fs.readdirSync(responsesDir);
if (files.length === 0) {
return;
}
const whitelistFiles: string[] = [];
for (const r of (await db.all<Response>(type) || [])) {
whitelistFiles.push(r.bodyPath.slice(responsesDir.length + 1));
whitelistFiles.push(r.timelinePath.slice(responsesDir.length + 1));
}
for (const filePath of files) {
if (whitelistFiles.indexOf(filePath) >= 0) {
continue;
}
try {
fs.unlinkSync(path.join(responsesDir, filePath));
} catch (err) {
// Just keep going, doesn't matter
}
}
}

2
packages/insomnia/src/network/grpc/__tests__/prepare.test.ts
View File

@ -1,4 +1,4 @@
import { mocked } from 'ts-jest/utils';
import { mocked } from 'jest-mock';
import { globalBeforeEach } from '../../../__jest__/before-each';
import {

2
packages/insomnia/src/network/o-auth-2/__tests__/misc.test.ts
View File

@ -1,4 +1,4 @@
import { mocked } from 'ts-jest/utils';
import { mocked } from 'jest-mock';
import { globalBeforeEach } from '../../../__jest__/before-each';
import * as models from '../../../models';

2
packages/insomnia/src/plugins/context/__tests__/app.test.ts
View File

@ -1,5 +1,5 @@
import electron from 'electron';
import { mocked } from 'ts-jest/utils';
import { mocked } from 'jest-mock';
import appPackageJson from '../../../../package.json';
import { globalBeforeEach } from '../../../__jest__/before-each';

5
packages/insomnia/src/plugins/context/__tests__/data.test.ts
View File

@ -156,7 +156,6 @@ describe('app.export.*', () => {
_id: 'res_1',
parentId: 'req_1',
statusCode: 200,
body: 'foo',
});
});
@ -244,8 +243,8 @@ describe('app.export.*', () => {
bodySize: -1,
content: {
mimeType: '',
size: 3,
text: 'foo',
size: 0,
text: '',
},
cookies: [],
headers: [],

2
packages/insomnia/src/sync/vcs/__tests__/migrate-collections.test.ts
View File

@ -1,5 +1,5 @@
import { createBuilder } from '@develohpanda/fluent-builder';
import { mocked } from 'ts-jest/utils';
import { mocked } from 'jest-mock';
import { globalBeforeEach } from '../../../__jest__/before-each';
import { isLoggedIn as _isLoggedIn } from '../../../account/session';

2
packages/insomnia/src/sync/vcs/__tests__/pull-backend-project.test.ts
View File

@ -1,5 +1,5 @@
import { createBuilder } from '@develohpanda/fluent-builder';
import { mocked } from 'ts-jest/utils';
import { mocked } from 'jest-mock';
import { globalBeforeEach } from '../../../__jest__/before-each';
import { DEFAULT_BRANCH_NAME } from '../../../common/constants';

2
packages/insomnia/src/ui/context/nunjucks/__tests__/use-nunjucks.test.ts
View File

@ -1,7 +1,7 @@
import { renderHook } from '@testing-library/react-hooks';
import { mocked } from 'jest-mock';
import configureMockStore from 'redux-mock-store';
import thunk from 'redux-thunk';
import { mocked } from 'ts-jest/utils';
import { PromiseValue } from 'type-fest';
import { globalBeforeEach } from '../../../../__jest__/before-each';

2
packages/insomnia/src/ui/hooks/__tests__/project.test.ts
View File

@ -1,8 +1,8 @@
import { act, renderHook } from '@testing-library/react-hooks';
import { mocked } from 'jest-mock';
import configureMockStore from 'redux-mock-store';
import thunk from 'redux-thunk';
import { mocked } from 'ts-jest/utils';
import { globalBeforeEach } from '../../../__jest__/before-each';
import { reduxStateForTest } from '../../../__jest__/redux-state-for-test';

2
packages/insomnia/src/ui/redux/modules/__tests__/git.test.tsx
View File

@ -1,10 +1,10 @@
import { createBuilder } from '@develohpanda/fluent-builder';
import { PromiseFsClient } from 'isomorphic-git';
import { mocked } from 'jest-mock';
import path from 'path';
import React, { Fragment } from 'react';
import configureMockStore from 'redux-mock-store';
import thunk from 'redux-thunk';
import { mocked } from 'ts-jest/utils';
import { globalBeforeEach } from '../../../../__jest__/before-each';
import { reduxStateForTest } from '../../../../__jest__/redux-state-for-test';

1
packages/insomnia/tsconfig.build.json
View File

@ -28,7 +28,6 @@
"**/main.min.js",
"__jest__",
"assets",
".babelrc.js",
"bin",
"config",
"jest.config.js",

5
packages/openapi-2-kong/jest.config.js
View File

@ -1,9 +1,4 @@
/** @type { import('@jest/types').Config.InitialOptions } */
module.exports = {
preset: '../../jest-preset.js',
globals: {
'ts-jest': {
isolatedModules: false,
},
},
};

13598
packages/openapi-2-kong/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

3
packages/openapi-2-kong/package.json
View File

@ -25,7 +25,8 @@
"devDependencies": {
"@types/url-join": "^4.0.1",
"@types/yaml": "^1.9.7",
"jest": "^26.6.3",
"@jest/globals": "^28.1.0",
"jest": "^28.1.0",
"type-fest": "^2.12.0"
},
"repository": {

2
packages/openapi-2-kong/src/common.test.ts
View File

@ -1,3 +1,5 @@
import { describe, expect, it } from '@jest/globals';
import {
distinctByProperty,
fillServerVariables,

1
packages/openapi-2-kong/src/declarative-config/fixtures.test.ts
View File

@ -1,3 +1,4 @@
import { describe, expect, it } from '@jest/globals';
import { promises, readdirSync } from 'fs';
import path from 'path';

2
packages/openapi-2-kong/src/declarative-config/names.test.ts
View File

@ -1,3 +1,5 @@
import { describe, expect, it } from '@jest/globals';
import { xKongName } from '../types/kong';
import { OA3PathItem, OpenApi3Spec } from '../types/openapi3';
import { generateRouteName } from './services';

32
packages/openapi-2-kong/src/declarative-config/plugins.test.ts
View File

@ -1,8 +1,9 @@
import { describe, expect, it } from '@jest/globals';
import { ParameterSchema, RequestTerminationPlugin, RequestValidatorPlugin, xKongPluginKeyAuth, xKongPluginRequestTermination, xKongPluginRequestValidator } from '../types/kong';
import { OA3Operation, OA3Parameter } from '../types/openapi3';
import { getSpec, pluginDummy, tags, UserDCPlugin } from './jest/test-helpers';
import { getSpec, pluginDummy, tags } from './jest/test-helpers';
import { ALLOW_ALL_SCHEMA, generateBodyOptions, generateGlobalPlugins, generateRequestValidatorPlugin } from './plugins';
describe('plugins', () => {
describe('generateGlobalPlugins()', () => {
it('generates plugin given a spec with a plugin attached', async () => {
@ -26,7 +27,7 @@ describe('plugins', () => {
const result = generateGlobalPlugins(api, tags);
expect(result.plugins).toEqual<UserDCPlugin[]>([
expect(result.plugins).toEqual([
{
name: 'dummy',
tags,
@ -78,13 +79,12 @@ describe('plugins', () => {
const result = generateGlobalPlugins(spec, tags);
expect(result.plugins).toEqual<RequestTerminationPlugin[]>([
expect(result.plugins as RequestTerminationPlugin[]).toEqual([
{
name: 'request-termination',
mad: 'max',
tags,
config: {
// @ts-expect-error this is intentionally passing in an extra property
max: 'is mad',
status_code: 403,
message: 'So long and thanks for all the fish!',
@ -116,7 +116,7 @@ describe('plugins', () => {
},
};
const generated = generateRequestValidatorPlugin({ plugin, tags });
expect(generated).toStrictEqual<RequestValidatorPlugin>({
expect(generated).toStrictEqual({
name: 'request-validator',
enabled: plugin.enabled,
tags,
@ -141,7 +141,7 @@ describe('plugins', () => {
},
};
const generated = generateRequestValidatorPlugin({ plugin, tags });
expect(generated).toStrictEqual<RequestValidatorPlugin>({
expect(generated).toStrictEqual({
name: 'request-validator',
enabled: plugin.enabled,
tags,
@ -163,7 +163,7 @@ describe('plugins', () => {
};
const generated1 = generateRequestValidatorPlugin({ plugin, tags });
expect(generated1.config).toStrictEqual<RequestValidatorPlugin['config']>({
expect(generated1.config).toStrictEqual({
version: 'draft4',
body_schema: ALLOW_ALL_SCHEMA,
});
@ -175,7 +175,7 @@ describe('plugins', () => {
},
tags,
});
expect(generated2.config).toStrictEqual<RequestValidatorPlugin['config']>({
expect(generated2.config).toStrictEqual({
version: 'draft4',
body_schema: ALLOW_ALL_SCHEMA,
});
@ -200,7 +200,7 @@ describe('plugins', () => {
parameters: [param],
};
const generated = generateRequestValidatorPlugin({ tags, operation });
expect(generated.config).toStrictEqual<RequestValidatorPlugin['config']>({
expect(generated.config).toStrictEqual({
version: 'draft4',
parameter_schema: [
{
@ -225,7 +225,7 @@ describe('plugins', () => {
],
};
const generated = generateRequestValidatorPlugin({ tags, operation });
expect(generated.config).toStrictEqual<RequestValidatorPlugin['config']>({
expect(generated.config).toStrictEqual({
version: 'draft4',
parameter_schema: [
{
@ -266,7 +266,7 @@ describe('plugins', () => {
],
};
const generated = generateRequestValidatorPlugin({ tags, operation });
expect(generated.config).toStrictEqual<RequestValidatorPlugin['config']>({
expect(generated.config).toStrictEqual({
version: 'draft4',
parameter_schema: [
{
@ -299,7 +299,7 @@ describe('plugins', () => {
},
};
const generated = generateRequestValidatorPlugin({ plugin, tags });
expect(generated.config).toStrictEqual<RequestValidatorPlugin['config']>({
expect(generated.config).toStrictEqual({
version: 'draft4',
body_schema: ALLOW_ALL_SCHEMA,
});
@ -339,7 +339,7 @@ describe('plugins', () => {
},
};
const generated = generateRequestValidatorPlugin({ tags, operation });
expect(generated.config).toStrictEqual<RequestValidatorPlugin['config']>({
expect(generated.config).toStrictEqual({
version: 'draft4',
body_schema: ALLOW_ALL_SCHEMA,
allowed_content_types: ['application/xml', 'text/yaml'],
@ -378,7 +378,7 @@ describe('plugins', () => {
},
};
const generated = generateRequestValidatorPlugin({ tags, operation });
expect(generated.config).toStrictEqual<RequestValidatorPlugin['config']>({
expect(generated.config).toStrictEqual({
version: 'draft4',
body_schema: JSON.stringify(schemaJson),
allowed_content_types: ['application/xml', 'application/json'],
@ -387,7 +387,7 @@ describe('plugins', () => {
it('should default body_schema if no schema is defined or generated', () => {
const generated = generateRequestValidatorPlugin({ tags, operation: {} });
expect(generated.config).toStrictEqual<RequestValidatorPlugin['config']>({
expect(generated.config).toStrictEqual({
version: 'draft4',
body_schema: ALLOW_ALL_SCHEMA,
});

2
packages/openapi-2-kong/src/declarative-config/security-plugins.test.ts
View File

@ -1,3 +1,5 @@
import { describe, expect, it } from '@jest/globals';
import { OA3SecurityScheme, OA3SecuritySchemeOpenIdConnect } from '../types/openapi3';
import { tags } from './jest/test-helpers';
import { generateSecurityPlugin } from './security-plugins';

2
packages/openapi-2-kong/src/declarative-config/services.test.ts
View File

@ -1,3 +1,5 @@
import { describe, expect, it } from '@jest/globals';
import { OA3Operation } from '../types';
import { DCRoute, DCService } from '../types/declarative-config';
import { xKongPluginKeyAuth, xKongPluginRequestValidator, xKongRouteDefaults } from '../types/kong';

2
packages/openapi-2-kong/src/declarative-config/tags.test.ts
View File

@ -1,3 +1,5 @@
import { describe, expect, it } from '@jest/globals';
import { KeyAuthPlugin, xKongPluginKeyAuth } from '../types/kong';
import { getSpec, tags } from './jest/test-helpers';
import { generatePlugins } from './plugins';

6
packages/openapi-2-kong/src/declarative-config/upstreams.test.ts
View File

@ -1,3 +1,5 @@
import { describe, expect, it } from '@jest/globals';
import { DCUpstream } from '../types';
import { xKongUpstreamDefaults } from '../types/kong';
import { getSpec, tags } from './jest/test-helpers';
@ -22,7 +24,7 @@ describe('upstreams', () => {
it('generates an upstream', () => {
const spec = getSpec();
const specResult = getSpecResult();
expect(generateUpstreams(spec, tags)).toEqual<DCUpstream[]>([specResult]);
expect(generateUpstreams(spec, tags)).toEqual([specResult]);
});
it('throws for a root level x-kong-route-default', () => {
@ -42,7 +44,7 @@ describe('upstreams', () => {
[xKongUpstreamDefaults]: null,
});
const specResult = getSpecResult();
expect(generateUpstreams(spec, tags)).toEqual<DCUpstream[]>([specResult]);
expect(generateUpstreams(spec, tags)).toEqual([specResult]);
});
it('generates upstream name by appending .upstream', () => {

4
packages/openapi-2-kong/src/generate.test.ts
View File

@ -1,13 +1,13 @@
import { describe, expect, it } from '@jest/globals';
import fs from 'fs';
import path from 'path';
import YAML from 'yaml';
import { generate, generateFromSpec, generateFromString, parseSpec } from './generate';
import { K8sKongIngress } from './types/kubernetes-config';
import { OpenApi3Spec } from './types/openapi3';
import { DeclarativeConfigResult, KongForKubernetesResult } from './types/outputs';
const firstK8sDocument: K8sKongIngress = {
const firstK8sDocument = {
apiVersion: 'configuration.konghq.com/v1',
kind: 'KongIngress',
metadata: {

1
packages/openapi-2-kong/src/kubernetes/fixtures.test.ts
View File

@ -1,3 +1,4 @@
import { describe, expect, it } from '@jest/globals';
import { promises, readdirSync } from 'fs';
import path from 'path';
import YAML from 'yaml';

30
packages/openapi-2-kong/src/kubernetes/generate.test.ts
View File

@ -1,6 +1,8 @@
import { describe, expect, it } from '@jest/globals';
import { dummyName, dummyPluginDoc, getSpec, pluginDummy } from '../declarative-config/jest/test-helpers';
import { xKongName } from '../types/kong';
import { K8sAnnotations, K8sIngressRule, K8sIngressTLS, K8sManifest } from '../types/kubernetes-config';
import { K8sAnnotations, K8sIngressTLS } from '../types/kubernetes-config';
import { OA3Server } from '../types/openapi3';
import {
generateIngressRule,
@ -66,7 +68,7 @@ describe('index', () => {
const result = generateMetadataAnnotations(spec, {
pluginNames: [],
});
expect(result).toEqual<K8sAnnotations>({
expect(result).toEqual({
'kubernetes.io/ingress.class': 'kong',
'nginx.ingress.kubernetes.io/rewrite-target': '/',
});
@ -77,7 +79,7 @@ describe('index', () => {
const result = generateMetadataAnnotations(spec, {
pluginNames: [],
});
expect(result).toEqual<K8sAnnotations>({
expect(result).toEqual({
'kubernetes.io/ingress.class': 'kong',
});
});
@ -87,7 +89,7 @@ describe('index', () => {
const result = generateMetadataAnnotations(spec, {
pluginNames: ['one', 'two'],
});
expect(result).toEqual<K8sAnnotations>({
expect(result).toEqual({
'kubernetes.io/ingress.class': 'kong',
'konghq.com/plugins': 'one, two',
});
@ -99,7 +101,7 @@ describe('index', () => {
pluginNames: [],
overrideName: 'name',
});
expect(result).toEqual<K8sAnnotations>({
expect(result).toEqual({
'kubernetes.io/ingress.class': 'kong',
'konghq.com/override': 'name',
});
@ -121,7 +123,7 @@ describe('index', () => {
pluginNames: ['one', 'two'],
overrideName: 'name',
});
expect(result).toEqual<K8sAnnotations>({
expect(result).toEqual({
'kubernetes.io/ingress.class': 'kong',
'nginx.ingress.kubernetes.io/rewrite-target': '/',
'konghq.com/plugins': 'one, two',
@ -129,7 +131,7 @@ describe('index', () => {
});
// Should not modify source metadata annotations object
const sourceMetadata = spec.info['x-kubernetes-ingress-metadata']?.annotations;
expect(sourceMetadata).toStrictEqual<K8sAnnotations>(annotations);
expect(sourceMetadata).toStrictEqual(annotations);
});
});
@ -321,7 +323,7 @@ describe('index', () => {
},
'my-ingress',
);
expect(result).toStrictEqual<K8sIngressRule>({
expect(result).toStrictEqual({
host: 'api.insomnia.rest',
http: {
paths: [
@ -532,9 +534,8 @@ describe('index', () => {
it('handles global plugins', () => {
const spec = getSpec({ servers, ...pluginKeyAuth, ...pluginDummy });
const result = generateKongForKubernetesConfigFromSpec(spec);
expect(result.documents).toStrictEqual<K8sManifest[]>([
expect(result.documents).toStrictEqual([
keyAuthPluginDoc('g0'),
// @ts-expect-error -- TSCONVERSION more work is needed to module augment to include DummyPlugin (but not export those augmentations)
dummyPluginDoc('g1'),
ingressDoc(0, [keyAuthName('g0'), dummyName('g1')], 'api.insomnia.rest', 'my-api-service-0'),
]);
@ -559,11 +560,10 @@ describe('index', () => {
],
});
const result = generateKongForKubernetesConfigFromSpec(spec);
expect(result.documents).toStrictEqual<K8sManifest[]>([
expect(result.documents).toStrictEqual([
keyAuthPluginDoc('g0'),
keyAuthPluginDoc('s1'),
keyAuthPluginDoc('s2'),
// @ts-expect-error -- TSCONVERSION more work is needed to module augment to include DummyPlugin (but not export those augmentations)
dummyPluginDoc('s3'),
ingressDoc(0, [keyAuthName('g0')], 'api-0.insomnia.rest', 'my-api-service-0'),
ingressDoc(1, [keyAuthName('s1')], 'api-1.insomnia.rest', 'my-api-service-1'),
@ -587,11 +587,10 @@ describe('index', () => {
},
});
const result = generateKongForKubernetesConfigFromSpec(spec);
expect(result.documents).toStrictEqual<K8sManifest[]>([
expect(result.documents).toStrictEqual([
keyAuthPluginDoc('g0'),
keyAuthPluginDoc('p1'),
keyAuthPluginDoc('p2'),
// @ts-expect-error -- TSCONVERSION more work is needed to module augment to include DummyPlugin (but not export those augmentations)
dummyPluginDoc('p3'),
ingressDoc(0, [keyAuthName('g0')], 'api.insomnia.rest', 'my-api-service-0', '/no-plugin'),
ingressDoc(1, [keyAuthName('p1')], 'api.insomnia.rest', 'my-api-service-0', '/plugin-0'),
@ -618,14 +617,13 @@ describe('index', () => {
},
});
const result = generateKongForKubernetesConfigFromSpec(spec);
expect(result.documents).toStrictEqual<K8sManifest[]>([
expect(result.documents).toStrictEqual([
methodDoc('get'),
methodDoc('put'),
methodDoc('post'),
keyAuthPluginDoc('g0'),
keyAuthPluginDoc('m1'),
keyAuthPluginDoc('m2'),
// @ts-expect-error -- TSCONVERSION more work is needed to module augment to include DummyPlugin (but not export those augmentations)
dummyPluginDoc('m3'),
ingressDocWithOverride(
0,

10
packages/openapi-2-kong/src/kubernetes/plugins.test.ts
View File

@ -1,6 +1,8 @@
import { beforeEach, describe, expect, it, jest } from '@jest/globals';
import { HttpMethod } from '../common';
import { dummyPluginDoc, pluginDummy, UserK8sPlugin } from '../declarative-config/jest/test-helpers';
import { OperationPlugin, PathPlugin } from '../types/k8s-plugins';
import { dummyPluginDoc, pluginDummy } from '../declarative-config/jest/test-helpers';
import { IndexIncrement, OperationPlugin, PathPlugin } from '../types/k8s-plugins';
import {
OA3Components,
OA3Operation,
@ -165,7 +167,7 @@ describe('plugins', () => {
it('returns multiple plugin docs', () => {
const api: OpenApi3Spec = { ...spec, ...pluginKeyAuth, ...pluginDummy };
const result = getGlobalPlugins(api, increment);
expect(result).toEqual<UserK8sPlugin[]>([keyAuthPluginDoc('g0'), dummyPluginDoc('g1')]);
expect(result).toEqual([keyAuthPluginDoc('g0'), dummyPluginDoc('g1')]);
});
it('returns security plugin doc', () => {
@ -430,7 +432,7 @@ describe('plugins', () => {
describe('generateK8sPluginConfig()', () => {
it('should return empty array if no plugin keys found and not increment', () => {
const incrementMock = jest.fn().mockReturnValue(0);
const incrementMock = jest.fn<IndexIncrement>().mockReturnValue(0);
const result = generateK8sPluginConfig(spec, 's', incrementMock);
expect(result).toHaveLength(0);
expect(incrementMock).not.toHaveBeenCalled();

2
packages/openapi-2-kong/src/kubernetes/variables.test.ts
View File

@ -1,3 +1,5 @@
import { describe, expect, it } from '@jest/globals';
import { OA3ServerVariable } from '../types/openapi3';
import { pathVariablesToWildcard, resolveUrlVariables, resolveVariables } from './variables';