Changeset 206114 in webkit

Timestamp:

Sep 19, 2016 1:46:42 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

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

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/page/searchInResources.html:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• inspector/page/searchInResources.html (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-09-19  Devin Rousso  <dcrousso+webkit@gmail.com>
+
+        Web Inspector: adopt Object.awaitEvent in LayoutTests/inspector/page
+        https://bugs.webkit.org/show_bug.cgi?id=162100
+
+        Reviewed by Brian Burg.
+
+        Replace instances of singleFireEventListener with awaitEvent and use promise logic to make
+        tests more readable.
+
+        * inspector/page/searchInResources.html:
+
 2016-09-19  Devin Rousso  <dcrousso+webkit@gmail.com>
 

trunk/LayoutTests/inspector/page/searchInResources.html

@@ -33 +33 @@
         name: "SearchAllResources",
         description: "Able to find text results in different resources.",
-        test: (resolve, reject) => {
+        test(resolve, reject) {
             PageAgent.searchInResources(searchString, (error, results) => {
                 InspectorTest.assert(!error, "Should not be a protocol error.");
@@ -48 +48 @@
         name: "SearchInScriptResource",
         description: "Able to find text results in an individual Script resource.",
-        test: (resolve, reject) => {
+        test(resolve, reject) {
             let result = searchResults.find((result) => /search-script\.js$/.test(result.url));
             if (!result)
@@ -66 +66 @@
         name: "SearchInXHRResource",
         description: "Able to find text results in an individual XHR resource.",
-        test: (resolve, reject) => {
+        test(resolve, reject) {
             let result = searchResults.find((result) => /search-xhr\.txt$/.test(result.url));
             if (!result)
@@ -84 +84 @@
     });
 
-    InspectorTest.evaluateInPage("triggerDownloadingResources()");
-    InspectorTest.singleFireEventListener("PageIsReady", (event) => {
+    InspectorTest.awaitEvent("PageIsReady")
+    .then((event) => {
         suite.runTestCasesAndFinish();
     });
+
+    InspectorTest.evaluateInPage("triggerDownloadingResources()");
 }
 </script>