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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1292503002: [Fetch] Unship Request.context (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase. Created 5 years, 4 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 | « LayoutTests/http/tests/fetch/script-tests/request.js ('k') | LayoutTests/http/tests/serviceworker/resources/fetch-request-resources-worker.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: LayoutTests/http/tests/serviceworker/fetch-request-resources.html
diff --git a/LayoutTests/http/tests/serviceworker/fetch-request-resources.html b/LayoutTests/http/tests/serviceworker/fetch-request-resources.html
index 605c722b8bf103e4b14ce882dc86f880277babc9..c3c870665a998f0b704f5fe0123aa96729876524 100644
--- a/LayoutTests/http/tests/serviceworker/fetch-request-resources.html
+++ b/LayoutTests/http/tests/serviceworker/fetch-request-resources.html
@@ -8,12 +8,11 @@
var url_count = 0;
var expected_results = {};
-function image_test(frame, url, cross_origin, expected_context,
+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,
- context: expected_context,
mode: expected_mode,
credentials: expected_credentials,
redirect: 'follow',
@@ -23,12 +22,11 @@ function image_test(frame, url, cross_origin, expected_context,
return frame.contentWindow.load_image(actual_url, cross_origin);
}
-function script_test(frame, url, cross_origin, expected_context,
+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,
- context: expected_context,
mode: expected_mode,
credentials: expected_credentials,
redirect: 'follow',
@@ -38,12 +36,11 @@ function script_test(frame, url, cross_origin, expected_context,
return frame.contentWindow.load_script(actual_url, cross_origin);
}
-function css_test(frame, url, cross_origin, expected_context,
+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,
- context: expected_context,
mode: expected_mode,
credentials: expected_credentials,
redirect: 'follow',
@@ -53,12 +50,11 @@ function css_test(frame, url, cross_origin, expected_context,
return frame.contentWindow.load_css(actual_url, cross_origin);
}
-function font_face_test(frame, url, expected_context, expected_mode,
+function font_face_test(frame, url, expected_mode,
expected_credentials) {
var actual_url = url + (++url_count);
expected_results[actual_url] = {
url: actual_url,
- context: expected_context,
mode: expected_mode,
credentials: expected_credentials,
redirect: 'follow',
@@ -67,12 +63,11 @@ function font_face_test(frame, url, expected_context, expected_mode,
return frame.contentWindow.load_font(actual_url);
}
-function css_image_test(frame, url, type, expected_context,
+function css_image_test(frame, url, type,
expected_mode, expected_credentials) {
var actual_url = url + (++url_count);
expected_results[actual_url] = {
url: actual_url,
- context: expected_context,
mode: expected_mode,
credentials: expected_credentials,
redirect: 'follow',
@@ -81,12 +76,11 @@ function css_image_test(frame, url, type, expected_context,
return frame.contentWindow.load_css_image(actual_url, type);
}
-function css_image_set_test(frame, url, type, expected_context,
+function css_image_set_test(frame, url, type,
expected_mode, expected_credentials) {
var actual_url = url + (++url_count);
expected_results[actual_url] = {
url: actual_url,
- context: expected_context,
mode: expected_mode,
credentials: expected_credentials,
redirect: 'follow',
@@ -124,17 +118,6 @@ async_test(function(t) {
return;
}
assert_equals(
- result.context, expected.context,
- 'context of ' + expected.message + ' must be ' +
- expected.context + '.');
- assert_equals(
- result.context_clone, expected.context,
- 'context of clone() of ' + expected.message +
- ' must be ' + expected.context + '.');
- assert_equals(
- result.context_new, '',
- 'context of new Request() must be the empty string');
- assert_equals(
result.mode, expected.mode,
'mode of ' + expected.message + ' must be ' +
expected.mode + '.');
@@ -160,53 +143,43 @@ async_test(function(t) {
.then(function() { return with_iframe(SCOPE); })
.then(function(f) {
frame = f;
- image_test(f, LOCAL_URL, '', 'image', 'no-cors', 'same-origin');
- image_test(f, LOCAL_URL, 'anonymous', 'image', 'cors', 'omit');
- image_test(f, LOCAL_URL, 'use-credentials', 'image', 'cors',
- 'include');
- image_test(f, REMOTE_URL, '', 'image', 'no-cors', 'same-origin');
- image_test(f, REMOTE_URL, 'anonymous', 'image', 'cors', 'omit');
- image_test(f, REMOTE_URL, 'use-credentials', 'image', 'cors',
- 'include');
+ image_test(f, LOCAL_URL, '', 'no-cors', 'same-origin');
+ image_test(f, LOCAL_URL, 'anonymous', 'cors', 'omit');
+ image_test(f, LOCAL_URL, 'use-credentials', 'cors', 'include');
+ image_test(f, REMOTE_URL, '', 'no-cors', 'same-origin');
+ image_test(f, REMOTE_URL, 'anonymous', 'cors', 'omit');
+ image_test(f, REMOTE_URL, 'use-credentials', 'cors', 'include');
- script_test(f, LOCAL_URL, '', 'script', 'no-cors', 'same-origin');
- script_test(f, LOCAL_URL, 'anonymous', 'script', 'cors', 'omit');
- script_test(f, LOCAL_URL, 'use-credentials', 'script', 'cors',
- 'include');
- script_test(f, REMOTE_URL, '', 'script', 'no-cors', 'same-origin');
- script_test(f, REMOTE_URL, 'anonymous', 'script', 'cors', 'omit');
- script_test(f, REMOTE_URL, 'use-credentials', 'script', 'cors',
- 'include');
+ script_test(f, LOCAL_URL, '', 'no-cors', 'same-origin');
+ script_test(f, LOCAL_URL, 'anonymous', 'cors', 'omit');
+ script_test(f, LOCAL_URL, 'use-credentials', 'cors', 'include');
+ script_test(f, REMOTE_URL, '', 'no-cors', 'same-origin');
+ script_test(f, REMOTE_URL, 'anonymous', 'cors', 'omit');
+ script_test(f, REMOTE_URL, 'use-credentials', 'cors', 'include');
- css_test(f, LOCAL_URL, '', 'style', 'no-cors', 'same-origin');
- css_test(f, LOCAL_URL, 'anonymous', 'style', 'cors', 'omit');
- css_test(f, LOCAL_URL, 'use-credentials', 'style', 'cors',
- 'include');
- css_test(f, REMOTE_URL, '', 'style', 'no-cors', 'same-origin');
- css_test(f, REMOTE_URL, 'anonymous', 'style', 'cors', 'omit');
- css_test(f, REMOTE_URL, 'use-credentials', 'style', 'cors',
- 'include');
+ css_test(f, LOCAL_URL, '', 'no-cors', 'same-origin');
+ css_test(f, LOCAL_URL, 'anonymous', 'cors', 'omit');
+ css_test(f, LOCAL_URL, 'use-credentials', 'cors', 'include');
+ css_test(f, REMOTE_URL, '', 'no-cors', 'same-origin');
+ css_test(f, REMOTE_URL, 'anonymous', 'cors', 'omit');
+ css_test(f, REMOTE_URL, 'use-credentials', 'cors', 'include');
- font_face_test(f, LOCAL_URL, 'font', 'cors', 'omit');
- font_face_test(f, REMOTE_URL, 'font', 'cors', 'omit');
+ font_face_test(f, LOCAL_URL, 'cors', 'omit');
+ font_face_test(f, REMOTE_URL, 'cors', 'omit');
- css_image_test(f, LOCAL_URL, 'backgroundImage', 'image',
+ css_image_test(f, LOCAL_URL, 'backgroundImage',
'no-cors', 'same-origin');
- css_image_test(f, REMOTE_URL, 'backgroundImage', 'image',
+ css_image_test(f, REMOTE_URL, 'backgroundImage',
'no-cors', 'same-origin');
- css_image_test(f, LOCAL_URL, 'shapeOutside', 'image', 'cors',
- 'omit');
- css_image_test(f, REMOTE_URL, 'shapeOutside', 'image', 'cors',
- 'omit');
+ css_image_test(f, LOCAL_URL, 'shapeOutside', 'cors', 'omit');
+ css_image_test(f, REMOTE_URL, 'shapeOutside', 'cors', 'omit');
- css_image_set_test(f, LOCAL_URL, 'backgroundImage', 'image',
+ css_image_set_test(f, LOCAL_URL, 'backgroundImage',
'no-cors', 'same-origin');
- css_image_set_test(f, REMOTE_URL, 'backgroundImage', 'image',
+ css_image_set_test(f, REMOTE_URL, 'backgroundImage',
'no-cors', 'same-origin');
- css_image_set_test(f, LOCAL_URL, 'shapeOutside', 'image', 'cors',
- 'omit');
- css_image_set_test(f, REMOTE_URL, 'shapeOutside', 'image', 'cors',
- 'omit');
+ css_image_set_test(f, LOCAL_URL, 'shapeOutside', 'cors', 'omit');
+ css_image_set_test(f, REMOTE_URL, 'shapeOutside', 'cors', 'omit');
})
.catch(unreached_rejection(t));
« no previous file with comments | « LayoutTests/http/tests/fetch/script-tests/request.js ('k') | LayoutTests/http/tests/serviceworker/resources/fetch-request-resources-worker.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698