Bug 1200843: Make fetch-mixed-content tests pass. r=jdm

This commit is contained in:
Kyle Huey 2015-09-02 17:17:01 -07:00
parent b2c41fa063
commit a30211dfde
3 changed files with 3 additions and 15 deletions

View File

@ -1,6 +0,0 @@
[fetch-mixed-content-to-inscope.https.html]
type: testharness
expected: TIMEOUT
[Verify Mixed content of fetch() in a Service Worker]
expected: TIMEOUT

View File

@ -1,6 +0,0 @@
[fetch-mixed-content-to-outscope.https.html]
type: testharness
expected: TIMEOUT
[Verify Mixed content of fetch() in a Service Worker]
expected: TIMEOUT

View File

@ -29,7 +29,7 @@ navigator.serviceWorker.getRegistration(SCOPE)
})
.catch(function(reason) {
window.parent.postMessage({results: 'FAILURE: ' + reason.message},
host_info['HTTP_ORIGIN']);
host_info['HTTPS_ORIGIN']);
});
function on_state_change(event) {
@ -47,11 +47,11 @@ function on_message(e) {
return registration.unregister();
})
.then(function() {
window.parent.postMessage(e.data, host_info['HTTP_ORIGIN']);
window.parent.postMessage(e.data, host_info['HTTPS_ORIGIN']);
})
.catch(function(reason) {
window.parent.postMessage({results: 'FAILURE: ' + reason.message},
host_info['HTTP_ORIGIN']);
host_info['HTTPS_ORIGIN']);
});
}