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

Side by Side Diff: LayoutTests/http/tests/serviceworker/resources/fetch-access-control-util.js

Issue 722603002: [ServiceWorker] Use the cookie which is differnt from the username in LayoutTest. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 1 month 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 unified diff | Download patch
OLDNEW
1 var SCOPE = 'resources/fetch-access-control-iframe.html'; 1 var SCOPE = 'resources/fetch-access-control-iframe.html';
2 var BASE_URL = 'http://127.0.0.1:8000/serviceworker/resources/fetch-access-contr ol.php?'; 2 var BASE_URL = 'http://127.0.0.1:8000/serviceworker/resources/fetch-access-contr ol.php?';
3 var OTHER_BASE_URL = 'http://localhost:8000/serviceworker/resources/fetch-access -control.php?'; 3 var OTHER_BASE_URL = 'http://localhost:8000/serviceworker/resources/fetch-access -control.php?';
4 var REDIRECT_URL = 'http://127.0.0.1:8000/serviceworker/resources/redirect.php?R edirect='; 4 var REDIRECT_URL = 'http://127.0.0.1:8000/serviceworker/resources/redirect.php?R edirect=';
5 var IFRAME_URL = 'http://127.0.0.1:8000/serviceworker/resources/fetch-access-con trol-iframe.html'; 5 var IFRAME_URL = 'http://127.0.0.1:8000/serviceworker/resources/fetch-access-con trol-iframe.html';
6 var WORKER_URL = 'http://127.0.0.1:8000/serviceworker/resources/fetch-access-con trol-worker.js'; 6 var WORKER_URL = 'http://127.0.0.1:8000/serviceworker/resources/fetch-access-con trol-worker.js';
7 var IFRAME_ORIGIN = 'http://127.0.0.1:8000'; 7 var IFRAME_ORIGIN = 'http://127.0.0.1:8000';
8 8
9 // Functions to check the result from the ServiceWorker. 9 // Functions to check the result from the ServiceWorker.
10 var checkFetchResult = function(expected, url, data) { 10 var checkFetchResult = function(expected, url, data) {
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 'Request header check failed url:' + url + ' name:' + name); 78 'Request header check failed url:' + url + ' name:' + name);
79 }; 79 };
80 var checkJsonpMethod = function(method, url, data) { 80 var checkJsonpMethod = function(method, url, data) {
81 assert_equals(data.jsonpResult, 81 assert_equals(data.jsonpResult,
82 'success', 82 'success',
83 url + ' jsonpResult must be success'); 83 url + ' jsonpResult must be success');
84 assert_equals(data.method, 84 assert_equals(data.method,
85 method, 85 method,
86 'Method must match url:' + url); 86 'Method must match url:' + url);
87 }; 87 };
88 var checkJsonpAuth = function(username, password, url, data) { 88 var checkJsonpAuth = function(username, password, cookie, url, data) {
89 assert_equals(data.jsonpResult, 89 assert_equals(data.jsonpResult,
90 'success', 90 'success',
91 url + ' jsonpResult must be success'); 91 url + ' jsonpResult must be success');
92 assert_equals(data.username, 92 assert_equals(data.username,
93 username, 93 username,
94 'Username must match. url: ' + url); 94 'Username must match. url: ' + url);
95 assert_equals(data.password, 95 assert_equals(data.password,
96 password, 96 password,
97 'Password must match. url: ' + url); 97 'Password must match. url: ' + url);
98 assert_equals(data.cookie, 98 assert_equals(data.cookie,
99 username, 99 cookie,
100 'Cookie must match. url: ' + url); 100 'Cookie must match. url: ' + url);
101 }; 101 };
102 var checkJsonpError = checkJsonpResult.bind(this, 'error'); 102 var checkJsonpError = checkJsonpResult.bind(this, 'error');
103 var checkJsonpSuccess = checkJsonpResult.bind(this, 'success'); 103 var checkJsonpSuccess = checkJsonpResult.bind(this, 'success');
104 var hasCustomHeader = 104 var hasCustomHeader =
105 checkJsonpHeader.bind(this, 'x-serviceworker-test', 'test'); 105 checkJsonpHeader.bind(this, 'x-serviceworker-test', 'test');
106 var noCustomHeader = 106 var noCustomHeader =
107 checkJsonpHeader.bind(this, 'x-serviceworker-test', undefined); 107 checkJsonpHeader.bind(this, 'x-serviceworker-test', undefined);
108 var methodIsGET = checkJsonpMethod.bind(this, 'GET'); 108 var methodIsGET = checkJsonpMethod.bind(this, 'GET');
109 var methodIsPOST = checkJsonpMethod.bind(this, 'POST'); 109 var methodIsPOST = checkJsonpMethod.bind(this, 'POST');
110 var methodIsPUT = checkJsonpMethod.bind(this, 'PUT'); 110 var methodIsPUT = checkJsonpMethod.bind(this, 'PUT');
111 var methodIsXXX = checkJsonpMethod.bind(this, 'XXX'); 111 var methodIsXXX = checkJsonpMethod.bind(this, 'XXX');
112 var authCheckNone = checkJsonpAuth.bind(this, 'undefined', 'undefined'); 112 var authCheckNone =
113 var authCheck1 = checkJsonpAuth.bind(this, 'username1', 'password1'); 113 checkJsonpAuth.bind(this, 'undefined', 'undefined', 'undefined');
114 var authCheck2 = checkJsonpAuth.bind(this, 'username2', 'password2'); 114 var authCheck1 = checkJsonpAuth.bind(this, 'username1', 'password1', 'cookie1');
115 var authCheck2 = checkJsonpAuth.bind(this, 'username2', 'password2', 'cookie2');
115 116
116 function executeTests(test, test_targets) { 117 function executeTests(test, test_targets) {
117 test.step(function() { 118 test.step(function() {
118 var login1 = 119 var login1 =
119 test_login(test, 'http://127.0.0.1:8000', 'username1', 'password1'); 120 test_login(test, 'http://127.0.0.1:8000',
121 'username1', 'password1', 'cookie1');
120 var login2 = 122 var login2 =
121 test_login(test, 'http://localhost:8000', 'username2', 'password2'); 123 test_login(test, 'http://localhost:8000',
124 'username2', 'password2', 'cookie2');
122 var workerScript = 'resources/fetch-access-control-worker.js'; 125 var workerScript = 'resources/fetch-access-control-worker.js';
123 var worker = undefined; 126 var worker = undefined;
124 var frameWindow = {}; 127 var frameWindow = {};
125 var counter = 0; 128 var counter = 0;
126 window.addEventListener('message', test.step_func(onMessage), false); 129 window.addEventListener('message', test.step_func(onMessage), false);
127 130
128 Promise.all([login1, login2]) 131 Promise.all([login1, login2])
129 .then(function() { 132 .then(function() {
130 return service_worker_unregister_and_register(test, 133 return service_worker_unregister_and_register(test,
131 workerScript, 134 workerScript,
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 worker.postMessage({msg: 'START TEST CASE'}); 209 worker.postMessage({msg: 'START TEST CASE'});
207 })) 210 }))
208 .then(test.step_func(function() { 211 .then(test.step_func(function() {
209 frameWindow.postMessage( 212 frameWindow.postMessage(
210 {url: TEST_TARGETS[counter][0]}, 213 {url: TEST_TARGETS[counter][0]},
211 IFRAME_ORIGIN); 214 IFRAME_ORIGIN);
212 })); 215 }));
213 } 216 }
214 }); 217 });
215 } 218 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698