Changeset 206112 in webkit
- Timestamp:
- Sep 19, 2016 1:45:17 PM (8 years ago)
- Location:
- trunk/LayoutTests
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r206111 r206112 1 2016-09-19 Devin Rousso <dcrousso+webkit@gmail.com> 2 3 Web Inspector: adopt Object.awaitEvent in LayoutTests/inspector/network 4 https://bugs.webkit.org/show_bug.cgi?id=162099 5 6 Reviewed by Brian Burg. 7 8 Replace instances of singleFireEventListener with awaitEvent and use promise logic to make 9 tests more readable. 10 11 * inspector/network/client-blocked-load-expected.txt: 12 * inspector/network/client-blocked-load.html: 13 * inspector/network/xhr-json-blob-has-content.html: 14 1 15 2016-09-19 Devin Rousso <dcrousso+webkit@gmail.com> 2 16 -
trunk/LayoutTests/inspector/network/client-blocked-load-expected.txt
r192592 r206112 5 5 -- Running test case: TriggerBlockedResourceLoad 6 6 PASS: Resource should be created. 7 PASS: Added Resource load did fail. 7 8 PASS: Request url should be rewritten to the null string. 8 PASS: Resource load should fail.9 9 -
trunk/LayoutTests/inspector/network/client-blocked-load.html
r194704 r206112 19 19 name: "TriggerBlockedResourceLoad", 20 20 description: "Trigger a blocked resource load and ensure we get notified of the request.", 21 test: (resolve, reject) => { 21 test(resolve, reject) { 22 Promise.all([ 23 WebInspector.Frame.awaitEvent(WebInspector.Frame.Event.ResourceWasAdded), 24 WebInspector.Resource.awaitEvent(WebInspector.Resource.Event.LoadingDidFail) 25 ]) 26 .then(([resourceWasAddedEvent, loadingDidFailEvent]) => { 27 let resource = resourceWasAddedEvent.data.resource; 28 InspectorTest.expectThat(resource instanceof WebInspector.Resource, "Resource should be created."); 29 InspectorTest.expectThat(resource === loadingDidFailEvent.target, "Added Resource load did fail."); 30 InspectorTest.expectThat(resource.url === "", "Request url should be rewritten to the null string."); 31 }) 32 .then(resolve, reject); 33 22 34 InspectorTest.evaluateInPage("createBlockedResourceLoad()"); 23 WebInspector.Frame.singleFireEventListener(WebInspector.Frame.Event.ResourceWasAdded, (event) => {24 let resource = event.data.resource;25 InspectorTest.expectThat(resource instanceof WebInspector.Resource, "Resource should be created.");26 InspectorTest.expectThat(resource.url === "", "Request url should be rewritten to the null string.");27 resource.singleFireEventListener(WebInspector.Resource.Event.LoadingDidFail, (event) => {28 InspectorTest.pass("Resource load should fail.");29 resolve();30 });31 });32 35 } 33 36 }); -
trunk/LayoutTests/inspector/network/xhr-json-blob-has-content.html
r205268 r206112 26 26 name: "XHR.JSONContent", 27 27 description: "Ensure an XMLHttpRequest with JSON content still gives us text.", 28 test: (resolve, reject) => { 28 test(resolve, reject) { 29 let resource = null; 30 31 WebInspector.Frame.awaitEvent(WebInspector.Frame.Event.ResourceWasAdded) 32 .then((event) => { 33 resource = event.data.resource; 34 InspectorTest.expectThat(resource instanceof WebInspector.Resource, "Resource should be created."); 35 return resource.awaitEvent(WebInspector.Resource.Event.LoadingDidFinish); 36 }) 37 .then((event) => { 38 InspectorTest.pass("Resource should complete loading."); 39 return resource.requestContent(); 40 }) 41 .then((resource) => { 42 InspectorTest.expectThat(resource.content === jsonContent, "Resource has expected content."); 43 }) 44 .then(resolve, reject); 45 29 46 InspectorTest.evaluateInPage("createJSONXHR()"); 30 WebInspector.Frame.singleFireEventListener(WebInspector.Frame.Event.ResourceWasAdded, (event) => {31 let resource = event.data.resource;32 InspectorTest.expectThat(resource instanceof WebInspector.Resource, "Resource should be created.");33 resource.singleFireEventListener(WebInspector.Resource.Event.LoadingDidFinish, (event) => {34 InspectorTest.pass("Resource should complete loading.");35 resource.requestContent().then(() => {36 InspectorTest.expectThat(resource.content === jsonContent, "Resource has expected content.");37 }).then(resolve, reject);38 });39 });40 47 } 41 48 }); … … 44 51 name: "XHR.JSONContent.Blob", 45 52 description: "Ensure an XMLHttpRequest with JSON content and a responseType of blob still gives us text.", 46 test: (resolve, reject) => { 53 test(resolve, reject) { 54 let resource = null; 55 56 WebInspector.Frame.awaitEvent(WebInspector.Frame.Event.ResourceWasAdded) 57 .then((event) => { 58 resource = event.data.resource; 59 InspectorTest.expectThat(resource instanceof WebInspector.Resource, "Resource should be created."); 60 return resource.awaitEvent(WebInspector.Resource.Event.LoadingDidFinish); 61 }) 62 .then((event) => { 63 InspectorTest.pass("Resource should complete loading."); 64 return resource.requestContent(); 65 }) 66 .then((resource) => { 67 InspectorTest.expectThat(resource.content === jsonContent, "Resource has expected content."); 68 }) 69 .then(resolve, reject); 70 47 71 InspectorTest.evaluateInPage("createJSONBlobXHR()"); 48 WebInspector.Frame.singleFireEventListener(WebInspector.Frame.Event.ResourceWasAdded, (event) => {49 let resource = event.data.resource;50 InspectorTest.expectThat(resource instanceof WebInspector.Resource, "Resource should be created.");51 resource.singleFireEventListener(WebInspector.Resource.Event.LoadingDidFinish, (event) => {52 InspectorTest.pass("Resource should complete loading.");53 resource.requestContent().then(() => {54 InspectorTest.expectThat(resource.content === jsonContent, "Resource has expected content.");55 }).then(resolve, reject);56 });57 });58 72 } 59 73 });
Note: See TracChangeset
for help on using the changeset viewer.