Changeset 206112 in webkit

Timestamp:

Sep 19, 2016 1:45:17 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: adopt Object.awaitEvent in LayoutTests/inspector/network
​https://bugs.webkit.org/show_bug.cgi?id=162099

Patch by Devin Rousso <Devin Rousso> on 2016-09-19
Reviewed by Brian Burg.

Replace instances of singleFireEventListener with awaitEvent and use promise logic to make
tests more readable.

• inspector/network/client-blocked-load-expected.txt:
• inspector/network/client-blocked-load.html:
• inspector/network/xhr-json-blob-has-content.html:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• inspector/network/client-blocked-load-expected.txt (modified) (1 diff)
• inspector/network/client-blocked-load.html (modified) (1 diff)
• inspector/network/xhr-json-blob-has-content.html (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-09-19  Devin Rousso  <dcrousso+webkit@gmail.com>
+
+        Web Inspector: adopt Object.awaitEvent in LayoutTests/inspector/network
+        https://bugs.webkit.org/show_bug.cgi?id=162099
+
+        Reviewed by Brian Burg.
+
+        Replace instances of singleFireEventListener with awaitEvent and use promise logic to make
+        tests more readable.
+
+        * inspector/network/client-blocked-load-expected.txt:
+        * inspector/network/client-blocked-load.html:
+        * inspector/network/xhr-json-blob-has-content.html:
+
 2016-09-19  Devin Rousso  <dcrousso+webkit@gmail.com>
 

trunk/LayoutTests/inspector/network/client-blocked-load-expected.txt

@@ -5 +5 @@
 -- Running test case: TriggerBlockedResourceLoad
 PASS: Resource should be created.
+PASS: Added Resource load did fail.
 PASS: Request url should be rewritten to the null string.
-PASS: Resource load should fail.
 

trunk/LayoutTests/inspector/network/client-blocked-load.html

@@ -19 +19 @@
         name: "TriggerBlockedResourceLoad",
         description: "Trigger a blocked resource load and ensure we get notified of the request.",
-        test: (resolve, reject) => {
+        test(resolve, reject) {
+            Promise.all([
+                WebInspector.Frame.awaitEvent(WebInspector.Frame.Event.ResourceWasAdded),
+                WebInspector.Resource.awaitEvent(WebInspector.Resource.Event.LoadingDidFail)
+            ])
+            .then(([resourceWasAddedEvent, loadingDidFailEvent]) => {
+                let resource = resourceWasAddedEvent.data.resource;
+                InspectorTest.expectThat(resource instanceof WebInspector.Resource, "Resource should be created.");
+                InspectorTest.expectThat(resource === loadingDidFailEvent.target, "Added Resource load did fail.");
+                InspectorTest.expectThat(resource.url === "", "Request url should be rewritten to the null string.");
+            })
+            .then(resolve, reject);
+
             InspectorTest.evaluateInPage("createBlockedResourceLoad()");
-            WebInspector.Frame.singleFireEventListener(WebInspector.Frame.Event.ResourceWasAdded, (event) => {
-                let resource = event.data.resource;
-                InspectorTest.expectThat(resource instanceof WebInspector.Resource, "Resource should be created.");
-                InspectorTest.expectThat(resource.url === "", "Request url should be rewritten to the null string.");
-                resource.singleFireEventListener(WebInspector.Resource.Event.LoadingDidFail, (event) => {
-                    InspectorTest.pass("Resource load should fail.");
-                    resolve();
-                });
-            });
         }
     });

trunk/LayoutTests/inspector/network/xhr-json-blob-has-content.html

@@ -26 +26 @@
         name: "XHR.JSONContent",
         description: "Ensure an XMLHttpRequest with JSON content still gives us text.",
-        test: (resolve, reject) => {
+        test(resolve, reject) {
+            let resource = null;
+
+            WebInspector.Frame.awaitEvent(WebInspector.Frame.Event.ResourceWasAdded)
+            .then((event) => {
+                resource = event.data.resource;
+                InspectorTest.expectThat(resource instanceof WebInspector.Resource, "Resource should be created.");
+                return resource.awaitEvent(WebInspector.Resource.Event.LoadingDidFinish);
+            })
+            .then((event) => {
+                InspectorTest.pass("Resource should complete loading.");
+                return resource.requestContent();
+            })
+            .then((resource) => {
+                InspectorTest.expectThat(resource.content === jsonContent, "Resource has expected content.");
+            })
+            .then(resolve, reject);
+
             InspectorTest.evaluateInPage("createJSONXHR()");
-            WebInspector.Frame.singleFireEventListener(WebInspector.Frame.Event.ResourceWasAdded, (event) => {
-                let resource = event.data.resource;
-                InspectorTest.expectThat(resource instanceof WebInspector.Resource, "Resource should be created.");
-                resource.singleFireEventListener(WebInspector.Resource.Event.LoadingDidFinish, (event) => {
-                    InspectorTest.pass("Resource should complete loading.");
-                    resource.requestContent().then(() => {
-                        InspectorTest.expectThat(resource.content === jsonContent, "Resource has expected content.");
-                    }).then(resolve, reject);
-                });
-            });
         }
     });
@@ -44 +51 @@
         name: "XHR.JSONContent.Blob",
         description: "Ensure an XMLHttpRequest with JSON content and a responseType of blob still gives us text.",
-        test: (resolve, reject) => {
+        test(resolve, reject) {
+            let resource = null;
+
+            WebInspector.Frame.awaitEvent(WebInspector.Frame.Event.ResourceWasAdded)
+            .then((event) => {
+                resource = event.data.resource;
+                InspectorTest.expectThat(resource instanceof WebInspector.Resource, "Resource should be created.");
+                return resource.awaitEvent(WebInspector.Resource.Event.LoadingDidFinish);
+            })
+            .then((event) => {
+                InspectorTest.pass("Resource should complete loading.");
+                return resource.requestContent();
+            })
+            .then((resource) => {
+                InspectorTest.expectThat(resource.content === jsonContent, "Resource has expected content.");
+            })
+            .then(resolve, reject);
+
             InspectorTest.evaluateInPage("createJSONBlobXHR()");
-            WebInspector.Frame.singleFireEventListener(WebInspector.Frame.Event.ResourceWasAdded, (event) => {
-                let resource = event.data.resource;
-                InspectorTest.expectThat(resource instanceof WebInspector.Resource, "Resource should be created.");
-                resource.singleFireEventListener(WebInspector.Resource.Event.LoadingDidFinish, (event) => {
-                    InspectorTest.pass("Resource should complete loading.");
-                    resource.requestContent().then(() => {
-                        InspectorTest.expectThat(resource.content === jsonContent, "Resource has expected content.");
-                    }).then(resolve, reject);
-                });
-            });
         }
     });