gecko-dev/testing/web-platform/tests/upgrade-insecure-requests/generic/test-case.sub.js
Hiroshige Hayashizaki c4350befd0 Bug 1623048 [wpt PR 22294] - [WPT/upgrade-insecure-requests] Merge multiple subtests into one file, a=testonly
Automatic update from web-platform-tests
[WPT/upgrade-insecure-requests] Merge multiple subtests into one file

Manual changes:

- upgrade-insecure-requests/generic/test-case.sub.js:
      to accept an array of scenarios.
- TestExpectations: to reflect test renames.

All other changes are mechanical, by commands:
  find gen -type f | perl -npe '$_=~s@/[^/]*\.([^/\.]*(\.html[^/]*|-expected\.txt)$)@.$1@g;' | sort -u > new_files
  git rm -r gen
  time python ../common/security-features/tools/generate.py --spec .
  run_web_tests.py --no-retry-failures --reset-results ....
  git add `cat new_files`
  git commit

Bug: 906850
Change-Id: I0dde51e0520a803635493fae549befd1f6f72a30
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2102932
Commit-Queue: Hiroshige Hayashizaki <hiroshige@chromium.org>
Reviewed-by: Hiroki Nakagawa <nhiroki@chromium.org>
Reviewed-by: Kenichi Ishibashi <bashi@chromium.org>
Reviewed-by: Mike West <mkwst@chromium.org>
Cr-Commit-Position: refs/heads/master@{#750926}

warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your diff.renameLimit variable to at least 1048 and retry the command.

--

wpt-commits: faefddf98852ce8059977f1092e8c1706a39ccd9
wpt-pr: 22294


--HG--
rename : testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch/cross-http-downgrade.downgrade.https.html.headers => testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch.https.html.headers
rename : testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch/cross-http-downgrade.no-redirect.https.html.headers => testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag.https.html.headers
rename : testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch/cross-https.downgrade.https.html.headers => testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag.https.html.headers
rename : testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch/same-http-downgrade.downgrade.https.html.headers => testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-classic.https.html.headers
rename : testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch/same-http-downgrade.no-redirect.https.html.headers => testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-import-data.https.html.headers
rename : testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch/same-https.downgrade.https.html.headers => testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-module.https.html.headers
rename : testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag/cross-http-downgrade.downgrade.https.html.headers => testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/websocket.https.html.headers
rename : testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag/cross-http-downgrade.no-redirect.https.html.headers => testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-classic.https.html.headers
rename : testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag/cross-https.downgrade.https.html.headers => testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data.https.html.headers
rename : testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag/same-http-downgrade.downgrade.https.html.headers => testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-module.https.html.headers
rename : testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag/same-http-downgrade.no-redirect.https.html.headers => testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data.https.html.headers
rename : testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag/same-https.downgrade.https.html.headers => testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation.https.html.headers
rename : testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag/cross-http-downgrade.downgrade.https.html.headers => testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data.https.html.headers
rename : testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag/cross-http-downgrade.no-redirect.https.html.headers => testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio.https.html.headers
rename : testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag/cross-https.downgrade.https.html.headers => testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data.https.html.headers
rename : testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag/same-http-downgrade.downgrade.https.html.headers => testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout.https.html.headers
rename : testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag/same-http-downgrade.no-redirect.https.html.headers => testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data.https.html.headers
rename : testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag/same-https.downgrade.https.html.headers => testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint.https.html.headers
rename : testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-classic/same-http-downgrade.downgrade.https.html.headers => testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr.https.html.headers
rename : testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-classic/same-http-downgrade.no-redirect.https.html.headers => testing/web-platform/tests/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/fetch.https.html.headers
rename : testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-classic/same-https.downgrade.https.html.headers => testing/web-platform/tests/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/websocket.https.html.headers
rename : testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-import-data/cross-http-downgrade.downgrade.https.html.headers => testing/web-platform/tests/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-classic.https.html.headers
rename : testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-import-data/cross-http-downgrade.no-redirect.https.html.headers => testing/web-platform/tests/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-module.https.html.headers
rename : testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-import-data/cross-https.downgrade.https.html.headers => testing/web-platform/tests/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/xhr.https.html.headers
rename : testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-import-data/same-http-downgrade.downgrade.https.html.headers => testing/web-platform/tests/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/fetch.https.html.headers
rename : testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-import-data/same-http-downgrade.no-redirect.https.html.headers => testing/web-platform/tests/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/websocket.https.html.headers
rename : testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-import-data/same-https.downgrade.https.html.headers => testing/web-platform/tests/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-classic.https.html.headers
rename : testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-module/same-http-downgrade.downgrade.https.html.headers => testing/web-platform/tests/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-module.https.html.headers
rename : testing/web-platform/tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-module/same-http-downgrade.no-redirect.https.html.headers => testing/web-platform/tests/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/xhr.https.html.headers
2020-03-19 17:33:12 +00:00

43 lines
1.5 KiB
JavaScript

// TODO(hiroshige): Document the type of `scenario`.
function TestCase(scenarios) {
function runTest(scenario) {
const urls = getRequestURLs(scenario.subresource,
scenario.origin,
scenario.redirection);
const checkResult = _ => {
// Send request to check if the key has been torn down.
return xhrRequest(urls.assertUrl)
.then(assertResult => {
// Now check if the value has been torn down. If it's still there,
// we have blocked the request to mixed-content.
assert_equals(assertResult.status, scenario.expectation,
"The resource request should be '" + scenario.expectation + "'.");
});
};
/** @type {Subresource} */
const subresource = {
subresourceType: scenario.subresource,
url: urls.testUrl,
policyDeliveries: scenario.subresource_policy_deliveries,
};
promise_test(() => {
return xhrRequest(urls.announceUrl)
// Send out the real resource request.
// This should tear down the key if it's not blocked.
.then(_ => invokeRequest(subresource, scenario.source_context_list))
// We check the key state, regardless of whether the main request
// succeeded or failed.
.then(checkResult, checkResult);
}, scenario.test_description);
} // runTest
function runTests() {
for (const scenario of scenarios) {
runTest(scenario);
}
}
return {start: runTests};
}