wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1059194 - Trusted Hosted Apps, part 3: Basic app install tests r=myk

Browse Source
This commit is contained in:
Fabrice Desré 2014-09-16 13:14:02 -07:00
parent 6f2a9765c1
commit f7d1cba01a
7 changed files with 149 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dom/apps/tests/file_app.sjs
View File

@ -1,5 +1,6 @@
var gBasePath = "tests/dom/apps/tests/";
var gAppTemplatePath = "tests/dom/apps/tests/file_app.template.html";
var gScriptTemplatePath = "tests/dom/apps/tests/file_script.template.js";
var gAppcacheTemplatePath = "tests/dom/apps/tests/file_cached_app.template.appcache";
var gWidgetTemplatePath = "tests/dom/apps/tests/file_widget_app.template.html";
var gDefaultIcon = "default_icon";
@ -13,8 +14,9 @@ function makeResource(templatePath, version, apptype, role) {
// Hack - This is necessary to make the tests pass, but hbambas says it
// shouldn't be necessary. Comment it out and watch the tests fail.
if (templatePath == gAppTemplatePath && apptype == 'cached') {
res = res.replace('<html>', '<html manifest="file_app.sjs?apptype=cached&getappcache=true">');
if (templatePath == gAppTemplatePath &&
(apptype == 'cached' || apptype == 'trusted')) {
res = res.replace('<html>', '<html manifest="file_app.sjs?apptype=' + apptype + '&getappcache=true">');
}
return res;
}
@ -47,7 +49,7 @@ function handleRequest(request, response) {
// Get the app type.
var apptype = query.apptype;
if (apptype != 'hosted' && apptype != 'cached' && apptype != 'widget' && apptype != 'invalidWidget')
if (apptype != 'hosted' && apptype != 'cached' && apptype != 'widget' && apptype != 'invalidWidget' && apptype != 'trusted')
throw "Invalid app type: " + apptype;
var role = query.role;
@ -58,7 +60,7 @@ function handleRequest(request, response) {
dump("Server Etag: " + etag + "\n");
if (etagMatches(request, etag)) {
dump("Etags Match. Sending 304\n");
dump("Etags Match. Sending 304 for " + request.queryString + "\n");
response.setStatusLine(request.httpVersion, "304", "Not Modified");
return;
}
@ -69,6 +71,13 @@ function handleRequest(request, response) {
else
dump("No Client Etag\n");
// Check if we ask for the js script used in file_app.template.html
if ("script" in query) {
dump("Sending script for " + request.queryString + "\n");
response.write(makeResource(gScriptTemplatePath, version, apptype, role));
return;
}
// Check if we're generating a webapp manifest.
if ('getmanifest' in query) {
var template = gBasePath + 'file_' + apptype + '_app.template.webapp';
@ -81,7 +90,8 @@ function handleRequest(request, response) {
//
// NB: Among other reasons, we use the same sjs file here so that the version
// state is shared.
if (apptype == 'cached' && 'getappcache' in query) {
if ((apptype == 'cached' || apptype == 'trusted') &&
'getappcache' in query) {
response.setHeader("Content-Type", "text/cache-manifest", false);
response.write(makeResource(gAppcacheTemplatePath, version, apptype, role));
return;

66
dom/apps/tests/file_app.template.html
View File

@ -1,67 +1,7 @@
<html>
<head>
<script>
function sendMessage(msg) {
alert(msg);
}
function ok(p, msg) {
if (p)
sendMessage("OK: " + msg);
else
sendMessage("KO: " + msg);
}
function is(a, b, msg) {
if (a == b)
sendMessage("OK: " + a + " == " + b + " - " + msg);
else
sendMessage("KO: " + a + " != " + b + " - " + msg);
}
function installed(p) {
if (p)
sendMessage("IS_INSTALLED");
else
sendMessage("NOT_INSTALLED");
}
function finish() {
sendMessage("VERSION: MyWebApp vVERSIONTOKEN");
sendMessage("DONE");
}
function cbError() {
ok(false, "Error callback invoked");
finish();
}
function go() {
ok(true, "Launched app");
var request = window.navigator.mozApps.getSelf();
request.onsuccess = function() {
var app = request.result;
checkApp(app);
}
request.onerror = cbError;
}
function checkApp(app) {
// If the app is installed, |app| will be non-null. If it is, verify its state.
installed(!!app);
if (app) {
var appName = "Really Rapid Release (APPTYPETOKEN)";
var manifest = SpecialPowers.wrap(app.manifest);
is(manifest.name, appName, "Manifest name should be correct");
is(app.origin, "http://test", "App origin should be correct");
is(app.installOrigin, "http://mochi.test:8888", "Install origin should be correct");
}
finish();
}
</script>
<script src="file_app.sjs?script=true&version=VERSIONTOKEN&apptype=APPTYPETOKEN"></script>
</head>
<body onload="go();">
App Body. Version: VERSIONTOKEN
<body>
App Body. Version: VERSIONTOKEN, Type: APPTYPETOKEN
</body></html>

3
dom/apps/tests/file_cached_app.template.appcache
View File

@ -1,3 +1,4 @@
CACHE MANIFEST
# Version VERSIONTOKEN
/tests/dom/apps/tests/file_app.sjs?apptype=cached
/tests/dom/apps/tests/file_app.sjs?apptype=APPTYPETOKEN
/tests/dom/apps/tests/file_app.sjs?script=true&version=VERSIONTOKEN&apptype=APPTYPETOKEN

59
dom/apps/tests/file_script.template.js Normal file
View File

@ -0,0 +1,59 @@
function sendMessage(msg) {
alert(msg);
}
function ok(p, msg) {
if (p)
sendMessage("OK: " + msg);
else
sendMessage("KO: " + msg);
}
function is(a, b, msg) {
if (a == b)
sendMessage("OK: " + a + " == " + b + " - " + msg);
else
sendMessage("KO: " + a + " != " + b + " - " + msg);
}
function installed(p) {
if (p)
sendMessage("IS_INSTALLED");
else
sendMessage("NOT_INSTALLED");
}
function finish() {
sendMessage("VERSION: MyWebApp vVERSIONTOKEN");
sendMessage("DONE");
}
function cbError() {
ok(false, "Error callback invoked");
finish();
}
function go() {
ok(true, "Launched APPTYPETOKEN app");
var request = window.navigator.mozApps.getSelf();
request.onsuccess = function() {
var app = request.result;
checkApp(app);
}
request.onerror = cbError;
}
function checkApp(app) {
// If the app is installed, |app| will be non-null. If it is, verify its state.
installed(!!app);
if (app) {
var appName = "Really Rapid Release (APPTYPETOKEN)";
var manifest = SpecialPowers.wrap(app.manifest);
is(manifest.name, appName, "Manifest name should be correct");
is(app.origin, "http://test", "App origin should be correct");
is(app.installOrigin, "http://mochi.test:8888", "Install origin should be correct");
}
finish();
}
go();

10
dom/apps/tests/file_trusted_app.template.webapp Normal file
View File

@ -0,0 +1,10 @@
{
"type": "trusted",
"name": "Really Rapid Release (trusted)",
"description": "Updated even faster than <a href='http://mozilla.org'>Firefox</a>, just to annoy slashdotters.",
"launch_path": "/tests/dom/apps/tests/file_app.sjs?apptype=trusted",
"icons": {
"128": "ICONTOKEN"
},
"role": "ROLE"
}

2
dom/apps/tests/mochitest.ini
View File

@ -4,9 +4,11 @@ support-files =
chromeAddCert.js
file_app.sjs
file_app.template.html
file_script.template.js
file_cached_app.template.appcache
file_cached_app.template.webapp
file_hosted_app.template.webapp
file_trusted_app.template.webapp
file_invalidWidget_app.template.webapp
file_packaged_app.sjs
file_packaged_app.template.html

61
dom/apps/tests/test_app_update.html
View File

@ -17,14 +17,24 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=826058
var gBaseURL = 'http://test/tests/dom/apps/tests/';
var gHostedManifestURL = gBaseURL + 'file_app.sjs?apptype=hosted&getmanifest=true';
var gCachedManifestURL = gBaseURL + 'file_app.sjs?apptype=cached&getmanifest=true';
var gTrustedManifestURL = gBaseURL + 'file_app.sjs?apptype=trusted&getmanifest=true';
var gGenerator = runTest();
// We need to set the trusted hosted app csp pref since it's only in
// b2g.js for now.
function setCSPPrefs() {
SpecialPowers.pushPrefEnv({'set':
[["security.apps.trusted.CSP.default",
"default-src *; object-src 'none'"]]},
function() { gGenerator.next(); });
}
function go() {
SpecialPowers.pushPermissions(
[{ "type": "browser", "allow": 1, "context": document },
{ "type": "embed-apps", "allow": 1, "context": document },
{ "type": "webapps-manage", "allow": 1, "context": document }],
function() { gGenerator.next() });
setCSPPrefs);
}
function continueTest() {
@ -159,7 +169,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=826058
app.ondownloaderror = mozAppsError;
yield undefined;
}
is(app.installState, "installed", "App is installed");
is(app.installState, "installed", "Cached app is installed");
// Check the cached app.
checkAppState(app, true, 3, continueTest);
@ -179,12 +189,57 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=826058
todo(app.lastUpdateCheck > lastCheck, "lastUpdateCheck updated appropriately");
// Uninstall the hosted app.
request = navigator.mozApps.mgmt.uninstall(app);
request.onerror = mozAppsError;
request.onsuccess = continueTest;
yield undefined;
info("Uninstalled hosted appcache app");
// Install the trusted app.
setAppVersion(4, continueTest);
yield undefined;
ok(true, "Installing trusted app");
var request = navigator.mozApps.install(gTrustedManifestURL);
request.onerror = mozAppsError;
request.onsuccess = continueTest;
yield undefined;
var app = request.result;
ok(app, "App is non-null");
if (app.installState == "pending") {
ok(true, "App is pending. Waiting for progress");
app.onprogress = function() ok(true, "Got download progress");
app.ondownloadsuccess = continueTest;
app.ondownloaderror = mozAppsError;
yield undefined;
}
is(app.installState, "installed", "Trusted App is installed");
is(app.manifest.type, "trusted", "App is trusted");
// Check the cached app.
checkAppState(app, true, 4, continueTest);
yield undefined;
// Check for updates. The current infrastructure always returns a new appcache
// manifest, so there should always be an update.
var lastCheck = app.lastUpdateCheck;
ok(true, "Setting callbacks");
app.ondownloadapplied = function() ok(true, "downloadapplied fired.");
app.ondownloadavailable = function() ok(false, "downloadavailable fired");
ok(true, "Checking for updates");
var request = app.checkForUpdate();
request.onerror = mozAppsError;
request.onsuccess = continueTest;
yield undefined;
todo(app.lastUpdateCheck > lastCheck, "lastUpdateCheck updated appropriately");
// Uninstall the app.
request = navigator.mozApps.mgmt.uninstall(app);
request.onerror = mozAppsError;
request.onsuccess = continueTest;
yield undefined;
info("Uninstalled app");
info("Uninstalled trusted app");
}
function setAppVersion(version, cb) {