From a30211dfde837997d0829a5ee2ae50debc61397f Mon Sep 17 00:00:00 2001 From: Kyle Huey Date: Wed, 2 Sep 2015 17:17:01 -0700 Subject: [PATCH] Bug 1200843: Make fetch-mixed-content tests pass. r=jdm --- .../fetch-mixed-content-to-inscope.https.html.ini | 6 ------ .../fetch-mixed-content-to-outscope.https.html.ini | 6 ------ .../resources/fetch-mixed-content-iframe.html | 6 +++--- 3 files changed, 3 insertions(+), 15 deletions(-) delete mode 100644 testing/web-platform/mozilla/meta/service-workers/service-worker/fetch-mixed-content-to-inscope.https.html.ini delete mode 100644 testing/web-platform/mozilla/meta/service-workers/service-worker/fetch-mixed-content-to-outscope.https.html.ini diff --git a/testing/web-platform/mozilla/meta/service-workers/service-worker/fetch-mixed-content-to-inscope.https.html.ini b/testing/web-platform/mozilla/meta/service-workers/service-worker/fetch-mixed-content-to-inscope.https.html.ini deleted file mode 100644 index 0b96deb3475..00000000000 --- a/testing/web-platform/mozilla/meta/service-workers/service-worker/fetch-mixed-content-to-inscope.https.html.ini +++ /dev/null @@ -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 - diff --git a/testing/web-platform/mozilla/meta/service-workers/service-worker/fetch-mixed-content-to-outscope.https.html.ini b/testing/web-platform/mozilla/meta/service-workers/service-worker/fetch-mixed-content-to-outscope.https.html.ini deleted file mode 100644 index 03a07053e9d..00000000000 --- a/testing/web-platform/mozilla/meta/service-workers/service-worker/fetch-mixed-content-to-outscope.https.html.ini +++ /dev/null @@ -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 - diff --git a/testing/web-platform/mozilla/tests/service-workers/service-worker/resources/fetch-mixed-content-iframe.html b/testing/web-platform/mozilla/tests/service-workers/service-worker/resources/fetch-mixed-content-iframe.html index e7f468007a8..961fd2ab699 100644 --- a/testing/web-platform/mozilla/tests/service-workers/service-worker/resources/fetch-mixed-content-iframe.html +++ b/testing/web-platform/mozilla/tests/service-workers/service-worker/resources/fetch-mixed-content-iframe.html @@ -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']); }); }