Changeset 206113 in webkit

Timestamp:

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

Author:

commit-queue@webkit.org

Message:

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

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/storage/domStorage-events.html:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• inspector/storage/domStorage-events.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/storage
+        https://bugs.webkit.org/show_bug.cgi?id=162102
+
+        Reviewed by Brian Burg.
+
+        Replace instances of singleFireEventListener with awaitEvent and use promise logic to make
+        tests more readable.
+
+        * inspector/storage/domStorage-events.html:
+
 2016-09-19  Devin Rousso  <dcrousso+webkit@gmail.com>
 

trunk/LayoutTests/inspector/storage/domStorage-events.html

@@ -41 +41 @@
         });
 
-        storageObject.singleFireEventListener(WebInspector.DOMStorageObject.Event.ItemRemoved, (event) => {
+        storageObject.awaitEvent(WebInspector.DOMStorageObject.Event.ItemRemoved)
+        .then((event) => {
             InspectorTest.pass("WebInspector.DOMStorageObject.Event.ItemRemoved");
             InspectorTest.expectThat(event.data.key === "foo", "Should remove key 'x'.");
         });
 
-        storageObject.singleFireEventListener(WebInspector.DOMStorageObject.Event.ItemUpdated, (event) => {
+        storageObject.awaitEvent(WebInspector.DOMStorageObject.Event.ItemUpdated)
+        .then((event) => {
             InspectorTest.pass("WebInspector.DOMStorageObject.Event.ItemUpdated");
             InspectorTest.expectThat(event.data.key === "foo", "Should update key 'x'.");
@@ -53 +55 @@
         });
 
-        storageObject.singleFireEventListener(WebInspector.DOMStorageObject.Event.ItemsCleared, (event) => {
+        storageObject.awaitEvent(WebInspector.DOMStorageObject.Event.ItemsCleared)
+        .then((event) => {
             InspectorTest.pass("WebInspector.DOMStorageObject.Event.ItemsCleared");
             storageObject.removeEventListener(WebInspector.DOMStorageObject.Event.ItemAdded, null, null);
@@ -65 +68 @@
         name: "TestSessionStorage",
         description: "Test backend generated DOMStorage added, removed, updated, and cleared events for sessionStorage.",
-        test: (resolve, reject) => {
+        test(resolve, reject) {
             InspectorTest.evaluateInPage("triggerActions(sessionStorage)");
             let sessionStorage = WebInspector.storageManager.domStorageObjects.find((x) => !x.isLocalStorage());
@@ -76 +79 @@
         name: "TestLocalStorage",
         description: "Test backend generated DOMStorage added, removed, updated, and cleared events for localStorage.",
-        test: (resolve, reject) => {
+        test(resolve, reject) {
             InspectorTest.evaluateInPage("triggerActions(localStorage)");
             let localStorage = WebInspector.storageManager.domStorageObjects.find((x) => x.isLocalStorage());