third_party/WebKit/LayoutTests/inspector/sources/debugger-ui/scripts-panel.html - Issue 2747863007: DevTools: clean up tests to not depend on NetworkProject.addFile method

Unified Diff: third_party/WebKit/LayoutTests/inspector/sources/debugger-ui/scripts-panel.html

Issue 2747863007: DevTools: clean up tests to not depend on NetworkProject.addFile method (Closed)

Patch Set: remove all networkProject.addFile calls Created 3 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« third_party/WebKit/LayoutTests/http/tests/inspector/page-mock.js ('K') | « third_party/WebKit/LayoutTests/inspector/sources/debugger-ui/last-execution-context.html ('k') | third_party/WebKit/LayoutTests/inspector/sources/debugger-ui/scripts-panel-expected.txt » ('j') | third_party/WebKit/LayoutTests/inspector/sources/debugger-ui/scripts-panel-expected.txt » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/LayoutTests/inspector/sources/debugger-ui/scripts-panel.html

diff --git a/third_party/WebKit/LayoutTests/inspector/sources/debugger-ui/scripts-panel.html b/third_party/WebKit/LayoutTests/inspector/sources/debugger-ui/scripts-panel.html

index 5ea59839938b10cb1dbaa50d71a37bb18f5c269f..c014964ccc53134f102474e6912db0689858ed46 100644

--- a/third_party/WebKit/LayoutTests/inspector/sources/debugger-ui/scripts-panel.html

+++ b/third_party/WebKit/LayoutTests/inspector/sources/debugger-ui/scripts-panel.html

@@ -2,6 +2,7 @@

<head>

+<script src="../../../http/tests/inspector/page-mock.js"></script>

function test()

{

@@ -18,80 +19,84 @@ function test()

return navigatorView;

}

- function createContentProvider(url)

- {

- var contentProvider = Common.StaticContentProvider.fromString(url, Common.resourceTypes.Script, "");

- contentProvider.requestContent = function()

- {

- InspectorTest.addResult("Source requested for " + url);

- return Promise.resolve("");

- };

- return contentProvider;

+ InspectorTest.addSniffer(Workspace.UISourceCode.prototype, 'requestContent', onRequestContent, true);

+ function onRequestContent() {

+ InspectorTest.addResult("Source requested for " + this.url());

}

+ Bindings.NetworkProject.forTarget(InspectorTest.mainTarget)._reset();

dgozman 2017/03/16 00:17:10 Eh? Unfortunate!

lushnikov 2017/03/16 06:30:50 Right, it looks like I'll have a binding-resetters

+ var page = new InspectorTest.PageMock('http://example.com');

+ InspectorTest.connectToPage('mock-page', page);

function addNetworkFile(url)

{

- var networkProject = Bindings.NetworkProject.forTarget(InspectorTest.mainTarget);

- return networkProject.addFile(createContentProvider(url), InspectorTest.mainFrame());

+ page.addScript(url, '', true /* hasSourceURL */, false /* isContentScript */);

+ return InspectorTest.waitForUISourceCode(url);

+ }

+ function reload() {

+ page.reload();

+ return new Promise(fulfill => InspectorTest.addSniffer(SDK.ResourceTreeModel.prototype, '_frameNavigated', fulfill));

}

InspectorTest.runTestSuite([

- function testInitialLoad(next)

+ async function testInitialLoad(next)

{

- Bindings.NetworkProject.forTarget(InspectorTest.mainTarget)._reset();

- addNetworkFile("foobar.js");

+ await reload();

+ await addNetworkFile("foobar.js");

var sourcesNavigatorView = createNavigatorView();

- addNetworkFile("foo.js");

- addNetworkFile("bar.js");

- var uiSourceCode = addNetworkFile("baz.js");

+ await addNetworkFile("foo.js");

+ await addNetworkFile("bar.js");

+ var uiSourceCode = await addNetworkFile("baz.js");

sourcesNavigatorView.revealUISourceCode(uiSourceCode);

dumpNavigator(sourcesNavigatorView);

next();

- function testReset(next)

+ async function testReset(next)

{

- Bindings.NetworkProject.forTarget(InspectorTest.mainTarget)._reset();

+ await reload();

var sourcesNavigatorView = createNavigatorView();

- var uiSourceCode = addNetworkFile("foo.js");

- addNetworkFile("bar.js");

- addNetworkFile("baz.js");

+ var uiSourceCode = await addNetworkFile("foo.js");

+ await addNetworkFile("bar.js");

+ await addNetworkFile("baz.js");

dumpNavigator(sourcesNavigatorView);

InspectorTest.addResult("Revealing in navigator.");

sourcesNavigatorView.revealUISourceCode(uiSourceCode);

dumpNavigator(sourcesNavigatorView);

- Bindings.NetworkProject.forTarget(InspectorTest.mainTarget)._reset();

+ await reload();

dumpNavigator(sourcesNavigatorView);

- uiSourceCode = addNetworkFile("bar.js");

+ uiSourceCode = await addNetworkFile("bar.js");

sourcesNavigatorView.revealUISourceCode(uiSourceCode);

dumpNavigator(sourcesNavigatorView);

next();

- function testDebuggerUISourceCodeAddedAndRemoved(next)

+ async function testDebuggerUISourceCodeAddedAndRemoved(next)

{

- Bindings.NetworkProject.forTarget(InspectorTest.mainTarget)._reset();

+ await reload();

var sourcesNavigatorView = createNavigatorView();

- var uiSourceCode = addNetworkFile("foo.js");

+ var uiSourceCode = await addNetworkFile("foo.js");

InspectorTest.waitForUISourceCode().then(onUISourceCode);

InspectorTest.evaluateInPage("function foo() {}");

- function onUISourceCode(debuggerUISourceCode)

+ async function onUISourceCode(debuggerUISourceCode)

{

sourcesNavigatorView.revealUISourceCode(uiSourceCode);

sourcesNavigatorView.revealUISourceCode(debuggerUISourceCode);

dumpNavigator(sourcesNavigatorView);

// Plug compiler source mapping.

- addNetworkFile("source.js");

+ await addNetworkFile("source.js");

dumpNavigator(sourcesNavigatorView);

next();