Modified: trunk/LayoutTests/ChangeLog (206112 => 206113)
--- trunk/LayoutTests/ChangeLog 2016-09-19 20:45:17 UTC (rev 206112)
+++ trunk/LayoutTests/ChangeLog 2016-09-19 20:45:52 UTC (rev 206113)
@@ -1,5 +1,17 @@
2016-09-19 Devin Rousso <dcrousso+web...@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+web...@gmail.com>
+
Web Inspector: adopt Object.awaitEvent in LayoutTests/inspector/network
https://bugs.webkit.org/show_bug.cgi?id=162099
Modified: trunk/LayoutTests/inspector/storage/domStorage-events.html (206112 => 206113)
--- trunk/LayoutTests/inspector/storage/domStorage-events.html 2016-09-19 20:45:17 UTC (rev 206112)
+++ trunk/LayoutTests/inspector/storage/domStorage-events.html 2016-09-19 20:45:52 UTC (rev 206113)
@@ -40,12 +40,14 @@
InspectorTest.fail("Unexpected WebInspector.DOMStorageObject.Event.ItemAdded");
});
- 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'.");
InspectorTest.expectThat(event.data.oldValue === "value1", "Should have oldValue 'value1'.");
@@ -52,7 +54,8 @@
InspectorTest.expectThat(event.data.value === "value2", "Should have new value 'value2'.");
});
- 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);
callback();
@@ -64,7 +67,7 @@
suite.addTestCase({
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());
InspectorTest.expectThat(sessionStorage, "Should have a DOMStorageObject for sessionStorage.");
@@ -75,7 +78,7 @@
suite.addTestCase({
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());
InspectorTest.expectThat(localStorage, "Should have a DOMStorageObject for localStorage.");
