From 3159fa24938a12834509471179a48bb3df1da2f6 Mon Sep 17 00:00:00 2001 From: Johannes Date: Mon, 4 Sep 2023 18:26:25 +0200 Subject: [PATCH 1/4] update playwright --- package.json | 2 +- yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 4a0405868b6..2814401b7f9 100644 --- a/package.json +++ b/package.json @@ -107,7 +107,7 @@ "yazl": "^2.4.3" }, "devDependencies": { - "@playwright/test": "^1.34.3", + "@playwright/test": "^1.37.1", "@swc/cli": "0.1.62", "@swc/core": "1.3.62", "@types/cookie": "^0.3.3", diff --git a/yarn.lock b/yarn.lock index e2a9ec02d7b..c49176e5cb6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -682,13 +682,13 @@ node-addon-api "^3.2.1" node-gyp-build "^4.3.0" -"@playwright/test@^1.34.3": - version "1.34.3" - resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.34.3.tgz#d9f1ac3f1a09633b5ca5351c50c308bf802bde53" - integrity sha512-zPLef6w9P6T/iT6XDYG3mvGOqOyb6eHaV9XtkunYs0+OzxBtrPAAaHotc0X+PJ00WPPnLfFBTl7mf45Mn8DBmw== +"@playwright/test@^1.37.1": + version "1.37.1" + resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.37.1.tgz#e7f44ae0faf1be52d6360c6bbf689fd0057d9b6f" + integrity sha512-bq9zTli3vWJo8S3LwB91U0qDNQDpEXnw7knhxLM0nwDvexQAwx9tO8iKDZSqqneVq+URd/WIoz+BALMqUTgdSg== dependencies: "@types/node" "*" - playwright-core "1.34.3" + playwright-core "1.37.1" optionalDependencies: fsevents "2.3.2" @@ -7827,10 +7827,10 @@ playwright-core@1.32.2: resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.32.2.tgz#608810c3c4486fb86a224732ac0d3560a96ded8b" integrity sha512-zD7aonO+07kOTthsrCR3YCVnDcqSHIJpdFUtZEMOb6//1Rc7/6mZDRdw+nlzcQiQltOOsiqI3rrSyn/SlyjnJQ== -playwright-core@1.34.3: - version "1.34.3" - resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.34.3.tgz#bc906ea1b26bb66116ce329436ee59ba2e78fe9f" - integrity sha512-2pWd6G7OHKemc5x1r1rp8aQcpvDh7goMBZlJv6Co5vCNLVcQJdhxRL09SGaY6HcyHH9aT4tiynZabMofVasBYw== +playwright-core@1.37.1: + version "1.37.1" + resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.37.1.tgz#cb517d52e2e8cb4fa71957639f1cd105d1683126" + integrity sha512-17EuQxlSIYCmEMwzMqusJ2ztDgJePjrbttaefgdsiqeLWidjYz9BxXaTaZWxH1J95SHGk6tjE+dwgWILJoUZfA== playwright@^1.29.2: version "1.30.0" From a10be9fb4cf30bb1f69033e241ee65c689a9746c Mon Sep 17 00:00:00 2001 From: Johannes Date: Mon, 4 Sep 2023 18:26:57 +0200 Subject: [PATCH 2/4] skip `smart diff consistency` because it fails on webkit and causes other tests to fail... --- src/vs/base/test/browser/ui/tree/indexTreeModel.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/base/test/browser/ui/tree/indexTreeModel.test.ts b/src/vs/base/test/browser/ui/tree/indexTreeModel.test.ts index 9ae0e08b0f1..6b60b35aef6 100644 --- a/src/vs/base/test/browser/ui/tree/indexTreeModel.test.ts +++ b/src/vs/base/test/browser/ui/tree/indexTreeModel.test.ts @@ -380,7 +380,7 @@ suite('IndexTreeModel', () => { assert.deepStrictEqual(list[5].depth, 1); })); - test('smart diff consistency', () => { + test.skip('smart diff consistency', () => { const times = 500; const minEdits = 1; const maxEdits = 10; From 8f4d4d4bad51c7af90975521ad44fb1c82f3d911 Mon Sep 17 00:00:00 2001 From: Johannes Date: Tue, 5 Sep 2023 11:47:13 +0200 Subject: [PATCH 3/4] workaround browser bug, fix browser test debugging --- src/vs/base/common/arrays.ts | 6 +++++- test/unit/browser/renderer.html | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/vs/base/common/arrays.ts b/src/vs/base/common/arrays.ts index 4061404c8ee..ad2f1b67137 100644 --- a/src/vs/base/common/arrays.ts +++ b/src/vs/base/common/arrays.ts @@ -667,7 +667,11 @@ export function insertInto(array: T[], start: number, newItems: T[]): void { */ export function splice(array: T[], start: number, deleteCount: number, newItems: T[]): T[] { const index = getActualStartIndex(array, start); - const result = array.splice(index, deleteCount); + let result = array.splice(index, deleteCount); + if (result === undefined) { + // see https://bugs.webkit.org/show_bug.cgi?id=261140 + result = []; + } insertInto(array, index, newItems); return result; } diff --git a/test/unit/browser/renderer.html b/test/unit/browser/renderer.html index 45786072900..fe62a749a68 100644 --- a/test/unit/browser/renderer.html +++ b/test/unit/browser/renderer.html @@ -156,7 +156,7 @@ if (Array.isArray(modules) && modules.length > 0) { console.log('MANUALLY running tests', modules); - loadAndRun(modules, true).then(() => console.log('done'), err => console.log(err)); + loadAndRun({modules}, true).then(() => console.log('done'), err => console.log(err)); } From ba3bc87570dd69a027df091b59e7dfa8e9e7f0bb Mon Sep 17 00:00:00 2001 From: Johannes Date: Tue, 5 Sep 2023 11:53:37 +0200 Subject: [PATCH 4/4] unskip test --- src/vs/base/test/browser/ui/tree/indexTreeModel.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/base/test/browser/ui/tree/indexTreeModel.test.ts b/src/vs/base/test/browser/ui/tree/indexTreeModel.test.ts index 6b60b35aef6..9ae0e08b0f1 100644 --- a/src/vs/base/test/browser/ui/tree/indexTreeModel.test.ts +++ b/src/vs/base/test/browser/ui/tree/indexTreeModel.test.ts @@ -380,7 +380,7 @@ suite('IndexTreeModel', () => { assert.deepStrictEqual(list[5].depth, 1); })); - test.skip('smart diff consistency', () => { + test('smart diff consistency', () => { const times = 500; const minEdits = 1; const maxEdits = 10;