Commit e9cd4b8a authored by Tim van der Lippe's avatar Tim van der Lippe Committed by Commit Bot

Reenable DevTools test

https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/2503953
has landed

R=aerotwist@chromium.org

Bug: 1143170
Change-Id: I94cee3838e9ba305449b9ce0356f597e13074b7a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2503698
Commit-Queue: Tim van der Lippe <tvanderlippe@chromium.org>
Reviewed-by: default avatarPaul Lewis <aerotwist@chromium.org>
Reviewed-by: default avatarSimon Zünd <szuend@chromium.org>
Cr-Commit-Position: refs/heads/master@{#823528}
parent da13614f
...@@ -6019,7 +6019,7 @@ crbug.com/1105279 [ Mac ] virtual/threaded/fast/scroll-snap/snaps-for-different- ...@@ -6019,7 +6019,7 @@ crbug.com/1105279 [ Mac ] virtual/threaded/fast/scroll-snap/snaps-for-different-
# Temporarily disable tests to allow fixing of devtools path escaping # Temporarily disable tests to allow fixing of devtools path escaping
crbug.com/1094436 http/tests/devtools/overrides/project-added-with-existing-files-bind.js [ Pass Timeout Failure ] crbug.com/1094436 http/tests/devtools/overrides/project-added-with-existing-files-bind.js [ Pass Timeout Failure ]
crbug.com/1094436 http/tests/devtools/persistence/automapping-urlencoded-paths.js [ Pass Failure ] crbug.com/1094436 http/tests/devtools/persistence/automapping-urlencoded-paths.js [ Pass Failure ]
crbug.com/1094436 http/tests/devtools/sources/debugger-ui/snippet-edit-breakpoint.js [ Skip ] crbug.com/1094436 http/tests/devtools/sources/debugger-ui/snippet-edit-breakpoint.js [ Pass Timeout ]
crbug.com/1094436 http/tests/devtools/sources/debugger/navigator-view.js [ Pass Failure Crash ] crbug.com/1094436 http/tests/devtools/sources/debugger/navigator-view.js [ Pass Failure Crash ]
# This test fails due to the linked bug since input is now routed through the compositor. # This test fails due to the linked bug since input is now routed through the compositor.
...@@ -6222,11 +6222,6 @@ crbug.com/1142877 external/wpt/mediacapture-fromelement/capture.html [ Pass Fail ...@@ -6222,11 +6222,6 @@ crbug.com/1142877 external/wpt/mediacapture-fromelement/capture.html [ Pass Fail
#Sheriff 2020-10-29 #Sheriff 2020-10-29
crbug.com/1143720 [ Win7 ] external/wpt/media-source/mediasource-detach.html [ Pass Failure ] crbug.com/1143720 [ Win7 ] external/wpt/media-source/mediasource-detach.html [ Pass Failure ]
# DevTools roll
crbug.com/1143170 http/tests/devtools/quick-open/command-menu.js [ Skip ]
crbug.com/1143170 http/tests/devtools/a11y-axe-core/sources/source-navigator-snippets-a11y-test.js [ Skip ]
crbug.com/1143170 http/tests/devtools/sources/debugger-ui/script-snippet-model.js [ Skip ]
# Eco-Infra Sheriff 2020-11-02 # Eco-Infra Sheriff 2020-11-02
crbug.com/1144677 external/wpt/css/css-backgrounds/border-radius-clip-001.html [ Pass Failure ] crbug.com/1144677 external/wpt/css/css-backgrounds/border-radius-clip-001.html [ Pass Failure ]
crbug.com/1144677 external/wpt/css/css-backgrounds/border-radius-clip-002.htm [ Pass Failure ] crbug.com/1144677 external/wpt/css/css-backgrounds/border-radius-clip-002.htm [ Pass Failure ]
......
...@@ -24,9 +24,10 @@ ...@@ -24,9 +24,10 @@
TestRunner.completeTest(); TestRunner.completeTest();
async function setup() { async function setup() {
const snippetsProject = Snippets.ScriptSnippetFileSystem.findSnippetsProject();
// Add snippets // Add snippets
await Snippets.project.createFile('s1', null, ''); await snippetsProject.createFile('s1', null, '');
await Snippets.project.createFile('s2', null, ''); await snippetsProject.createFile('s2', null, '');
} }
async function testA11yForView(ruleSet) { async function testA11yForView(ruleSet) {
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
self.runtime.loadModulePromise('quick_open').then(() => { self.runtime.loadModulePromise('quick_open').then(() => {
var categories = new Set(); var categories = new Set();
var commands = new Map(); var commands = new Map();
QuickOpen.commandMenu.commands().forEach(command => { QuickOpen.CommandMenu.instance().commands().forEach(command => {
categories.add(command.category()); categories.add(command.category());
commands.set(command.category() + ': ' + command.title(), command); commands.set(command.category() + ': ' + command.title(), command);
}); });
......
...@@ -75,7 +75,7 @@ Snippet3:1 1 ...@@ -75,7 +75,7 @@ Snippet3:1 1
Running: testEvaluateEditReload Running: testEvaluateEditReload
Run Snippet1.. Run Snippet1..
script-snippet-model.js:140 Console was cleared script-snippet-model.js:141 Console was cleared
Snippet1:1 undefined Snippet1:1 undefined
Page reloaded. Page reloaded.
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
await TestRunner.loadHTML('<p></p>'); await TestRunner.loadHTML('<p></p>');
const workspace = Workspace.workspace; const workspace = Workspace.workspace;
const snippetsProject = Snippets.ScriptSnippetFileSystem.findSnippetsProject();
SourcesTestRunner.runDebuggerTestSuite([ SourcesTestRunner.runDebuggerTestSuite([
async function testCreateEditRenameRemove(next) { async function testCreateEditRenameRemove(next) {
function uiSourceCodeAdded(event) { function uiSourceCodeAdded(event) {
...@@ -33,11 +34,11 @@ ...@@ -33,11 +34,11 @@
workspace.addEventListener( workspace.addEventListener(
Workspace.Workspace.Events.UISourceCodeRemoved, uiSourceCodeRemoved); Workspace.Workspace.Events.UISourceCodeRemoved, uiSourceCodeRemoved);
const uiSourceCode1 = await Snippets.project.createFile('', null, ''); const uiSourceCode1 = await snippetsProject.createFile('', null, '');
TestRunner.addResult('Snippet content:'); TestRunner.addResult('Snippet content:');
await printUiSourceCode(uiSourceCode1); await printUiSourceCode(uiSourceCode1);
TestRunner.addResult('Snippet1 created.'); TestRunner.addResult('Snippet1 created.');
const uiSourceCode2 = await Snippets.project.createFile('', null, ''); const uiSourceCode2 = await snippetsProject.createFile('', null, '');
TestRunner.addResult('Snippet content:'); TestRunner.addResult('Snippet content:');
await printUiSourceCode(uiSourceCode2); await printUiSourceCode(uiSourceCode2);
TestRunner.addResult('Snippet2 created.'); TestRunner.addResult('Snippet2 created.');
...@@ -62,7 +63,7 @@ ...@@ -62,7 +63,7 @@
workspace.uiSourceCodes().filter(uiSourceCode => uiSourceCode.url().startsWith('snippet://')).length); workspace.uiSourceCodes().filter(uiSourceCode => uiSourceCode.url().startsWith('snippet://')).length);
TestRunner.addResult('Add third..'); TestRunner.addResult('Add third..');
const uiSourceCode3 = await Snippets.project.createFile('', null, ''); const uiSourceCode3 = await snippetsProject.createFile('', null, '');
TestRunner.addResult('Content of third snippet:'); TestRunner.addResult('Content of third snippet:');
await printUiSourceCode(uiSourceCode3); await printUiSourceCode(uiSourceCode3);
TestRunner.addResult( TestRunner.addResult(
...@@ -92,11 +93,11 @@ ...@@ -92,11 +93,11 @@
}, },
async function testEvaluate(next) { async function testEvaluate(next) {
const uiSourceCode1 = await Snippets.project.createFile('', null, ''); const uiSourceCode1 = await snippetsProject.createFile('', null, '');
await uiSourceCode1.rename('Snippet1'); await uiSourceCode1.rename('Snippet1');
uiSourceCode1.setWorkingCopy('// This snippet does nothing.\nvar i=2+2;\n'); uiSourceCode1.setWorkingCopy('// This snippet does nothing.\nvar i=2+2;\n');
const uiSourceCode2 = await Snippets.project.createFile('', null, ''); const uiSourceCode2 = await snippetsProject.createFile('', null, '');
await uiSourceCode2.rename('Snippet2'); await uiSourceCode2.rename('Snippet2');
uiSourceCode2.setWorkingCopy(`// This snippet creates a function that does nothing and returns it. uiSourceCode2.setWorkingCopy(`// This snippet creates a function that does nothing and returns it.
function doesNothing() { function doesNothing() {
...@@ -105,7 +106,7 @@ function doesNothing() { ...@@ -105,7 +106,7 @@ function doesNothing() {
doesNothing; doesNothing;
`); `);
const uiSourceCode3 = await Snippets.project.createFile('', null, ''); const uiSourceCode3 = await snippetsProject.createFile('', null, '');
uiSourceCode3.rename('Snippet3'); uiSourceCode3.rename('Snippet3');
uiSourceCode3.setWorkingCopy('// This snippet uses Command Line API.\n$$("p").length'); uiSourceCode3.setWorkingCopy('// This snippet uses Command Line API.\n$$("p").length');
...@@ -143,7 +144,7 @@ doesNothing; ...@@ -143,7 +144,7 @@ doesNothing;
}, },
async function testEvaluateEditReload(next) { async function testEvaluateEditReload(next) {
const uiSourceCode1 = await Snippets.project.createFile('', null, ''); const uiSourceCode1 = await snippetsProject.createFile('', null, '');
await uiSourceCode1.rename('Snippet1'); await uiSourceCode1.rename('Snippet1');
uiSourceCode1.setWorkingCopy('// This snippet does nothing.\nvar i=2+2;\n'); uiSourceCode1.setWorkingCopy('// This snippet does nothing.\nvar i=2+2;\n');
...@@ -172,7 +173,7 @@ doesNothing; ...@@ -172,7 +173,7 @@ doesNothing;
// Take the only execution context from the worker's RuntimeModel. // Take the only execution context from the worker's RuntimeModel.
UI.context.setFlavor(SDK.ExecutionContext, this.executionContexts()[0]); UI.context.setFlavor(SDK.ExecutionContext, this.executionContexts()[0]);
const uiSourceCode1 = await Snippets.project.createFile('', null, ''); const uiSourceCode1 = await snippetsProject.createFile('', null, '');
await uiSourceCode1.rename('Snippet1'); await uiSourceCode1.rename('Snippet1');
uiSourceCode1.setWorkingCopy('2 + 2'); uiSourceCode1.setWorkingCopy('2 + 2');
...@@ -187,11 +188,11 @@ doesNothing; ...@@ -187,11 +188,11 @@ doesNothing;
}, },
async function testDangerousNames(next) { async function testDangerousNames(next) {
const uiSourceCode1 = await Snippets.project.createFile('', null, ''); const uiSourceCode1 = await snippetsProject.createFile('', null, '');
await uiSourceCode1.rename('toString'); await uiSourceCode1.rename('toString');
await SourcesTestRunner.showUISourceCodePromise(uiSourceCode1); await SourcesTestRunner.showUISourceCodePromise(uiSourceCode1);
const uiSourceCode2 = await Snippets.project.createFile('', null, ''); const uiSourceCode2 = await snippetsProject.createFile('', null, '');
await uiSourceCode2.rename('myfile.toString'); await uiSourceCode2.rename('myfile.toString');
await SourcesTestRunner.showUISourceCodePromise(uiSourceCode2); await SourcesTestRunner.showUISourceCodePromise(uiSourceCode2);
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
await TestRunner.loadModule('sources_test_runner'); await TestRunner.loadModule('sources_test_runner');
await TestRunner.showPanel('sources'); await TestRunner.showPanel('sources');
const uiSourceCode1 = await Snippets.project.createFile('s1', null, ''); const uiSourceCode1 = await Snippets.ScriptSnippetFileSystem.findSnippetsProject().createFile('s1', null, '');
uiSourceCode1.setContent('var x = 0;\n'); uiSourceCode1.setContent('var x = 0;\n');
TestRunner.addResult('Snippet content:'); TestRunner.addResult('Snippet content:');
TestRunner.addResult((await uiSourceCode1.requestContent()).content); TestRunner.addResult((await uiSourceCode1.requestContent()).content);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment