Merge from vscode 79a1f5a5ca0c6c53db617aa1fa5a2396d2caebe2

2026-02-16 10:58:30 -05:00 · 2020-05-31 19:47:51 +00:00
parent 84492049e8
commit 28be33cfea
913 changed files with 28242 additions and 15549 deletions
--- a/test/unit/electron/index.js
+++ b/test/unit/electron/index.js
@@ -124,7 +124,9 @@ app.on('ready', () => {
 			backgroundThrottling: false,
 			nodeIntegration: true,
 			webSecurity: false,
-			webviewTag: true
+			webviewTag: true,
+			preload: path.join(__dirname, '..', '..', '..', 'src', 'vs', 'base', 'parts', 'sandbox', 'electron-browser', 'preload.js'), // ensure similar environment as VSCode as tests may depend on this
+			enableWebSQL: false
 		}
 	});