Chromium Code Reviews| OLD | NEW |
|---|---|
| (Empty) | |
| 1 <!DOCTYPE html> | |
| 2 <script src="../resources/testharness.js"></script> | |
| 3 <script src="../resources/testharnessreport.js"></script> | |
| 4 <script src="resources/test-helpers.js"></script> | |
| 5 <body> | |
| 6 <script> | |
| 7 | |
| 8 var INSTALL_APPCACHE_URL = "resources/appcache-ordering.install.html"; | |
| 9 var IS_APPCACHED_URL = "resources/appcache-ordering.is-appcached.html"; | |
| 10 var SERVICE_WORKER_SCOPE = "resources/appcache-ordering"; | |
| 11 var SERVICE_WORKER_SCRIPT = "resources/empty-worker.js"; | |
| 12 | |
| 13 var resolve_install_appcache = undefined; | |
| 14 var reject_install_appcache = undefined; | |
| 15 | |
| 16 // Called by the INSTALL_APPCACHE_URL child frame. | |
| 17 function notify_appcache_installed(success) { | |
| 18 if (success) | |
| 19 resolve_install_appcache(); | |
| 20 else | |
| 21 reject_install_appcache(); | |
| 22 } | |
| 23 | |
| 24 function install_appcache() { | |
| 25 return new Promise(function(resolve, reject) { | |
| 26 var frame = document.createElement('iframe'); | |
| 27 frame.src = INSTALL_APPCACHE_URL; | |
| 28 document.body.appendChild(frame); | |
| 29 resolve_install_appcache = function() { | |
| 30 document.body.removeChild(frame); | |
|
michaeln
2014/10/21 21:15:01
surprisingly, unload_iframe is async, removing the
| |
| 31 resolve(); | |
| 32 } | |
|
michaeln
2014/10/21 21:20:01
i'll restore the ; i dropped here and fix the inde
| |
| 33 reject_install_appcache = function() { | |
| 34 document.body.removeChild(frame); | |
| 35 reject(); | |
| 36 }; | |
| 37 }); | |
| 38 } | |
| 39 | |
| 40 var resolve_is_appcached = undefined; | |
| 41 | |
| 42 // Called by the IS_APPCACHED_URL child frame. | |
| 43 function notify_is_appcached(is) { | |
| 44 resolve_is_appcached(is); | |
| 45 } | |
| 46 | |
| 47 function is_appcached() { | |
| 48 return new Promise(function(resolve) { | |
| 49 var frame = document.createElement('iframe'); | |
| 50 frame.src = IS_APPCACHED_URL; | |
| 51 document.body.appendChild(frame); | |
| 52 resolve_is_appcached = function(is) { | |
| 53 document.body.removeChild(frame); | |
| 54 resolve(is); | |
| 55 }; | |
| 56 }); | |
| 57 } | |
| 58 | |
| 59 async_test(function(t) { | |
| 60 service_worker_unregister(t, SERVICE_WORKER_SCOPE) | |
|
michaeln
2014/10/21 21:15:01
added to cleanup from a botched previous run
| |
| 61 .then(function() { | |
| 62 return install_appcache(); | |
| 63 }) | |
| 64 .then(function() { | |
| 65 return is_appcached(); | |
| 66 }) | |
| 67 .then(function(result) { | |
| 68 assert_true(result, 'appcache should initially be utilized'); | |
| 69 return service_worker_unregister_and_register( | |
| 70 t, SERVICE_WORKER_SCRIPT, SERVICE_WORKER_SCOPE); | |
| 71 }) | |
| 72 .then(function(r) { | |
| 73 return wait_for_activated(t, r); | |
|
michaeln
2014/10/21 21:15:01
added to elimate a race where the registration wou
| |
| 74 }) | |
| 75 .then(function() { | |
| 76 return is_appcached(); | |
| 77 }) | |
| 78 .then(function(result) { | |
| 79 assert_false(result, 'but serviceworkers should take priority'); | |
| 80 service_worker_unregister_and_done(t, SERVICE_WORKER_SCOPE); | |
| 81 }) | |
| 82 .catch(unreached_rejection(t)); | |
| 83 }, 'serviceworkers take priority over appcaches'); | |
| 84 | |
| 85 </script> | |
| 86 </body> | |
| OLD | NEW |