Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(329)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/LayoutTests/http/tests/serviceworker/fetch-request-resources.html

Issue 1738753002: Revert of Set the request mode and the credentials mode of FetchEvent in the service worker correctly. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/LayoutTests/http/tests/fetch/script-tests/thorough/redirect-loop.js ('k') | third_party/WebKit/LayoutTests/http/tests/serviceworker/resources/fetch-request-resources-iframe.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/LayoutTests/http/tests/serviceworker/fetch-request-resources.html
diff --git a/third_party/WebKit/LayoutTests/http/tests/serviceworker/fetch-request-resources.html b/third_party/WebKit/LayoutTests/http/tests/serviceworker/fetch-request-resources.html
index 7b7947a0652930a572764aa609b46e85dca2985b..3ee299cafa3da8db51db2da0da59c911695cc4e5 100644
--- a/third_party/WebKit/LayoutTests/http/tests/serviceworker/fetch-request-resources.html
+++ b/third_party/WebKit/LayoutTests/http/tests/serviceworker/fetch-request-resources.html
@@ -12,6 +12,7 @@ function image_test(frame, url, cross_origin,
expected_mode, expected_credentials) {
var actual_url = url + (++url_count);
expected_results[actual_url] = {
+ cross_origin: cross_origin,
mode: expected_mode,
credentials: expected_credentials,
redirect: 'follow',
@@ -25,6 +26,7 @@ function script_test(frame, url, cross_origin,
expected_mode, expected_credentials) {
var actual_url = url + (++url_count);
expected_results[actual_url] = {
+ cross_origin: cross_origin,
mode: expected_mode,
credentials: expected_credentials,
redirect: 'follow',
@@ -38,6 +40,7 @@ function css_test(frame, url, cross_origin,
expected_mode, expected_credentials) {
var actual_url = url + (++url_count);
expected_results[actual_url] = {
+ cross_origin: cross_origin,
mode: expected_mode,
credentials: expected_credentials,
redirect: 'follow',
@@ -86,33 +89,6 @@ function css_image_set_test(frame, url, type,
return frame.contentWindow.load_css_image_set(actual_url, type);
}
-function fetch_test(frame, url, mode, credentials,
- expected_mode, expected_credentials) {
- var actual_url = url + (++url_count);
- expected_results[actual_url] = {
- mode: expected_mode,
- credentials: expected_credentials,
- redirect: 'follow',
- message: 'fetch (url:' + actual_url + ' mode:' + mode + ' credentials:' +
- credentials + ')'
- };
- return frame.contentWindow.fetch(
- new Request(actual_url, {mode: mode, credentials: credentials}));
-}
-
-function audio_test(frame, url, cross_origin,
- expected_mode, expected_credentials) {
- var actual_url = url + (++url_count);
- expected_results[actual_url] = {
- mode: expected_mode,
- credentials: expected_credentials,
- redirect: 'follow',
- message: 'Audio load (url:' + actual_url + ' cross_origin:' +
- cross_origin + ')'
- };
- return frame.contentWindow.load_audio(actual_url, cross_origin);
-}
-
async_test(function(t) {
var SCOPE = 'resources/fetch-request-resources-iframe.html';
var SCRIPT = 'resources/fetch-request-resources-worker.js';
@@ -167,69 +143,45 @@ async_test(function(t) {
.then(function() { return with_iframe(SCOPE); })
.then(function(f) {
frame = f;
- image_test(f, LOCAL_URL, '', 'no-cors', 'include');
+ image_test(f, LOCAL_URL, '', 'no-cors', 'same-origin');
image_test(f, LOCAL_URL, 'anonymous', 'cors', 'same-origin');
image_test(f, LOCAL_URL, 'use-credentials', 'cors', 'include');
- image_test(f, REMOTE_URL, '', 'no-cors', 'include');
+ image_test(f, REMOTE_URL, '', 'no-cors', 'same-origin');
image_test(f, REMOTE_URL, 'anonymous', 'cors', 'same-origin');
image_test(f, REMOTE_URL, 'use-credentials', 'cors', 'include');
- script_test(f, LOCAL_URL, '', 'no-cors', 'include');
+ script_test(f, LOCAL_URL, '', 'no-cors', 'same-origin');
script_test(f, LOCAL_URL, 'anonymous', 'cors', 'same-origin');
script_test(f, LOCAL_URL, 'use-credentials', 'cors', 'include');
- script_test(f, REMOTE_URL, '', 'no-cors', 'include');
+ script_test(f, REMOTE_URL, '', 'no-cors', 'same-origin');
script_test(f, REMOTE_URL, 'anonymous', 'cors', 'same-origin');
script_test(f, REMOTE_URL, 'use-credentials', 'cors', 'include');
- css_test(f, LOCAL_URL, '', 'no-cors', 'include');
+ css_test(f, LOCAL_URL, '', 'no-cors', 'same-origin');
css_test(f, LOCAL_URL, 'anonymous', 'cors', 'same-origin');
css_test(f, LOCAL_URL, 'use-credentials', 'cors', 'include');
- css_test(f, REMOTE_URL, '', 'no-cors', 'include');
+ css_test(f, REMOTE_URL, '', 'no-cors', 'same-origin');
css_test(f, REMOTE_URL, 'anonymous', 'cors', 'same-origin');
css_test(f, REMOTE_URL, 'use-credentials', 'cors', 'include');
font_face_test(f, LOCAL_URL, 'cors', 'same-origin');
font_face_test(f, REMOTE_URL, 'cors', 'same-origin');
- css_image_test(f, LOCAL_URL, 'backgroundImage', 'no-cors', 'include');
- css_image_test(f, REMOTE_URL, 'backgroundImage', 'no-cors', 'include');
+ css_image_test(f, LOCAL_URL, 'backgroundImage',
+ 'no-cors', 'same-origin');
+ css_image_test(f, REMOTE_URL, 'backgroundImage',
+ 'no-cors', 'same-origin');
css_image_test(f, LOCAL_URL, 'shapeOutside', 'cors', 'same-origin');
css_image_test(f, REMOTE_URL, 'shapeOutside', 'cors', 'same-origin');
css_image_set_test(f, LOCAL_URL, 'backgroundImage',
- 'no-cors', 'include');
+ 'no-cors', 'same-origin');
css_image_set_test(f, REMOTE_URL, 'backgroundImage',
- 'no-cors', 'include');
+ 'no-cors', 'same-origin');
css_image_set_test(f, LOCAL_URL, 'shapeOutside', 'cors', 'same-origin');
css_image_set_test(f, REMOTE_URL, 'shapeOutside',
'cors', 'same-origin');
- fetch_test(f, LOCAL_URL, 'same-origin', 'omit', 'same-origin', 'omit');
- fetch_test(f, LOCAL_URL, 'same-origin', 'same-origin',
- 'same-origin', 'same-origin');
- fetch_test(f, LOCAL_URL, 'same-origin', 'include',
- 'same-origin', 'include');
- fetch_test(f, LOCAL_URL, 'no-cors', 'omit', 'no-cors', 'omit');
- fetch_test(f, LOCAL_URL, 'no-cors', 'same-origin',
- 'no-cors', 'same-origin');
- fetch_test(f, LOCAL_URL, 'no-cors', 'include', 'no-cors', 'include');
- fetch_test(f, LOCAL_URL, 'cors', 'omit', 'cors', 'omit');
- fetch_test(f, LOCAL_URL, 'cors', 'same-origin', 'cors', 'same-origin');
- fetch_test(f, LOCAL_URL, 'cors', 'include', 'cors', 'include');
- fetch_test(f, REMOTE_URL, 'no-cors', 'omit', 'no-cors', 'omit');
- fetch_test(f, REMOTE_URL, 'no-cors', 'same-origin',
- 'no-cors', 'same-origin');
- fetch_test(f, REMOTE_URL, 'no-cors', 'include', 'no-cors', 'include');
- fetch_test(f, REMOTE_URL, 'cors', 'omit', 'cors', 'omit');
- fetch_test(f, REMOTE_URL, 'cors', 'same-origin', 'cors', 'same-origin');
- fetch_test(f, REMOTE_URL, 'cors', 'include', 'cors', 'include');
-
- audio_test(f, LOCAL_URL, '', 'no-cors', 'include');
- audio_test(f, LOCAL_URL, 'anonymous', 'cors', 'same-origin');
- audio_test(f, LOCAL_URL, 'use-credentials', 'cors', 'include');
- audio_test(f, REMOTE_URL, '', 'no-cors', 'include');
- audio_test(f, REMOTE_URL, 'anonymous', 'cors', 'same-origin');
- audio_test(f, REMOTE_URL, 'use-credentials', 'cors', 'include');
})
.catch(unreached_rejection(t));
}, 'Verify FetchEvent for resources.');
« no previous file with comments | « third_party/WebKit/LayoutTests/http/tests/fetch/script-tests/thorough/redirect-loop.js ('k') | third_party/WebKit/LayoutTests/http/tests/serviceworker/resources/fetch-request-resources-iframe.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698