Merge pull request #488 from che-incubator/fix-tests

fix: Fix VS Code tests

Author: RomanNikitenko

.rebase/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 The file to keep a list of changed files which will potentionaly help to resolve rebase conflicts.
 
+#### @RomanNikitenko
+https://github.com/che-incubator/che-code/pull/488
+
+- code/test/integration/browser/src/index.ts
+- code/test/automation/src/playwrightBrowser.ts
+---
+
 #### @RomanNikitenko
 https://github.com/che-incubator/che-code/pull/482
 

.rebase/replace/code/test/automation/src/playwrightBrowser.ts.json

@@ -0,0 +1,6 @@
+[
+	{
+			"from": "headless: headless ?? false,",
+			"by": "headless: headless ?? false,\\\n\\\t\\\targs: ['--headless=new'],"
+	}
+]

.rebase/replace/code/test/integration/browser/src/index.ts.json

@@ -0,0 +1,6 @@
+[
+	{
+			"from": "const browser = await playwright[browserType].launch({ headless: !Boolean(args.debug) });",
+			"by": "const browser = await playwright[browserType].launch({ headless: !Boolean(args.debug), args: ['--headless=new'], });"
+	}
+]

code/test/automation/src/playwrightBrowser.ts

@@ -92,6 +92,7 @@ async function launchBrowser(options: LaunchOptions, endpoint: string) {
 
 	const browser = await measureAndLog(() => playwright[options.browser ?? 'chromium'].launch({
 		headless: headless ?? false,
+		args: ['--headless=new'],
 		timeout: 0
 	}), 'playwright#launch', logger);
 

code/test/integration/browser/src/index.ts

@@ -63,7 +63,7 @@ const height = 800;
 type BrowserType = 'chromium' | 'firefox' | 'webkit';
 
 async function runTestsInBrowser(browserType: BrowserType, endpoint: url.UrlWithStringQuery, server: cp.ChildProcess): Promise<void> {
-	const browser = await playwright[browserType].launch({ headless: !Boolean(args.debug) });
+	const browser = await playwright[browserType].launch({ headless: !Boolean(args.debug), args: ['--headless=new'], });
 	const context = await browser.newContext();
 
 	const page = await context.newPage();

rebase.sh

@@ -447,6 +447,10 @@ resolve_conflicts() {
       apply_changes "$conflictingFile"
     elif [[ "$conflictingFile" == "code/src/vs/workbench/browser/parts/titlebar/commandCenterControl.ts" ]]; then
       apply_changes "$conflictingFile"
+    elif [[ "$conflictingFile" == "code/test/automation/src/playwrightBrowser.ts" ]]; then
+      apply_changes "$conflictingFile"
+    elif [[ "$conflictingFile" == "code/test/integration/browser/src/index.ts" ]]; then
+      apply_changes "$conflictingFile"
     else
       echo "$conflictingFile file cannot be automatically rebased. Aborting"
       exit 1