mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-13 21:35:39 +00:00
Bug 1191931, Part 1 - Use tasks in the Push subscription tests. r=mt
--HG-- extra : commitid : 5Pl1YQzsI9W extra : rebase_source : d7acb5a8841fe60fa3aec5618f687da74ab0ed9a
This commit is contained in:
parent
165b9138a5
commit
f7a0799918
@ -5,7 +5,7 @@
|
|||||||
<script>
|
<script>
|
||||||
|
|
||||||
|
|
||||||
function waitOnPushMessage(pushSubscription)
|
function waitOnPushMessage()
|
||||||
{
|
{
|
||||||
var p = new Promise(function(res, rej) {
|
var p = new Promise(function(res, rej) {
|
||||||
navigator.serviceWorker.onmessage = function(e) {
|
navigator.serviceWorker.onmessage = function(e) {
|
||||||
|
@ -6,6 +6,7 @@ support-files =
|
|||||||
frame.html
|
frame.html
|
||||||
webpush.js
|
webpush.js
|
||||||
lifetime_worker.js
|
lifetime_worker.js
|
||||||
|
test_utils.js
|
||||||
|
|
||||||
[test_has_permissions.html]
|
[test_has_permissions.html]
|
||||||
skip-if = os == "android" || toolkit == "gonk"
|
skip-if = os == "android" || toolkit == "gonk"
|
||||||
|
@ -11,6 +11,7 @@ http://creativecommons.org/licenses/publicdomain/
|
|||||||
<title>Test for Bug 1185544</title>
|
<title>Test for Bug 1185544</title>
|
||||||
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
|
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
|
||||||
<script type="text/javascript" src="/tests/SimpleTest/SpawnTask.js"></script>
|
<script type="text/javascript" src="/tests/SimpleTest/SpawnTask.js"></script>
|
||||||
|
<script type="text/javascript" src="/tests/dom/push/test/test_utils.js"></script>
|
||||||
<script type="text/javascript" src="/tests/dom/push/test/webpush.js"></script>
|
<script type="text/javascript" src="/tests/dom/push/test/webpush.js"></script>
|
||||||
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
|
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
|
||||||
<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
|
<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
|
||||||
@ -25,25 +26,10 @@ http://creativecommons.org/licenses/publicdomain/
|
|||||||
|
|
||||||
<script class="testbody" type="text/javascript">
|
<script class="testbody" type="text/javascript">
|
||||||
|
|
||||||
SimpleTest.registerCleanupFunction(() =>
|
|
||||||
new Promise(resolve => SpecialPowers.popPermissions(resolve))
|
|
||||||
);
|
|
||||||
|
|
||||||
var registration;
|
var registration;
|
||||||
add_task(function* start() {
|
add_task(function* start() {
|
||||||
yield new Promise(resolve => {
|
yield setupPrefs();
|
||||||
SpecialPowers.pushPermissions([
|
yield setPushPermission(true);
|
||||||
{ type: "desktop-notification", allow: true, context: document },
|
|
||||||
], resolve);
|
|
||||||
});
|
|
||||||
yield new Promise(resolve => {
|
|
||||||
SpecialPowers.pushPrefEnv({"set": [
|
|
||||||
["dom.push.enabled", true],
|
|
||||||
["dom.serviceWorkers.exemptFromPerDomainMax", true],
|
|
||||||
["dom.serviceWorkers.enabled", true],
|
|
||||||
["dom.serviceWorkers.testing.enabled", true]
|
|
||||||
]}, resolve);
|
|
||||||
});
|
|
||||||
|
|
||||||
var url = "worker.js" + "?" + (Math.random());
|
var url = "worker.js" + "?" + (Math.random());
|
||||||
registration = yield navigator.serviceWorker.register(url, {scope: "."});
|
registration = yield navigator.serviceWorker.register(url, {scope: "."});
|
||||||
@ -51,15 +37,7 @@ http://creativecommons.org/licenses/publicdomain/
|
|||||||
|
|
||||||
var controlledFrame;
|
var controlledFrame;
|
||||||
add_task(function* createControlledIFrame() {
|
add_task(function* createControlledIFrame() {
|
||||||
yield new Promise(function(res, rej) {
|
controlledFrame = yield injectControlledFrame();
|
||||||
var iframe = document.createElement('iframe');
|
|
||||||
iframe.id = "controlledFrame";
|
|
||||||
iframe.src = "http://mochi.test:8888/tests/dom/push/test/frame.html";
|
|
||||||
|
|
||||||
iframe.onload = () => res();
|
|
||||||
controlledFrame = iframe;
|
|
||||||
document.body.appendChild(iframe);
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
var pushSubscription;
|
var pushSubscription;
|
||||||
@ -67,16 +45,6 @@ http://creativecommons.org/licenses/publicdomain/
|
|||||||
pushSubscription = yield registration.pushManager.subscribe();
|
pushSubscription = yield registration.pushManager.subscribe();
|
||||||
});
|
});
|
||||||
|
|
||||||
function sendRequestToWorker(request) {
|
|
||||||
return new Promise((resolve, reject) => {
|
|
||||||
var channel = new MessageChannel();
|
|
||||||
channel.port1.onmessage = e => {
|
|
||||||
(e.data.error ? reject : resolve)(e.data);
|
|
||||||
};
|
|
||||||
registration.active.postMessage(request, [channel.port2]);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function base64UrlDecode(s) {
|
function base64UrlDecode(s) {
|
||||||
s = s.replace(/-/g, '+').replace(/_/g, '/');
|
s = s.replace(/-/g, '+').replace(/_/g, '/');
|
||||||
|
|
||||||
@ -138,7 +106,7 @@ http://creativecommons.org/licenses/publicdomain/
|
|||||||
|
|
||||||
function waitForMessage(pushSubscription, message) {
|
function waitForMessage(pushSubscription, message) {
|
||||||
return Promise.all([
|
return Promise.all([
|
||||||
controlledFrame.contentWindow.waitOnPushMessage(pushSubscription),
|
controlledFrame.waitOnPushMessage(),
|
||||||
webpush(pushSubscription, message),
|
webpush(pushSubscription, message),
|
||||||
]).then(([message]) => message);
|
]).then(([message]) => message);
|
||||||
}
|
}
|
||||||
@ -190,11 +158,10 @@ http://creativecommons.org/licenses/publicdomain/
|
|||||||
reader.readAsText(message.data.blob);
|
reader.readAsText(message.data.blob);
|
||||||
});
|
});
|
||||||
is(text, "Hi! \ud83d\udc40", "Wrong blob data for message with emoji");
|
is(text, "Hi! \ud83d\udc40", "Wrong blob data for message with emoji");
|
||||||
is(text, "Hi! \ud83d\udc40", "Wrong blob data for message with emoji");
|
|
||||||
|
|
||||||
// Send a blank message.
|
// Send a blank message.
|
||||||
var [message] = yield Promise.all([
|
var [message] = yield Promise.all([
|
||||||
controlledFrame.contentWindow.waitOnPushMessage(pushSubscription),
|
controlledFrame.waitOnPushMessage(),
|
||||||
fetch("http://mochi.test:8888/tests/dom/push/test/push-server.sjs", {
|
fetch("http://mochi.test:8888/tests/dom/push/test/push-server.sjs", {
|
||||||
method: "PUT",
|
method: "PUT",
|
||||||
headers: {
|
headers: {
|
||||||
@ -207,8 +174,7 @@ http://creativecommons.org/licenses/publicdomain/
|
|||||||
});
|
});
|
||||||
|
|
||||||
add_task(function* unsubscribe() {
|
add_task(function* unsubscribe() {
|
||||||
controlledFrame.parentNode.removeChild(controlledFrame);
|
controlledFrame.remove();
|
||||||
controlledFrame = null;
|
|
||||||
yield pushSubscription.unsubscribe();
|
yield pushSubscription.unsubscribe();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -11,6 +11,7 @@ http://creativecommons.org/licenses/publicdomain/
|
|||||||
<title>Test for Bug 1038811</title>
|
<title>Test for Bug 1038811</title>
|
||||||
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
|
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
|
||||||
<script type="text/javascript" src="/tests/SimpleTest/SpawnTask.js"></script>
|
<script type="text/javascript" src="/tests/SimpleTest/SpawnTask.js"></script>
|
||||||
|
<script type="text/javascript" src="/tests/dom/push/test/test_utils.js"></script>
|
||||||
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
|
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
|
||||||
<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
|
<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
|
||||||
</head>
|
</head>
|
||||||
@ -30,15 +31,8 @@ http://creativecommons.org/licenses/publicdomain/
|
|||||||
|
|
||||||
var registration;
|
var registration;
|
||||||
add_task(function* start() {
|
add_task(function* start() {
|
||||||
SpecialPowers.addPermission("desktop-notification", false, document);
|
yield setupPrefs();
|
||||||
yield new Promise(resolve => {
|
yield setPushPermission(false);
|
||||||
SpecialPowers.pushPrefEnv({"set": [
|
|
||||||
["dom.push.enabled", true],
|
|
||||||
["dom.serviceWorkers.exemptFromPerDomainMax", true],
|
|
||||||
["dom.serviceWorkers.enabled", true],
|
|
||||||
["dom.serviceWorkers.testing.enabled", true]
|
|
||||||
]}, resolve);
|
|
||||||
});
|
|
||||||
|
|
||||||
var url = "worker.js" + "?" + Math.random();
|
var url = "worker.js" + "?" + Math.random();
|
||||||
registration = yield navigator.serviceWorker.register(url, {scope: "."});
|
registration = yield navigator.serviceWorker.register(url, {scope: "."});
|
||||||
@ -75,12 +69,7 @@ http://creativecommons.org/licenses/publicdomain/
|
|||||||
state: "prompt",
|
state: "prompt",
|
||||||
}];
|
}];
|
||||||
for (var test of tests) {
|
for (var test of tests) {
|
||||||
if (test.action == permissionManager.UNKNOWN_ACTION) {
|
yield setPushPermission(test.action);
|
||||||
SpecialPowers.removePermission("desktop-notification", document);
|
|
||||||
} else {
|
|
||||||
SpecialPowers.addPermission("desktop-notification",
|
|
||||||
test.action, document);
|
|
||||||
}
|
|
||||||
var state = yield registration.pushManager.permissionState();
|
var state = yield registration.pushManager.permissionState();
|
||||||
is(state, test.state, JSON.stringify(test));
|
is(state, test.state, JSON.stringify(test));
|
||||||
}
|
}
|
||||||
|
@ -10,6 +10,8 @@ http://creativecommons.org/licenses/publicdomain/
|
|||||||
<head>
|
<head>
|
||||||
<title>Test for Bug 1038811</title>
|
<title>Test for Bug 1038811</title>
|
||||||
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
|
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
|
||||||
|
<script type="text/javascript" src="/tests/SimpleTest/SpawnTask.js"></script>
|
||||||
|
<script type="text/javascript" src="/tests/dom/push/test/test_utils.js"></script>
|
||||||
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
|
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
|
||||||
<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
|
<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
|
||||||
</head>
|
</head>
|
||||||
@ -27,112 +29,53 @@ http://creativecommons.org/licenses/publicdomain/
|
|||||||
// console.log(str + "\n");
|
// console.log(str + "\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
var controlledFrame;
|
|
||||||
function createControlledIFrame(swr) {
|
|
||||||
var p = new Promise(function(res, rej) {
|
|
||||||
var iframe = document.createElement('iframe');
|
|
||||||
iframe.id = "controlledFrame";
|
|
||||||
iframe.src = "http://mochi.test:8888/tests/dom/push/test/frame.html";
|
|
||||||
|
|
||||||
iframe.onload = function() {
|
|
||||||
res(swr)
|
|
||||||
}
|
|
||||||
controlledFrame = iframe;
|
|
||||||
document.body.appendChild(iframe);
|
|
||||||
});
|
|
||||||
return p;
|
|
||||||
}
|
|
||||||
|
|
||||||
function checkPermissionState(swr) {
|
|
||||||
return swr.pushManager.permissionState().then(function(state) {
|
|
||||||
ok(state === "granted", "permissionState() should resolve to granted.");
|
|
||||||
return swr;
|
|
||||||
}).catch(function(e) {
|
|
||||||
ok(false, "permissionState() should resolve to granted.");
|
|
||||||
return swr;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function sendPushToPushServer(pushEndpoint) {
|
|
||||||
// Work around CORS for now.
|
|
||||||
var xhr = new XMLHttpRequest();
|
|
||||||
xhr.open('GET', "http://mochi.test:8888/tests/dom/push/test/push-server.sjs", true);
|
|
||||||
xhr.setRequestHeader("X-Push-Method", "PUT");
|
|
||||||
xhr.setRequestHeader("X-Push-Server", pushEndpoint);
|
|
||||||
xhr.onload = function(e) {
|
|
||||||
debug("xhr : " + this.status);
|
|
||||||
}
|
|
||||||
xhr.onerror = function(e) {
|
|
||||||
debug("xhr error: " + e);
|
|
||||||
}
|
|
||||||
xhr.send("version=24601");
|
|
||||||
}
|
|
||||||
|
|
||||||
var registration;
|
var registration;
|
||||||
|
add_task(function* start() {
|
||||||
|
yield setupPrefs();
|
||||||
|
yield setPushPermission(true);
|
||||||
|
|
||||||
function start() {
|
var url = "worker.js" + "?" + (Math.random());
|
||||||
return navigator.serviceWorker.register("worker.js" + "?" + (Math.random()), {scope: "."})
|
registration = yield navigator.serviceWorker.register(url, {scope: "."});
|
||||||
.then((swr) => registration = swr);
|
});
|
||||||
}
|
|
||||||
|
|
||||||
function unregister() {
|
var controlledFrame;
|
||||||
return registration.unregister().then(function(result) {
|
add_task(function* createControlledIFrame() {
|
||||||
ok(result, "Unregister should return true.");
|
controlledFrame = yield injectControlledFrame();
|
||||||
}, function(e) {
|
});
|
||||||
dump("Unregistering the SW failed with " + e + "\n");
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function setupPushNotification(swr) {
|
add_task(function* checkPermissionState() {
|
||||||
var p = new Promise(function(res, rej) {
|
var state = yield registration.pushManager.permissionState();
|
||||||
swr.pushManager.subscribe().then(
|
is(state, "granted", "permissionState() should resolve to granted.");
|
||||||
function(pushSubscription) {
|
});
|
||||||
ok(true, "successful registered for push notification");
|
|
||||||
res(pushSubscription);
|
|
||||||
}, function(error) {
|
|
||||||
ok(false, "could not register for push notification");
|
|
||||||
res(null);
|
|
||||||
}
|
|
||||||
);
|
|
||||||
});
|
|
||||||
return p;
|
|
||||||
}
|
|
||||||
|
|
||||||
function unregisterPushNotification(pushSubscription) {
|
var pushSubscription;
|
||||||
controlledFrame.parentNode.removeChild(controlledFrame);
|
add_task(function* setupPushNotification() {
|
||||||
controlledFrame = null;
|
pushSubscription = yield registration.pushManager.subscribe();
|
||||||
return pushSubscription.unsubscribe();
|
});
|
||||||
}
|
|
||||||
|
|
||||||
function waitForPushNotification(pushSubscription) {
|
add_task(function* waitForPushNotification() {
|
||||||
var p = controlledFrame.contentWindow.waitOnPushMessage();
|
yield Promise.all([
|
||||||
sendPushToPushServer(pushSubscription.endpoint);
|
controlledFrame.waitOnPushMessage(),
|
||||||
return p.then(function() {
|
fetch("http://mochi.test:8888/tests/dom/push/test/push-server.sjs", {
|
||||||
return pushSubscription;
|
method: "PUT",
|
||||||
});
|
headers: {
|
||||||
}
|
"X-Push-Method": "POST",
|
||||||
|
"X-Push-Server": pushSubscription.endpoint,
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
function runTest() {
|
add_task(function* unsubscribe() {
|
||||||
start()
|
controlledFrame.remove();
|
||||||
.then(createControlledIFrame)
|
yield pushSubscription.unsubscribe();
|
||||||
.then(checkPermissionState)
|
});
|
||||||
.then(setupPushNotification)
|
|
||||||
.then(waitForPushNotification)
|
add_task(function* unregister() {
|
||||||
.then(unregisterPushNotification)
|
var result = yield registration.unregister();
|
||||||
.then(unregister)
|
ok(result, "Unregister should return true.");
|
||||||
.catch(function(e) {
|
});
|
||||||
ok(false, "Some test failed with error " + e);
|
|
||||||
}).then(SimpleTest.finish);
|
|
||||||
}
|
|
||||||
|
|
||||||
SpecialPowers.pushPrefEnv({"set": [
|
|
||||||
["dom.push.enabled", true],
|
|
||||||
["dom.serviceWorkers.exemptFromPerDomainMax", true],
|
|
||||||
["dom.serviceWorkers.enabled", true],
|
|
||||||
["dom.serviceWorkers.testing.enabled", true]
|
|
||||||
]}, runTest);
|
|
||||||
SpecialPowers.addPermission("desktop-notification", true, document);
|
|
||||||
SimpleTest.waitForExplicitFinish();
|
|
||||||
</script>
|
</script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
60
dom/push/test/test_utils.js
Normal file
60
dom/push/test/test_utils.js
Normal file
@ -0,0 +1,60 @@
|
|||||||
|
// Remove permissions and prefs when the test finishes.
|
||||||
|
SimpleTest.registerCleanupFunction(() =>
|
||||||
|
new Promise(resolve => {
|
||||||
|
SpecialPowers.flushPermissions(_ => {
|
||||||
|
SpecialPowers.flushPrefEnv(resolve);
|
||||||
|
});
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
function setPushPermission(allow) {
|
||||||
|
return new Promise(resolve => {
|
||||||
|
SpecialPowers.pushPermissions([
|
||||||
|
{ type: "desktop-notification", allow, context: document },
|
||||||
|
], resolve);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function setupPrefs() {
|
||||||
|
return new Promise(resolve => {
|
||||||
|
SpecialPowers.pushPrefEnv({"set": [
|
||||||
|
["dom.push.enabled", true],
|
||||||
|
["dom.serviceWorkers.exemptFromPerDomainMax", true],
|
||||||
|
["dom.serviceWorkers.enabled", true],
|
||||||
|
["dom.serviceWorkers.testing.enabled", true]
|
||||||
|
]}, resolve);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function injectControlledFrame(target = document.body) {
|
||||||
|
return new Promise(function(res, rej) {
|
||||||
|
var iframe = document.createElement("iframe");
|
||||||
|
iframe.src = "http://mochi.test:8888/tests/dom/push/test/frame.html";
|
||||||
|
|
||||||
|
var controlledFrame = {
|
||||||
|
remove() {
|
||||||
|
target.removeChild(iframe);
|
||||||
|
iframe = null;
|
||||||
|
},
|
||||||
|
waitOnPushMessage() {
|
||||||
|
return iframe ? iframe.contentWindow.waitOnPushMessage() :
|
||||||
|
Promise.reject(new Error("Frame removed from document"));
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
iframe.onload = () => res(controlledFrame);
|
||||||
|
target.appendChild(iframe);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function sendRequestToWorker(request) {
|
||||||
|
return navigator.serviceWorker.ready.then(registration => {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
var channel = new MessageChannel();
|
||||||
|
channel.port1.onmessage = e => {
|
||||||
|
(e.data.error ? reject : resolve)(e.data);
|
||||||
|
};
|
||||||
|
registration.active.postMessage(request, [channel.port2]);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user