mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1631034 [wpt PR 23069] - Rework WPT: /fetch/stale-while-revalidate/stale-script.html, a=testonly 

Automatic update from web-platform-tests
Rework WPT: /fetch/stale-while-revalidate/stale-script.html

Mainly for improving my own understanding. I would like to make some
tests about CSP vs stale-while-revalidate for issue 1070117

This patch:
1) Use Promise(s) instead of callback(s). This unwrap the logic flow.

2) Make "last_modified_count" to count the number of new version being
   served. Previously, it was a bit confusing to me.

3) Extend the test to check the "revalidated" version is served on the
   3rd load.

4) Small misc refactorings.

Bug: 1070117
Change-Id: Ifba23d78e539eb50262244f59e7c16e1b9ca56ab
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2154786
Reviewed-by: Dave Tapuska <dtapuska@chromium.org>
Commit-Queue: Arthur Sonzogni <arthursonzogni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#760550}

--

wpt-commits: 786254638cb557073634ba37262f31668712df4b
wpt-pr: 23069
This commit is contained in:
arthursonzogni 2020-04-28 11:32:48 +00:00 коммит произвёл moz-wptsync-bot
Родитель 4a8e8e5991
Коммит a902242bcb
1 изменённых файлов: 43 добавлений и 37 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

80
testing/web-platform/tests/fetch/stale-while-revalidate/stale-script.html
Просмотреть файл

@ -6,48 +6,54 @@
<script src="/common/utils.js"></script>
<body>
<script>
var last_modified;
var last_modified_count = 0;
var request_token = token();
// The script will call report via a uniquely generated ID on the subresource.
// If it is a cache hit the ID will be the same and the test will pass.
const request_token = token();
const script_src = "./resources/stale-script.py?token=" + request_token;
// The script above will call report() via a uniquely generated ID on the
// subresource. If it is a cache hit, the ID will be the same and
// |last_modified_count| won't be incremented.
let last_modified;
let last_modified_count = 0;
function report(mod) {
if (!last_modified) {
last_modified = mod;
last_modified_count = 1;
} else if (last_modified == mod) {
last_modified_count++;
}
if (last_modified == mod)
return;
last_modified = mod;
last_modified_count++;
}
async_test(t => {
window.onload = t.step_func(() => {
step_timeout(() => {
var script = document.createElement("script");
script.src = "resources/stale-script.py?token=" + request_token;
document.body.appendChild(script);
script.onload = t.step_func(() => {
assert_equals(last_modified_count, 2, "last modified");
var checkResult = () => {
// We poll because we don't know when the revalidation will occur.
fetch("resources/stale-script.py?query&token=" + request_token).then(t.step_func((response) => {
var count = response.headers.get("Count");
if (count == '2') {
t.done();
} else {
t.step_timeout(checkResult, 25);
}
}));
};
t.step_timeout(checkResult, 25);
});
}, 0);
});
let loadScript = async () => {
let script = document.createElement("script");
let script_loaded = new Promise(r => script.onload = r);
script.src = script_src;
document.body.appendChild(script);
await script_loaded;
};
promise_test(async t => {
await new Promise(r => window.onload = r);
await loadScript();
assert_equals(last_modified_count, 1, '(initial version loaded)');
await loadScript();
assert_equals(last_modified_count, 1, '(stale version loaded)');
// Query the server again and again. At some point it must have received the
// revalidation request. We poll, because we don't know when the revalidation
// will occur.
while(true) {
await new Promise(r => step_timeout(r, 25));
let response = await fetch(script_src + "&query");
let count = response.headers.get("Count");
if (count == '2')
break;
}
await loadScript();
assert_equals(last_modified_count, 2, '(revalidated version loaded)');
}, 'Cache returns stale resource');
var script = document.createElement("script");
script.src = "resources/stale-script.py?token=" + request_token;
document.body.appendChild(script);
</script>
</body>