Chromium Code Reviews| OLD | NEW |
|---|---|
| (Empty) | |
| 1 <!DOCTYPE html> | |
| 2 <title>Service Worker: Redirected response</title> | |
| 3 <script src="/resources/testharness.js"></script> | |
| 4 <script src="/resources/testharnessreport.js"></script> | |
| 5 <script src="/common/get-host-info.sub.js"></script> | |
| 6 <script src="resources/test-helpers.sub.js"></script> | |
| 7 <script> | |
|
falken
2017/05/17 05:09:12
I find this function pretty dense. Could we add so
mike3
2017/05/17 21:19:27
Acknowledged.
| |
| 8 function redirected_test(url, | |
| 9 fetch_option, | |
| 10 fetch_method, | |
| 11 cache, | |
| 12 expected_redirected, | |
| 13 expected_url_list) { | |
|
falken
2017/05/17 05:09:12
nit: Could we make this a dictionary of params ins
mike3
2017/05/17 21:19:27
Done.
| |
| 14 return fetch_method(url, fetch_option).then(response => { | |
| 15 var cloned_response = response.clone(); | |
| 16 assert_equals( | |
| 17 response.redirected, expected_redirected, | |
| 18 'The redirected flag of response must match. URL: ' + url); | |
| 19 assert_equals( | |
| 20 cloned_response.redirected, expected_redirected, | |
| 21 'The redirected flag of cloned response must match. URL: ' + url); | |
| 22 if (self.internals) { | |
|
falken
2017/05/17 05:09:12
We shouldn't put this part in the WPT. self.intern
mike3
2017/05/17 21:19:28
Acknowledged.
| |
| 23 assert_array_equals( | |
| 24 self.internals.getInternalResponseURLList(response), | |
| 25 expected_url_list, | |
| 26 'The URL list of response must match. URL: ' + url); | |
| 27 assert_array_equals( | |
| 28 self.internals.getInternalResponseURLList(cloned_response), | |
| 29 expected_url_list, | |
| 30 'The URL list of cloned response must match. URL: ' + url); | |
| 31 } | |
| 32 return cache.put(url, response); | |
| 33 }) | |
| 34 .then(_ => cache.match(url)) | |
| 35 .then(response => { | |
| 36 assert_equals(response.redirected, expected_redirected, | |
| 37 'The redirected flag of response in CacheStorage must match. URL: ' + | |
| 38 url); | |
| 39 if (self.internals) { | |
|
falken
2017/05/17 05:09:12
ditto
mike3
2017/05/17 21:19:27
Acknowledged.
| |
| 40 assert_array_equals( | |
| 41 self.internals.getInternalResponseURLList(response), | |
| 42 expected_url_list, | |
| 43 'The URL list of response in CacheStorage must match. URL: ' + | |
| 44 url); | |
| 45 } | |
| 46 }); | |
| 47 } | |
| 48 | |
| 49 var host_info = get_host_info(); | |
| 50 var REDIRECT_URL = host_info['HTTPS_ORIGIN'] + | |
| 51 '/service-workers/service-worker/resources/redirect.py?Redire ct='; | |
| 52 var TARGET_URL = host_info['HTTPS_ORIGIN'] + | |
| 53 '/service-workers/service-worker/resources/simple.txt'; | |
| 54 var REDIRECT_TO_TARGET_URL = REDIRECT_URL + encodeURIComponent(TARGET_URL); | |
| 55 var frame; | |
| 56 var cache; | |
| 57 var setup; | |
| 58 | |
| 59 promise_test(t => { | |
| 60 var SCOPE = 'resources/blank.html?redirected-response'; | |
| 61 var SCRIPT = 'resources/fetch-rewrite-worker.js'; | |
| 62 var CACHE_NAME = 'service-workers/service-worker/redirected-response'; | |
| 63 setup = service_worker_unregister_and_register(t, SCRIPT, SCOPE) | |
| 64 .then(registration => { | |
| 65 promise_test(function() { | |
| 66 return registration.unregister(); | |
| 67 }, 'restore global state (service worker registration)'); | |
| 68 | |
| 69 return wait_for_state(t, registration.installing, 'activated'); | |
| 70 }) | |
| 71 .then(_ => self.caches.open(CACHE_NAME)) | |
| 72 .then(c => { | |
| 73 cache = c; | |
| 74 | |
| 75 promise_test(function() { | |
| 76 return self.caches.delete(CACHE_NAME); | |
| 77 }, 'restore global state (caches)'); | |
| 78 | |
| 79 return with_iframe(SCOPE); | |
| 80 }) | |
| 81 .then(f => { | |
| 82 frame = f; | |
| 83 | |
| 84 t.add_cleanup(function() { | |
|
mike3
2017/05/17 21:19:28
This change was a mistake: the `t` here is the "se
| |
| 85 f.remove(); | |
| 86 }); | |
| 87 }); | |
| 88 return setup; | |
| 89 }, 'initialize global state (service worker registration and caches)'); | |
| 90 | |
| 91 // Tests without service workers. | |
| 92 promise_test(t => setup | |
| 93 .then(() => redirected_test(TARGET_URL, {}, self.fetch, cache, | |
| 94 false /* expected_redirected */, | |
| 95 [TARGET_URL])), | |
| 96 'mode: "follow", non-intercepted request, no server redirect'); | |
| 97 | |
| 98 promise_test(t => setup | |
| 99 .then(() => redirected_test(REDIRECT_TO_TARGET_URL, {}, self.fetch, cache, | |
| 100 true /* expected_redirected */, | |
| 101 [REDIRECT_TO_TARGET_URL, TARGET_URL])), | |
| 102 'mode: "follow", non-intercepted request'); | |
| 103 | |
| 104 promise_test(t => setup | |
| 105 .then(() => redirected_test(REDIRECT_TO_TARGET_URL + '&manual', | |
| 106 {redirect: 'manual'}, self.fetch, cache, | |
| 107 false /* expected_redirected */, | |
| 108 [REDIRECT_TO_TARGET_URL + '&manual'])), | |
| 109 'mode: "manual", non-intercepted request'); | |
| 110 | |
| 111 promise_test(t => setup | |
| 112 .then(() => promise_rejects( | |
| 113 t, new TypeError(), | |
| 114 self.fetch(REDIRECT_TO_TARGET_URL + '&error', | |
| 115 {redirect:'error'}), | |
| 116 'The redirect response from the server should be treated as' + | |
| 117 ' an error when the redirect flag of request was \'error\'.') ), | |
| 118 'mode: "error", non-intercepted request'); | |
| 119 | |
| 120 promise_test(t => setup | |
| 121 .then(() => redirected_test('./?url=' + encodeURIComponent(TARGET_URL), | |
| 122 {}, | |
| 123 frame.contentWindow.fetch, | |
| 124 cache, | |
| 125 false /* expected_redirected */, | |
| 126 [TARGET_URL])), | |
| 127 'mode: "follow", no mode change, no server redirect'); | |
| 128 | |
| 129 | |
| 130 // The service worker returns a redirected response. | |
| 131 promise_test(t => setup | |
| 132 .then(() => redirected_test( | |
| 133 './?url=' + encodeURIComponent(REDIRECT_TO_TARGET_URL) + | |
| 134 '&original-redirect-mode=follow', | |
| 135 {redirect: 'follow'}, | |
| 136 frame.contentWindow.fetch, | |
| 137 cache, | |
| 138 true /* expected_redirected */, | |
| 139 [REDIRECT_TO_TARGET_URL, TARGET_URL])), | |
| 140 'mode: "follow", no mode change'); | |
| 141 | |
| 142 promise_test(t => setup | |
| 143 .then(() => promise_rejects( | |
| 144 t, new TypeError(), | |
| 145 frame.contentWindow.fetch( | |
| 146 './?url=' + encodeURIComponent(REDIRECT_TO_TARGET_URL) + | |
| 147 '&original-redirect-mode=error&redirect-mode=follow', | |
| 148 {redirect: 'error'}), | |
| 149 'The redirected response from the service worker should be ' + | |
| 150 'treated as an error when the redirect flag of request was ' + | |
| 151 '\'error\'.')), | |
| 152 'mode: "error", mode change: "follow"'); | |
| 153 | |
| 154 promise_test(t => setup | |
| 155 .then(() => promise_rejects( | |
| 156 t, new TypeError(), | |
| 157 frame.contentWindow.fetch( | |
| 158 './?url=' + encodeURIComponent(REDIRECT_TO_TARGET_URL) + | |
| 159 '&original-redirect-mode=manual&redirect-mode=follow', | |
| 160 {redirect: 'manual'}), | |
| 161 'The redirected response from the service worker should be ' + | |
| 162 'treated as an error when the redirect flag of request was ' + | |
| 163 '\'manual\'.')), | |
| 164 'mode: "manual", mode change: "follow"'); | |
| 165 | |
| 166 // The service worker returns an opaqueredirect response. | |
| 167 promise_test(t => setup | |
| 168 .then(() => promise_rejects( | |
| 169 t, new TypeError(), | |
| 170 frame.contentWindow.fetch( | |
| 171 './?url=' + encodeURIComponent(REDIRECT_TO_TARGET_URL) + | |
| 172 '&original-redirect-mode=follow&redirect-mode=manual', | |
| 173 {redirect: 'follow'}), | |
| 174 'The opaqueredirect response from the service worker should ' + | |
| 175 'be treated as an error when the redirect flag of request wa s' + | |
| 176 ' \'follow\'.')), | |
| 177 'mode: "follow", mode change: "redirect"'); | |
| 178 | |
| 179 promise_test(t => setup | |
| 180 .then(() => promise_rejects( | |
| 181 t, new TypeError(), | |
| 182 frame.contentWindow.fetch( | |
| 183 './?url=' + encodeURIComponent(REDIRECT_TO_TARGET_URL) + | |
| 184 '&original-redirect-mode=error&redirect-mode=manual', | |
| 185 {redirect: 'error'}), | |
| 186 'The opaqueredirect response from the service worker should ' + | |
| 187 'be treated as an error when the redirect flag of request wa s' + | |
| 188 ' \'error\'.')), | |
| 189 'mode: "error", mode change: "manual"'); | |
| 190 | |
| 191 promise_test(t => setup | |
| 192 .then(() => redirected_test( | |
| 193 './?url=' + encodeURIComponent(REDIRECT_TO_TARGET_URL) + | |
| 194 '&original-redirect-mode=manual&redirect-mode=manual', | |
| 195 {redirect: 'manual'}, | |
| 196 frame.contentWindow.fetch, | |
| 197 cache, | |
| 198 false /* expected_redirected */, | |
| 199 [REDIRECT_TO_TARGET_URL])), | |
| 200 'mode: "manual", no mode change'); | |
| 201 </script> | |
| OLD | NEW |