Skip to content

V
vscode

xxadev / vscode
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 0
Fork 0
V
vscode

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

未验证 提交 a7ed9c95 编写于 作者: B Benjamin Pasero 提交者： GitHub
浏览文件
操作

🆙 playwright@0.11.0 (#90663)

上级 9cda3b7b
隐藏空白更改
内联 并排
Showing with 38 addition and 32 deletion
extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts
浏览文件 @ a7ed9c95
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/ *--------------------------------------------------------------------------------------------*/
import * as assert from 'assert'; import * as assert from 'assert';
import { workspace, window, commands, ViewColumn, TextEditorViewColumnChangeEvent, Uri, Selection, Position, CancellationTokenSource, TextEditorSelectionChangeKind, env, UIKind } from 'vscode'; import { workspace, window, commands, ViewColumn, TextEditorViewColumnChangeEvent, Uri, Selection, Position, CancellationTokenSource, TextEditorSelectionChangeKind } from 'vscode';
import { join } from 'path'; import { join } from 'path';
import { closeAllEditors, pathEquals, createRandomFile } from '../utils'; import { closeAllEditors, pathEquals, createRandomFile } from '../utils';
...@@ -146,12 +146,6 @@ suite('window namespace tests', () => { ...@@ -146,12 +146,6 @@ suite('window namespace tests', () => {
}); });
test('active editor not always correct... #49125', async function () { test('active editor not always correct... #49125', async function () {
if (env.uiKind === UIKind.Web) {
// https://github.com/microsoft/vscode/issues/90470
// https://github.com/microsoft/playwright/issues/979
this.skip();
return;
}
const randomFile1 = await createRandomFile(); const randomFile1 = await createRandomFile();
const randomFile2 = await createRandomFile(); const randomFile2 = await createRandomFile();
......
package.json
浏览文件 @ a7ed9c95
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
"opn": "^6.0.0", "opn": "^6.0.0",
"optimist": "0.3.5", "optimist": "0.3.5",
"p-all": "^1.0.0", "p-all": "^1.0.0",
"playwright": "^0.10.0", "playwright": "0.11.0",
"pump": "^1.0.1", "pump": "^1.0.1",
"queue": "3.0.6", "queue": "3.0.6",
"rcedit": "^1.1.0", "rcedit": "^1.1.0",
......
test/automation/src/playwrightDriver.ts
浏览文件 @ a7ed9c95
...@@ -141,10 +141,12 @@ export function connect(engine: 'chromium' | 'webkit' | 'firefox' = 'chromium'): ...@@ -141,10 +141,12 @@ export function connect(engine: 'chromium' | 'webkit' | 'firefox' = 'chromium'):
return new Promise(async (c) => { return new Promise(async (c) => {
const browser = await playwright[engine].launch({ const browser = await playwright[engine].launch({
// Run in Edge dev on macOS // Run in Edge dev on macOS
// executablePath: '/Applications/Microsoft\ Edge\ Dev.app/Contents/MacOS/Microsoft\ Edge\ Dev' // executablePath: '/Applications/Microsoft\ Edge\ Dev.app/Contents/MacOS/Microsoft\ Edge\ Dev',
headless: false
}); });
const page = (await browser.defaultContext().pages())[0]; const context = await browser.newContext();
await page.setViewport({ width, height }); const page = await context.newPage();
await page.setViewportSize({ width, height });
await page.goto(`${endpoint}&folder=vscode-remote://localhost:9888${URI.file(workspacePath!).path}`); await page.goto(`${endpoint}&folder=vscode-remote://localhost:9888${URI.file(workspacePath!).path}`);
const result = { const result = {
client: { dispose: () => browser.close() && teardown() }, client: { dispose: () => browser.close() && teardown() },
......
test/integration/browser/package.json
浏览文件 @ a7ed9c95
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
"devDependencies": { "devDependencies": {
"@types/mkdirp": "0.5.1", "@types/mkdirp": "0.5.1",
"@types/node": "^12.11.7", "@types/node": "^12.11.7",
"@types/optimist": "0.0.29",
"@types/rimraf": "2.0.2", "@types/rimraf": "2.0.2",
"@types/tmp": "^0.1.0", "@types/tmp": "^0.1.0",
"rimraf": "^2.6.1", "rimraf": "^2.6.1",
......
test/integration/browser/src/index.ts
浏览文件 @ a7ed9c95
...@@ -11,8 +11,9 @@ import * as tmp from 'tmp'; ...@@ -11,8 +11,9 @@ import * as tmp from 'tmp';
import * as rimraf from 'rimraf'; import * as rimraf from 'rimraf';
import { URI } from 'vscode-uri'; import { URI } from 'vscode-uri';
import * as kill from 'tree-kill'; import * as kill from 'tree-kill';
import * as optimistLib from 'optimist';
const optimist = require('optimist') const optimist = optimistLib
.describe('workspacePath', 'path to the workspace to open in the test').string('workspacePath') .describe('workspacePath', 'path to the workspace to open in the test').string('workspacePath')
.describe('extensionDevelopmentPath', 'path to the extension to test').string('extensionDevelopmentPath') .describe('extensionDevelopmentPath', 'path to the extension to test').string('extensionDevelopmentPath')
.describe('extensionTestsPath', 'path to the extension tests').string('extensionTestsPath') .describe('extensionTestsPath', 'path to the extension tests').string('extensionTestsPath')
...@@ -28,11 +29,12 @@ if (optimist.argv.help) { ...@@ -28,11 +29,12 @@ if (optimist.argv.help) {
const width = 1200; const width = 1200;
const height = 800; const height = 800;
async function runTestsInBrowser(browserType: string, endpoint: url.UrlWithStringQuery, server: cp.ChildProcess): Promise<void> { async function runTestsInBrowser(browserType: 'chromium' | 'firefox' | 'webkit', endpoint: url.UrlWithStringQuery, server: cp.ChildProcess): Promise<void> {
const args = process.platform === 'linux' && browserType === 'chromium' ? ['--no-sandbox'] : undefined; // disable sandbox to run chrome on certain Linux distros const args = process.platform === 'linux' && browserType === 'chromium' ? ['--no-sandbox'] : undefined; // disable sandbox to run chrome on certain Linux distros
const browser = await playwright[browserType].launch({ headless: !Boolean(optimist.argv.debug), dumpio: true, args }); const browser = await playwright[browserType].launch({ headless: !Boolean(optimist.argv.debug), dumpio: true, args });
const page = (await browser.defaultContext().pages())[0]; const context = await browser.newContext();
await page.setViewport({ width, height }); const page = await context.newPage();
await page.setViewportSize({ width, height });
const host = endpoint.host; const host = endpoint.host;
const protocol = 'vscode-remote'; const protocol = 'vscode-remote';
......
test/integration/browser/yarn.lock
浏览文件 @ a7ed9c95
...@@ -38,6 +38,11 @@ ...@@ -38,6 +38,11 @@
resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.26.tgz#213e153babac0ed169d44a6d919501e68f59dea9" resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.26.tgz#213e153babac0ed169d44a6d919501e68f59dea9"
integrity sha512-UmUm94/QZvU5xLcUlNR8hA7Ac+fGpO1EG/a8bcWVz0P0LqtxFmun9Y2bbtuckwGboWJIT70DoWq1r3hb56n3DA== integrity sha512-UmUm94/QZvU5xLcUlNR8hA7Ac+fGpO1EG/a8bcWVz0P0LqtxFmun9Y2bbtuckwGboWJIT70DoWq1r3hb56n3DA==
"@types/optimist@0.0.29":
version "0.0.29"
resolved "https://registry.yarnpkg.com/@types/optimist/-/optimist-0.0.29.tgz#a8873580b3a84b69ac1e687323b15fbbeb90479a"
integrity sha1-qIc1gLOoS2msHmhzI7Ffu+uQR5o=
"@types/rimraf@2.0.2": "@types/rimraf@2.0.2":
version "2.0.2" version "2.0.2"
resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.2.tgz#7f0fc3cf0ff0ad2a99bb723ae1764f30acaf8b6e" resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.2.tgz#7f0fc3cf0ff0ad2a99bb723ae1764f30acaf8b6e"
......
test/unit/browser/index.js
浏览文件 @ a7ed9c95
...@@ -120,7 +120,8 @@ const testModules = (async function () { ...@@ -120,7 +120,8 @@ const testModules = (async function () {
async function runTestsInBrowser(testModules, browserType) { async function runTestsInBrowser(testModules, browserType) {
const args = process.platform === 'linux' && browserType === 'chromium' ? ['--no-sandbox'] : undefined; // disable sandbox to run chrome on certain Linux distros const args = process.platform === 'linux' && browserType === 'chromium' ? ['--no-sandbox'] : undefined; // disable sandbox to run chrome on certain Linux distros
const browser = await playwright[browserType].launch({ headless: !Boolean(argv.debug), dumpio: true, args }); const browser = await playwright[browserType].launch({ headless: !Boolean(argv.debug), dumpio: true, args });
const page = (await browser.defaultContext().pages())[0] const context = await browser.newContext();
const page = await context.newPage();
const target = url.pathToFileURL(path.join(__dirname, 'renderer.html')); const target = url.pathToFileURL(path.join(__dirname, 'renderer.html'));
if (argv.build) { if (argv.build) {
target.search = `?build=true`; target.search = `?build=true`;
......
yarn.lock
浏览文件 @ a7ed9c95
...@@ -5878,11 +5878,6 @@ mime@^1.4.1: ...@@ -5878,11 +5878,6 @@ mime@^1.4.1:
resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
mime@^2.0.3:
version "2.4.4"
resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5"
integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==
mimic-fn@^1.0.0: mimic-fn@^1.0.0:
version "1.1.0" version "1.1.0"
resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
...@@ -6927,29 +6922,28 @@ pkg-dir@^3.0.0: ...@@ -6927,29 +6922,28 @@ pkg-dir@^3.0.0:
dependencies: dependencies:
find-up "^3.0.0" find-up "^3.0.0"
playwright-core@=0.10.0: playwright-core@=0.11.0:
version "0.10.0" version "0.11.0"
resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-0.10.0.tgz#86699c9cc3e613d733e6635a54aceea1993013d5" resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-0.11.0.tgz#a2372833f6ec4e7886c4409e3da93df997aee61b"
integrity sha512-yernA6yrrBhmb8M5eO6GZsJOrBKWOZszlu65Luz8LP7ryaDExN1sE9XjQBNbiwJ5Gfs8cehtAO7GfTDJt+Z2cQ== integrity sha512-9UPP/Max65PMiZJz9DNWB3ZRWtTlYlceLFnm6JO8aU7m6Vw3gwCvuSGoC5W69H67q98jH0VPSPp546+EnkiR2g==
dependencies: dependencies:
debug "^4.1.0" debug "^4.1.0"
extract-zip "^1.6.6" extract-zip "^1.6.6"
https-proxy-agent "^3.0.0" https-proxy-agent "^3.0.0"
jpeg-js "^0.3.6" jpeg-js "^0.3.6"
mime "^2.0.3"
pngjs "^3.4.0" pngjs "^3.4.0"
progress "^2.0.3" progress "^2.0.3"
proxy-from-env "^1.0.0" proxy-from-env "^1.0.0"
rimraf "^2.6.1" rimraf "^3.0.2"
uuid "^3.4.0" uuid "^3.4.0"
ws "^6.1.0" ws "^6.1.0"
playwright@^0.10.0: playwright@0.11.0:
version "0.10.0" version "0.11.0"
resolved "https://registry.yarnpkg.com/playwright/-/playwright-0.10.0.tgz#d37f7e42e0e868dcc4ec35cb0a8dbc6248457642" resolved "https://registry.yarnpkg.com/playwright/-/playwright-0.11.0.tgz#2abec99ea278b220bcd3902d7520ec22abc2d97e"
integrity sha512-f3VRME/PIO5NbcWnlCDfXwPC0DAZJ7ETkcAdE+sensLCOkfDtLh97E71ZuxNCaPYsUA6FIPi5syD8pHJW/4hQQ== integrity sha512-cTJZ06OhwseMC9+D6KX1NmZXyEoaJl0o6GLkDhwmou3IFTrUFVOw7KYMBpcbJz0Rhb/de5ZPFlDTffLfEy/9lg==
dependencies: dependencies:
playwright-core "=0.10.0" playwright-core "=0.11.0"
plist@^3.0.1: plist@^3.0.1:
version "3.0.1" version "3.0.1"
...@@ -7952,6 +7946,13 @@ rimraf@^2.4.2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2: ...@@ -7952,6 +7946,13 @@ rimraf@^2.4.2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
dependencies: dependencies:
glob "^7.0.5" glob "^7.0.5"
rimraf@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
dependencies:
glob "^7.1.3"
rimraf@~2.2.6: rimraf@~2.2.6:
version "2.2.8" version "2.2.8"
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582"
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或