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 1035282 - Make Webapps.jsm throw DUPLICATE_ORIGIN only if the app with the same origin is natively installed. r=fabrice,myk

Browse Source 
--HG--
rename : toolkit/webapps/tests/test_custom_origin.xul => toolkit/webapps/tests/test_custom_origin_uninstall_install.xul
This commit is contained in:
Marco Castelluccio 2014-07-15 03:53:48 +02:00
parent 56654a8755
commit 5a36744135
4 changed files with 178 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dom/apps/src/Webapps.jsm
View File

@ -3399,12 +3399,20 @@ this.DOMApplicationRegistry = {
debug("Setting origin to " + uri.prePath +
" for " + aOldApp.manifestURL);
let newId = uri.prePath.substring(6); // "app://".length
if (newId in this.webapps) {
if (newId in this.webapps && this._isLaunchable(this.webapps[newId])) {
throw "DUPLICATE_ORIGIN";
}
aOldApp.origin = uri.prePath;
// Update the registry.
let oldId = aOldApp.id;
if (oldId == newId) {
// This could happen when we have an app in the registry
// that is not launchable. Since the app already has
// the correct id, we don't need to change it.
return;
}
aOldApp.id = newId;
this.webapps[newId] = aOldApp;
delete this.webapps[oldId];

2
toolkit/webapps/tests/chrome.ini
View File

@ -7,6 +7,8 @@ support-files =
[test_custom_origin.xul]
skip-if = asan
[test_custom_origin_uninstall_install.xul]
skip-if = asan
[test_install_appcache.xul]
skip-if = asan
[test_hosted.xul]

4
toolkit/webapps/tests/test_custom_origin.xul
View File

@ -80,7 +80,7 @@ let runTest = Task.async(function*() {
confirmNextInstall();
let request = navigator.mozApps.installPackage("http://test/chrome/toolkit/webapps/tests/data/custom_origin.webapp");
let request = navigator.mozApps.installPackage(app.manifestURL);
let (deferred = Promise.defer()) {
request.onerror = function() {
@ -95,7 +95,7 @@ let runTest = Task.async(function*() {
let (deferred = Promise.defer()) {
appObject.ondownloaderror = function() {
deferred.reject(this.error.name);
deferred.reject(appObject.downloadError.name);
};
appObject.ondownloadapplied = deferred.resolve;
yield deferred.promise;

165
toolkit/webapps/tests/test_custom_origin_uninstall_install.xul Normal file
View File

@ -0,0 +1,165 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/css" href="chrome://global/skin"?>
<?xml-stylesheet type="text/css" href="/tests/SimpleTest/test.css"?>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=1035282
-->
<window title="Mozilla Bug 1035282"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script type="application/javascript"
src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
<script type="application/javascript"
src="chrome://mochikit/content/chrome-harness.js"></script>
<script type="application/javascript" src="head.js"/>
<!-- test results are displayed in the html:body -->
<body xmlns="http://www.w3.org/1999/xhtml">
<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1035282"
target="_blank">Mozilla Bug 1035282</a>
</body>
<script type="application/javascript">
<![CDATA[
/** Test for Bug 1035282 **/
"use strict";
SimpleTest.waitForExplicitFinish();
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/NativeApp.jsm");
Cu.import("resource://gre/modules/WebappOSUtils.jsm");
Cu.import("resource://gre/modules/Promise.jsm");
let runTest = Task.async(function*() {
let manifest = yield readJSON(getTestFilePath("data/custom_origin.webapp"));
let app = {
name: manifest.name,
manifestURL: "http://test/chrome/toolkit/webapps/tests/data/custom_origin.webapp",
origin: "app://test.origin.privileged.app",
};
let testAppInfo = new TestAppInfo(app, true);
// Get to a clean state before the test
yield testAppInfo.cleanup();
SimpleTest.registerCleanupFunction(() => testAppInfo.cleanup());
setDryRunPref();
// Use the test root certificate for the test
Cu.import("resource://gre/modules/StoreTrustAnchor.jsm");
let oldIndex = TrustedRootCertificate.index;
TrustedRootCertificate.index = Ci.nsIX509CertDB.AppXPCShellRoot;
SimpleTest.registerCleanupFunction(function() {
TrustedRootCertificate.index = oldIndex;
});
// Allow signed apps to be installed from the test origin
let oldSignedAppOrigins;
try {
oldSignedAppOrigins = Services.prefs.getCharPref("dom.mozApps.signed_apps_installable_from");
} catch (ex) {}
let newSignedAppOrigins = oldSignedAppOrigins.concat(",chrome://mochitests");
Services.prefs.setCharPref("dom.mozApps.signed_apps_installable_from", newSignedAppOrigins);
SimpleTest.registerCleanupFunction(function() {
Services.prefs.setCharPref("dom.mozApps.signed_apps_installable_from", oldSignedAppOrigins);
});
// On Mac build servers, we don't have enough privileges to write to /Applications,
// so we install apps in a user-owned directory.
if (MAC) {
yield setMacRootInstallDir(OS.Path.join(OS.Constants.Path.homeDir, "Applications"));
}
confirmNextInstall();
let (request = navigator.mozApps.installPackage(app.manifestURL)) {
let (deferred = Promise.defer()) {
request.onerror = function() {
deferred.reject(this.error.name);
};
request.onsuccess = deferred.resolve;
yield deferred.promise;
}
let appObject = request.result;
ok(appObject, "app is non-null");
let (deferred = Promise.defer()) {
appObject.ondownloaderror = function() {
deferred.reject(appObject.downloadError.name);
};
appObject.ondownloadapplied = deferred.resolve;
yield deferred.promise;
};
};
while (!WebappOSUtils.isLaunchable(app)) {
yield wait(1000);
}
ok(true, "App launchable");
yield WebappOSUtils.uninstall(app)
is(WebappOSUtils.launch(app), false, "Launch fails");
confirmNextInstall();
let (request = navigator.mozApps.installPackage(app.manifestURL)) {
let (deferred = Promise.defer()) {
request.onerror = function() {
deferred.reject(this.error.name);
};
request.onsuccess = deferred.resolve;
yield deferred.promise;
}
let appObject = request.result;
ok(appObject, "app is non-null");
let (deferred = Promise.defer()) {
appObject.ondownloaderror = function() {
deferred.reject(appObject.downloadError.name);
};
appObject.ondownloadapplied = deferred.resolve;
yield deferred.promise;
};
};
while (!WebappOSUtils.isLaunchable(app)) {
yield wait(1000);
}
ok(true, "App launchable");
let exeFile = getFile(testAppInfo.exePath);
ok(exeFile.isExecutable(), "webapprt executable is executable");
let appClosed = false;
testAppInfo.appProcess.init(exeFile)
testAppInfo.appProcess.runAsync([], 0, () => appClosed = true);
while (!(yield wasAppSJSAccessed()) && !appClosed) {
yield wait(1000);
}
ok(!appClosed, "App was launched and is still running");
SimpleTest.finish();
});
runTest().catch((e) => {
ok(false, "Error during test: " + e);
SimpleTest.finish();
});
]]>
</script>
</window>