Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions .yarn/patches/vscode-extension-tester-npm-8.24.0-62b74258e3.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
diff --git a/out/browser.js b/out/browser.js
index 1bd673e101e4d1b3e8fd9ef427c4de675d3961e6..b23512577e05517b0154e7c21718bd280b1cdc9f 100644
--- a/out/browser.js
+++ b/out/browser.js
@@ -312,6 +312,21 @@ class VSBrowser {
if (paths.length === 0) {
return;
}
+ // Workaround for microsoft/vscode#330243 (see also
+ // redhat-developer/vscode-extension-tester#2454): `CodeUtil.open` spawns a
+ // second-instance CLI call, and when that lands while VS Code is still
+ // starting up, VS Code >= 1.123.0 duplicates every 256 KiB chunk of every
+ // webview resource in the window AND the webview service worker caches the
+ // corrupted responses, permanently poisoning the profile. Waiting for the
+ // workbench element alone is not enough - it appears while the race window
+ // is still open - so the first open of a session additionally waits for the
+ // instance to settle.
+ if (!VSBrowser._openResourcesSettled) {
+ await this.waitForWorkbench();
+ const settleMs = Number(process.env.EXTESTER_OPEN_RESOURCE_SETTLE_MS ?? 10000);
+ await new Promise((resolve) => setTimeout(resolve, settleMs));
+ VSBrowser._openResourcesSettled = true;
+ }
const code = new codeUtil_1.CodeUtil(this.storagePath, this.releaseType, this.extensionsFolder);
code.open(...paths);
await this.waitForWorkbench(undefined, waitForFn);
5 changes: 4 additions & 1 deletion it-tests/views/11_TestsViewNewFile.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@ import {
handleInputPathSelection,
} from '../Util';

describe('Tests View', function () {
// TODO(#1477): temporarily disabled — Citrus 5.0.0 broke Camel JBang's `camel test`
// shim (`package org.citrusframework.jbang.cli does not exist`), failing these tests on
// every branch and OS. Re-enable once #1477 is resolved.
describe.skip('Tests View', function () {
this.timeout(240_000);

const WORKSPACE_FOLDER = join(__dirname, '../../test Fixture with speci@l chars', 'kaoto-view', 'example-tests');
Expand Down
5 changes: 4 additions & 1 deletion it-tests/views/12_TestsViewRun.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@ import {
waitUntilTerminalHasText,
} from '../Util';

describe('Tests View', function () {
// TODO(#1477): temporarily disabled — Citrus 5.0.0 broke Camel JBang's `camel test`
// shim (`package org.citrusframework.jbang.cli does not exist`), failing these tests on
// every branch and OS. Re-enable once #1477 is resolved.
describe.skip('Tests View', function () {
this.timeout(240_000);

const WORKSPACE_FOLDER = join(__dirname, '../../test Fixture with speci@l chars', 'kaoto-view', 'example-tests');
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"test:it:clean": "rimraf ./test-resources && rimraf ./out && rimraf *.vsix"
},
"dependencies": {
"@kaoto/camel-catalog": "^0.5.5",
"@kaoto/camel-catalog": "^0.7.0",
Comment thread
PVinaches marked this conversation as resolved.
"@kaoto/kaoto": "2.11.0",
"@kie-tools-core/backend": "10.0.0",
"@kie-tools-core/editor": "10.0.0",
Expand Down Expand Up @@ -1354,7 +1354,7 @@
"ts-loader": "9.4.4",
"tsconfig-paths-webpack-plugin": "^4.2.0",
"typescript": "^5.9.3",
"vscode-extension-tester": "^8.23.0",
"vscode-extension-tester": "patch:vscode-extension-tester@npm%3A8.24.0#~/.yarn/patches/vscode-extension-tester-npm-8.24.0-62b74258e3.patch",
"web-worker": "^1.5.0",
"webpack": "5.108.3",
"webpack-cli": "7.1.0",
Expand Down
7 changes: 1 addition & 6 deletions src/services/openapi-import.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,7 @@ export type RestMethods = 'get' | 'head' | 'post' | 'put' | 'patch' | 'delete';
* Union type of all REST method definition types.
*/
export type RestMethodDefinitions =
| Flatten<Rest['get']>
| Flatten<Rest['head']>
| Flatten<Rest['post']>
| Flatten<Rest['put']>
| Flatten<Rest['patch']>
| Flatten<Rest['delete']>;
Flatten<Rest['get']> | Flatten<Rest['head']> | Flatten<Rest['post']> | Flatten<Rest['put']> | Flatten<Rest['patch']> | Flatten<Rest['delete']>;

/**
* Array of supported REST DSL verbs.
Expand Down
Loading
Loading