зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1215196 - Fix web-platform-tests iframe scripts to avoid pulling in testharness.js in them; r=bkelly
This commit is contained in:
Ehsan Akhgari
Родитель
51d813dfae
Коммит
86b5997ef7
|
|
@ -29785,12 +29785,6 @@
|
|||
"path": "dom/nodes/Element-getElementsByTagName-change-document-HTMLNess.html",
|
||||
"url": "/dom/nodes/Element-getElementsByTagName-change-document-HTMLNess.html"
|
||||
}
|
||||
],
|
||||
"webaudio/the-audio-api/the-audioparam-interface/retrospective-setValueAtTime.html": [
|
||||
{
|
||||
"path": "webaudio/the-audio-api/the-audioparam-interface/retrospective-setValueAtTime.html",
|
||||
"url": "/webaudio/the-audio-api/the-audioparam-interface/retrospective-setValueAtTime.html"
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
|
|
@ -35321,4 +35315,4 @@
|
|||
"rev": "886dea2c3dbb79925360319a6a0f662ce196ab3c",
|
||||
"url_base": "/",
|
||||
"version": 2
|
||||
}
|
||||
}
|
||||
|
|
@ -397,36 +397,6 @@
|
|||
"url": "/_mozilla/service-workers/service-worker/resource-timing.https.html"
|
||||
}
|
||||
],
|
||||
"service-workers/service-worker/resources/fetch-request-resources-iframe.https.html": [
|
||||
{
|
||||
"path": "service-workers/service-worker/resources/fetch-request-resources-iframe.https.html",
|
||||
"url": "/_mozilla/service-workers/service-worker/resources/fetch-request-resources-iframe.https.html"
|
||||
}
|
||||
],
|
||||
"service-workers/service-worker/resources/fetch-request-xhr-iframe.https.html": [
|
||||
{
|
||||
"path": "service-workers/service-worker/resources/fetch-request-xhr-iframe.https.html",
|
||||
"url": "/_mozilla/service-workers/service-worker/resources/fetch-request-xhr-iframe.https.html"
|
||||
}
|
||||
],
|
||||
"service-workers/service-worker/resources/fetch-response-xhr-iframe.https.html": [
|
||||
{
|
||||
"path": "service-workers/service-worker/resources/fetch-response-xhr-iframe.https.html",
|
||||
"url": "/_mozilla/service-workers/service-worker/resources/fetch-response-xhr-iframe.https.html"
|
||||
}
|
||||
],
|
||||
"service-workers/service-worker/resources/invalid-blobtype-iframe.https.html": [
|
||||
{
|
||||
"path": "service-workers/service-worker/resources/invalid-blobtype-iframe.https.html",
|
||||
"url": "/_mozilla/service-workers/service-worker/resources/invalid-blobtype-iframe.https.html"
|
||||
}
|
||||
],
|
||||
"service-workers/service-worker/resources/invalid-header-iframe.https.html": [
|
||||
{
|
||||
"path": "service-workers/service-worker/resources/invalid-header-iframe.https.html",
|
||||
"url": "/_mozilla/service-workers/service-worker/resources/invalid-header-iframe.https.html"
|
||||
}
|
||||
],
|
||||
"service-workers/service-worker/service-worker-csp-connect.https.html": [
|
||||
{
|
||||
"path": "service-workers/service-worker/service-worker-csp-connect.https.html",
|
||||
|
|
@ -567,4 +537,4 @@
|
|||
"rev": null,
|
||||
"url_base": "/_mozilla/",
|
||||
"version": 2
|
||||
}
|
||||
}
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[fetch-request-resources-iframe.https.html]
|
||||
type: testharness
|
||||
expected: TIMEOUT
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[fetch-request-xhr-iframe.https.html]
|
||||
type: testharness
|
||||
expected: TIMEOUT
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[fetch-response-xhr-iframe.https.html]
|
||||
type: testharness
|
||||
expected: TIMEOUT
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[invalid-blobtype-iframe.https.html]
|
||||
type: testharness
|
||||
expected: TIMEOUT
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[invalid-header-iframe.https.html]
|
||||
type: testharness
|
||||
expected: TIMEOUT
|
||||
|
|
@ -9,6 +9,13 @@ async_test(function(t) {
|
|||
var SCOPE = 'resources/fetch-response-xhr-iframe.https.html';
|
||||
var SCRIPT = 'resources/fetch-response-xhr-worker.js';
|
||||
var host_info = get_host_info();
|
||||
|
||||
window.addEventListener('message', t.step_func(on_message), false);
|
||||
function on_message(e) {
|
||||
assert_equals(e.data.results, 'foo, bar');
|
||||
t.done();
|
||||
}
|
||||
|
||||
service_worker_unregister_and_register(t, SCRIPT, SCOPE)
|
||||
.then(function(registration) {
|
||||
return wait_for_state(t, registration.installing, 'activated');
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
<script src="/resources/testharness.js"></script>
|
||||
<script src="test-helpers.sub.js?pipe=sub"></script>
|
||||
<body>
|
||||
<script>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
<script src="/resources/testharness.js"></script>
|
||||
<script src="../resources/get-host-info.sub.js"></script>
|
||||
<script src="test-helpers.sub.js?pipe=sub"></script>
|
||||
<script>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
<script src="/resources/testharness.js"></script>
|
||||
<script src="../resources/get-host-info.sub.js"></script>
|
||||
<script src="test-helpers.sub.js?pipe=sub"></script>
|
||||
<script>
|
||||
var host_info = get_host_info();
|
||||
|
||||
function xhr_send(method, data) {
|
||||
return new Promise(function(resolve, reject) {
|
||||
|
|
@ -20,7 +21,8 @@ function xhr_send(method, data) {
|
|||
function coalesce_headers_test() {
|
||||
return xhr_send('POST', 'test string')
|
||||
.then(function(xhr) {
|
||||
assert_equals(xhr.getResponseHeader('foo'), 'foo, bar');
|
||||
window.parent.postMessage({results: xhr.getResponseHeader('foo')},
|
||||
host_info['HTTPS_ORIGIN']);
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
<script src="/resources/testharness.js"></script>
|
||||
<script src="test-helpers.sub.js?pipe=sub"></script>
|
||||
<script>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
<script src="/resources/testharness.js"></script>
|
||||
<script src="test-helpers.sub.js?pipe=sub"></script>
|
||||
<script>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
<script src="/resources/testharness.js"></script>
|
||||
<script src="../resources/get-host-info.sub.js"></script>
|
||||
<script src="test-helpers.sub.js?pipe=sub"></script>
|
||||
<script>
|
||||
|
|
@ -12,7 +11,7 @@ function boilerplate_test(msg) {
|
|||
worker.postMessage(msg);
|
||||
})
|
||||
.then(function(data) {
|
||||
assert_equals(data, "This load was successfully intercepted.");
|
||||
window.parent.postMessage({results: data}, host_info['HTTPS_ORIGIN']);
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -123,6 +123,12 @@ promise_test(function(t) {
|
|||
var service_worker = 'resources/worker-load-interceptor.js';
|
||||
var scope = 'resources/';
|
||||
|
||||
window.addEventListener('message', t.step_func(on_message), false);
|
||||
function on_message(e) {
|
||||
assert_equals(e.data.results, "This load was successfully intercepted.");
|
||||
t.done();
|
||||
}
|
||||
|
||||
return service_worker_unregister_and_register(t, service_worker, scope)
|
||||
.then(function(r) {
|
||||
return wait_for_state(t, r.installing, 'activated');
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче