| OLD | NEW |
| 1 <html> | 1 <html> |
| 2 <head> | 2 <head> |
| 3 <script src="../inspector-test.js"></script> | 3 <script src="../inspector-test.js"></script> |
| 4 <script src="service-workers-test.js"></script> | 4 <script src="service-workers-test.js"></script> |
| 5 <script src="../resources-test.js"></script> | 5 <script src="../resources-test.js"></script> |
| 6 <script src="../console-test.js"></script> | 6 <script src="../console-test.js"></script> |
| 7 <script> | 7 <script> |
| 8 function test() | 8 function test() |
| 9 { | 9 { |
| 10 function waitForTarget() | 10 function waitForTarget() |
| 11 { | 11 { |
| 12 return new Promise(function(resolve) { | 12 return new Promise(function(resolve) { |
| 13 var sniffer = { | 13 var sniffer = { |
| 14 targetAdded: function(target) | 14 targetAdded: function(target) |
| 15 { | 15 { |
| 16 if (InspectorTest.isServiceWorker(target)) { | 16 if (InspectorTest.isServiceWorker(target)) { |
| 17 resolve(); | 17 resolve(); |
| 18 WebInspector.targetManager.unobserveTargets(sniffer); | 18 SDK.targetManager.unobserveTargets(sniffer); |
| 19 } | 19 } |
| 20 }, | 20 }, |
| 21 | 21 |
| 22 targetRemoved: function(e) | 22 targetRemoved: function(e) |
| 23 { | 23 { |
| 24 } | 24 } |
| 25 }; | 25 }; |
| 26 WebInspector.targetManager.observeTargets(sniffer); | 26 SDK.targetManager.observeTargets(sniffer); |
| 27 }); | 27 }); |
| 28 } | 28 } |
| 29 | 29 |
| 30 function waitForConsoleMessage(regex) | 30 function waitForConsoleMessage(regex) |
| 31 { | 31 { |
| 32 return new Promise(function(resolve) { | 32 return new Promise(function(resolve) { |
| 33 WebInspector.multitargetConsoleModel.addEventListener(WebInspector.C
onsoleModel.Events.MessageAdded, sniff); | 33 SDK.multitargetConsoleModel.addEventListener(SDK.ConsoleModel.Events
.MessageAdded, sniff); |
| 34 | 34 |
| 35 function sniff(e) | 35 function sniff(e) |
| 36 { | 36 { |
| 37 if (e.data && regex.test(e.data.messageText)) { | 37 if (e.data && regex.test(e.data.messageText)) { |
| 38 resolve(e.data); | 38 resolve(e.data); |
| 39 WebInspector.multitargetConsoleModel.removeEventListener(Web
Inspector.ConsoleModel.Events.MessageAdded, sniff); | 39 SDK.multitargetConsoleModel.removeEventListener(SDK.ConsoleM
odel.Events.MessageAdded, sniff); |
| 40 } | 40 } |
| 41 } | 41 } |
| 42 }); | 42 }); |
| 43 } | 43 } |
| 44 | 44 |
| 45 var scriptURL = "http://127.0.0.1:8000/inspector/service-workers/resources/u
ser-agent-override-worker.js"; | 45 var scriptURL = "http://127.0.0.1:8000/inspector/service-workers/resources/u
ser-agent-override-worker.js"; |
| 46 var scope = "http://127.0.0.1:8000/inspector/service-workers/resources/user-
agent-override/"; | 46 var scope = "http://127.0.0.1:8000/inspector/service-workers/resources/user-
agent-override/"; |
| 47 var userAgentString = "Mozilla/5.0 (Overridden User Agent)"; | 47 var userAgentString = "Mozilla/5.0 (Overridden User Agent)"; |
| 48 var originalUserAgent = navigator.userAgent; | 48 var originalUserAgent = navigator.userAgent; |
| 49 | 49 |
| 50 InspectorTest.addResult("Enable emulation and set User-Agent override"); | 50 InspectorTest.addResult("Enable emulation and set User-Agent override"); |
| 51 WebInspector.multitargetNetworkManager.setUserAgentOverride(userAgentString)
; | 51 SDK.multitargetNetworkManager.setUserAgentOverride(userAgentString); |
| 52 | 52 |
| 53 InspectorTest.registerServiceWorker(scriptURL, scope) | 53 InspectorTest.registerServiceWorker(scriptURL, scope) |
| 54 .then(waitForTarget) | 54 .then(waitForTarget) |
| 55 .then(InspectorTest.postToServiceWorker.bind(InspectorTest, scope, "mess
age")) | 55 .then(InspectorTest.postToServiceWorker.bind(InspectorTest, scope, "mess
age")) |
| 56 .then(waitForConsoleMessage.bind(null, /HTTP_USER_AGENT/)) | 56 .then(waitForConsoleMessage.bind(null, /HTTP_USER_AGENT/)) |
| 57 .then(function(msg) { | 57 .then(function(msg) { |
| 58 InspectorTest.addResult("Overriden user agent: " + msg.messageText); | 58 InspectorTest.addResult("Overriden user agent: " + msg.messageText); |
| 59 InspectorTest.addResult("Disable emulation"); | 59 InspectorTest.addResult("Disable emulation"); |
| 60 WebInspector.multitargetNetworkManager.setUserAgentOverride(""); | 60 SDK.multitargetNetworkManager.setUserAgentOverride(""); |
| 61 return InspectorTest.unregisterServiceWorker(scope); | 61 return InspectorTest.unregisterServiceWorker(scope); |
| 62 }) | 62 }) |
| 63 .then(function() { | 63 .then(function() { |
| 64 return InspectorTest.registerServiceWorker(scriptURL + '?2', scope); | 64 return InspectorTest.registerServiceWorker(scriptURL + '?2', scope); |
| 65 }) | 65 }) |
| 66 .then(waitForTarget) | 66 .then(waitForTarget) |
| 67 .then(InspectorTest.postToServiceWorker.bind(InspectorTest, scope, "mess
age")) | 67 .then(InspectorTest.postToServiceWorker.bind(InspectorTest, scope, "mess
age")) |
| 68 .then(waitForConsoleMessage.bind(null, /HTTP_USER_AGENT/)) | 68 .then(waitForConsoleMessage.bind(null, /HTTP_USER_AGENT/)) |
| 69 .then(function(msg) { | 69 .then(function(msg) { |
| 70 InspectorTest.addResult("User agent without override is correct: " +
(msg.messageText != userAgentString)); | 70 InspectorTest.addResult("User agent without override is correct: " +
(msg.messageText != userAgentString)); |
| 71 return InspectorTest.unregisterServiceWorker(scope); | 71 return InspectorTest.unregisterServiceWorker(scope); |
| 72 }) | 72 }) |
| 73 .then(function() { | 73 .then(function() { |
| 74 InspectorTest.addResult("Test complete"); | 74 InspectorTest.addResult("Test complete"); |
| 75 InspectorTest.completeTest(); | 75 InspectorTest.completeTest(); |
| 76 }) | 76 }) |
| 77 .catch(function(err) { | 77 .catch(function(err) { |
| 78 console.log(err); | 78 console.log(err); |
| 79 InspectorTest.completeTest(); | 79 InspectorTest.completeTest(); |
| 80 }); | 80 }); |
| 81 } | 81 } |
| 82 | 82 |
| 83 </script> | 83 </script> |
| 84 </head> | 84 </head> |
| 85 <body onload="runTest()"> | 85 <body onload="runTest()"> |
| 86 <p>Tests that User-Agent override works for requests from Service Workers.</p> | 86 <p>Tests that User-Agent override works for requests from Service Workers.</p> |
| 87 </body> | 87 </body> |
| 88 </html> | 88 </html> |
| OLD | NEW |