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 597868: Changes made by the application compatibility wizard aren't applied to extensions.ini. r=robstrong, a=blocks-betaN, uber-a=beltzner

Browse Source
This commit is contained in:
Dave Townsend 2010-09-28 10:15:42 -07:00
parent 7da8f3b402
commit 6e5069e696
4 changed files with 175 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
toolkit/mozapps/extensions/XPIProvider.jsm
View File

@ -1268,6 +1268,10 @@ var XPIProvider = {
var ww = Cc["@mozilla.org/embedcomp/window-watcher;1"].
getService(Ci.nsIWindowWatcher);
ww.openWindow(null, URI_EXTENSION_UPDATE_DIALOG, "", features, variant);
// Ensure any changes to the add-ons list are flushed to disk
XPIDatabase.writeAddonsList([]);
Services.prefs.setBoolPref(PREF_PENDING_OPERATIONS, false);
},
/**

23
toolkit/mozapps/extensions/test/addons/test_bug542391_6/install.rdf Normal file
View File

@ -0,0 +1,23 @@
<?xml version="1.0"?>
<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:em="http://www.mozilla.org/2004/em-rdf#">
<Description about="urn:mozilla:install-manifest">
<em:id>bug542391_6@tests.mozilla.org</em:id>
<em:version>1.0</em:version>
<em:updateURL>http://localhost:4444/data/test_bug542391.rdf</em:updateURL>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>2</em:maxVersion>
</Description>
</em:targetApplication>
<!-- Front End MetaData -->
<em:name>Bug 542391 Test 6</em:name>
</Description>
</RDF>

25
toolkit/mozapps/extensions/test/xpcshell/data/test_bug542391.rdf Normal file
View File

@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:em="http://www.mozilla.org/2004/em-rdf#">
<Description about="urn:mozilla:extension:bug542391_6@tests.mozilla.org">
<em:updates>
<Seq>
<li>
<Description>
<em:version>1.0</em:version>
<em:targetApplication>
<Description>
<em:id>xpcshell@tests.mozilla.org</em:id>
<em:minVersion>1</em:minVersion>
<em:maxVersion>3</em:maxVersion>
</Description>
</em:targetApplication>
</Description>
</li>
</Seq>
</em:updates>
</Description>
</RDF>

148
toolkit/mozapps/extensions/test/xpcshell/test_bug542391.js
View File

@ -37,20 +37,23 @@
* ***** END LICENSE BLOCK *****
*/
const Cc = Components.classes;
const Ci = Components.interfaces;
const Cr = Components.results;
const URI_EXTENSION_UPDATE_DIALOG = "chrome://mozapps/content/extensions/update.xul";
const PREF_EM_DISABLED_ADDONS_LIST = "extensions.disabledAddons";
const PREF_EM_SHOW_MISMATCH_UI = "extensions.showMismatchUI";
// The test extension uses an insecure update url.
Services.prefs.setBoolPref("extensions.checkUpdateSecurity", false);
do_load_httpd_js();
var testserver;
const profileDir = gProfD.clone();
profileDir.append("extensions");
var gInstallUpdate = false;
var gCheckUpdates = false;
// This will be called to show the compatiiblity update dialog.
// This will be called to show the compatibility update dialog.
var WindowWatcher = {
expected: false,
arguments: null,
@ -61,14 +64,24 @@ var WindowWatcher = {
this.expected = false;
this.arguments = arguments.QueryInterface(AM_Ci.nsIVariant);
if (!gInstallUpdate)
return;
var updated = !gCheckUpdates;
if (gCheckUpdates) {
AddonManager.getAddonByID("bug542391_6@tests.mozilla.org", function(a6) {
a6.findUpdates({
onUpdateFinished: function() {
updated = true;
}
}, AddonManager.UPDATE_WHEN_NEW_APP_INSTALLED);
});
}
// Simulate installing an update while in the dialog
var installed = false;
installAllFiles([do_get_addon("test_bug542391_3_2")], function() {
installed = true;
});
var installed = !gInstallUpdate;
if (gInstallUpdate) {
// Simulate installing an update while in the dialog
installAllFiles([do_get_addon("test_bug542391_3_2")], function() {
installed = true;
});
}
// The dialog is meant to be opened modally and the install operation can be
// asynchronous, so we must spin an event loop (like the modal window does)
@ -77,7 +90,7 @@ var WindowWatcher = {
getService(AM_Ci.nsIThreadManager).
mainThread;
while (!installed)
while (!installed || !updated)
thr.processNextEvent(false);
},
@ -103,96 +116,160 @@ registrar.registerFactory(Components.ID("{1dfeb90a-2193-45d5-9cb8-864928b2af55}"
"Fake Window Watcher",
"@mozilla.org/embedcomp/window-watcher;1", WindowWatcherFactory);
function check_state_v1([a1, a2, a3, a4, a5]) {
function check_state_v1([a1, a2, a3, a4, a5, a6]) {
do_check_neq(a1, null);
do_check_false(a1.appDisabled);
do_check_false(a1.userDisabled);
do_check_true(a1.isActive);
do_check_true(isExtensionInAddonsList(profileDir, a1.id));
do_check_neq(a2, null);
do_check_false(a2.appDisabled);
do_check_true(a2.userDisabled);
do_check_false(a2.isActive);
do_check_false(isExtensionInAddonsList(profileDir, a2.id));
do_check_neq(a3, null);
do_check_false(a3.appDisabled);
do_check_false(a3.userDisabled);
do_check_true(a3.isActive);
do_check_true(isExtensionInAddonsList(profileDir, a3.id));
do_check_eq(a3.version, "1.0");
do_check_neq(a4, null);
do_check_false(a4.appDisabled);
do_check_true(a4.userDisabled);
do_check_false(a4.isActive);
do_check_false(isExtensionInAddonsList(profileDir, a4.id));
do_check_neq(a5, null);
do_check_false(a5.appDisabled);
do_check_false(a5.userDisabled);
do_check_true(a5.isActive);
do_check_true(isExtensionInAddonsList(profileDir, a5.id));
do_check_neq(a6, null);
do_check_false(a6.appDisabled);
do_check_false(a6.userDisabled);
do_check_true(a6.isActive);
do_check_true(isExtensionInAddonsList(profileDir, a6.id));
}
function check_state_v2([a1, a2, a3, a4, a5]) {
function check_state_v2([a1, a2, a3, a4, a5, a6]) {
do_check_neq(a1, null);
do_check_true(a1.appDisabled);
do_check_false(a1.userDisabled);
do_check_false(a1.isActive);
do_check_false(isExtensionInAddonsList(profileDir, a1.id));
do_check_neq(a2, null);
do_check_false(a2.appDisabled);
do_check_true(a2.userDisabled);
do_check_false(a2.isActive);
do_check_false(isExtensionInAddonsList(profileDir, a2.id));
do_check_neq(a3, null);
do_check_false(a3.appDisabled);
do_check_false(a3.userDisabled);
do_check_true(a3.isActive);
do_check_true(isExtensionInAddonsList(profileDir, a3.id));
do_check_eq(a3.version, "1.0");
do_check_neq(a4, null);
do_check_false(a4.appDisabled);
do_check_true(a4.userDisabled);
do_check_false(a4.isActive);
do_check_false(isExtensionInAddonsList(profileDir, a4.id));
do_check_neq(a5, null);
do_check_false(a5.appDisabled);
do_check_false(a5.userDisabled);
do_check_true(a5.isActive);
do_check_true(isExtensionInAddonsList(profileDir, a5.id));
do_check_neq(a6, null);
do_check_false(a6.appDisabled);
do_check_false(a6.userDisabled);
do_check_true(a6.isActive);
do_check_true(isExtensionInAddonsList(profileDir, a6.id));
}
function check_state_v3([a1, a2, a3, a4, a5]) {
function check_state_v3([a1, a2, a3, a4, a5, a6]) {
do_check_neq(a1, null);
do_check_true(a1.appDisabled);
do_check_false(a1.userDisabled);
do_check_false(a1.isActive);
do_check_false(isExtensionInAddonsList(profileDir, a1.id));
do_check_neq(a2, null);
do_check_true(a2.appDisabled);
do_check_true(a2.userDisabled);
do_check_false(a2.isActive);
do_check_false(isExtensionInAddonsList(profileDir, a2.id));
do_check_neq(a3, null);
do_check_true(a3.appDisabled);
do_check_false(a3.userDisabled);
do_check_false(a3.isActive);
do_check_false(isExtensionInAddonsList(profileDir, a3.id));
do_check_eq(a3.version, "1.0");
do_check_neq(a4, null);
do_check_false(a4.appDisabled);
do_check_true(a4.userDisabled);
do_check_false(a4.isActive);
do_check_false(isExtensionInAddonsList(profileDir, a4.id));
do_check_neq(a5, null);
do_check_false(a5.appDisabled);
do_check_false(a5.userDisabled);
do_check_true(a5.isActive);
do_check_true(isExtensionInAddonsList(profileDir, a5.id));
do_check_neq(a6, null);
do_check_false(a6.appDisabled);
do_check_false(a6.userDisabled);
do_check_true(a6.isActive);
do_check_true(isExtensionInAddonsList(profileDir, a6.id));
}
function check_state_v3_2([a1, a2, a3, a4, a5]) {
function check_state_v3_2([a1, a2, a3, a4, a5, a6]) {
do_check_neq(a1, null);
do_check_true(a1.appDisabled);
do_check_false(a1.userDisabled);
do_check_false(a1.isActive);
do_check_false(isExtensionInAddonsList(profileDir, a1.id));
do_check_neq(a2, null);
do_check_true(a2.appDisabled);
do_check_true(a2.userDisabled);
do_check_false(a2.isActive);
do_check_false(isExtensionInAddonsList(profileDir, a2.id));
do_check_neq(a3, null);
do_check_false(a3.appDisabled);
do_check_false(a3.userDisabled);
do_check_true(a3.isActive);
do_check_true(isExtensionInAddonsList(profileDir, a3.id));
do_check_eq(a3.version, "2.0");
do_check_neq(a4, null);
do_check_false(a4.appDisabled);
do_check_true(a4.userDisabled);
do_check_false(a4.isActive);
do_check_false(isExtensionInAddonsList(profileDir, a4.id));
do_check_neq(a5, null);
do_check_false(a5.appDisabled);
do_check_false(a5.userDisabled);
do_check_true(a5.isActive);
do_check_true(isExtensionInAddonsList(profileDir, a5.id));
do_check_neq(a6, null);
do_check_false(a6.appDisabled);
do_check_false(a6.userDisabled);
do_check_true(a6.isActive);
do_check_true(isExtensionInAddonsList(profileDir, a6.id));
}
// Install all the test add-ons, disable two of them and "upgrade" the app to
@ -216,6 +293,12 @@ function run_test() {
name: "Test Addon 1",
}, profileDir);
// Create and configure the HTTP server.
testserver = new nsHttpServer();
testserver.registerDirectory("/data/", do_get_file("data"));
testserver.registerDirectory("/addons/", do_get_file("addons"));
testserver.start(4444);
startupManager();
dest.remove(true);
@ -224,7 +307,8 @@ function run_test() {
do_get_addon("test_bug542391_2"),
do_get_addon("test_bug542391_3_1"),
do_get_addon("test_bug542391_4"),
do_get_addon("test_bug542391_5")], function() {
do_get_addon("test_bug542391_5"),
do_get_addon("test_bug542391_6")], function() {
restartManager();
@ -239,7 +323,8 @@ function run_test() {
"bug542391_2@tests.mozilla.org",
"bug542391_3@tests.mozilla.org",
"bug542391_4@tests.mozilla.org",
"bug542391_5@tests.mozilla.org"],
"bug542391_5@tests.mozilla.org",
"bug542391_6@tests.mozilla.org"],
function(addons) {
check_state_v1(addons);
@ -251,7 +336,8 @@ function run_test() {
"bug542391_2@tests.mozilla.org",
"bug542391_3@tests.mozilla.org",
"bug542391_4@tests.mozilla.org",
"bug542391_5@tests.mozilla.org"],
"bug542391_5@tests.mozilla.org",
"bug542391_6@tests.mozilla.org"],
function(addons) {
check_state_v2(addons);
@ -262,18 +348,25 @@ function run_test() {
});
}
function end_test() {
testserver.stop(do_test_finished);
}
// Upgrade to version 3 which will appDisable two more add-ons. Check that the
// 3 already disabled add-ons were passed to the mismatch dialog.
function run_test_1() {
gCheckUpdates = true;
WindowWatcher.expected = true;
restartManager("3");
do_check_false(WindowWatcher.expected);
gCheckUpdates = false;
AddonManager.getAddonsByIDs(["bug542391_1@tests.mozilla.org",
"bug542391_2@tests.mozilla.org",
"bug542391_3@tests.mozilla.org",
"bug542391_4@tests.mozilla.org",
"bug542391_5@tests.mozilla.org"],
"bug542391_5@tests.mozilla.org",
"bug542391_6@tests.mozilla.org"],
function(addons) {
check_state_v3(addons);
@ -297,7 +390,8 @@ function run_test_2() {
"bug542391_2@tests.mozilla.org",
"bug542391_3@tests.mozilla.org",
"bug542391_4@tests.mozilla.org",
"bug542391_5@tests.mozilla.org"],
"bug542391_5@tests.mozilla.org",
"bug542391_6@tests.mozilla.org"],
function(addons) {
check_state_v2(addons);
@ -321,7 +415,8 @@ function run_test_3() {
"bug542391_2@tests.mozilla.org",
"bug542391_3@tests.mozilla.org",
"bug542391_4@tests.mozilla.org",
"bug542391_5@tests.mozilla.org"],
"bug542391_5@tests.mozilla.org",
"bug542391_6@tests.mozilla.org"],
function(addons) {
check_state_v3(addons);
@ -347,7 +442,8 @@ function run_test_4() {
"bug542391_2@tests.mozilla.org",
"bug542391_3@tests.mozilla.org",
"bug542391_4@tests.mozilla.org",
"bug542391_5@tests.mozilla.org"],
"bug542391_5@tests.mozilla.org",
"bug542391_6@tests.mozilla.org"],
function(addons) {
check_state_v2(addons);
@ -371,12 +467,14 @@ function run_test_5() {
WindowWatcher.expected = true;
restartManager("3");
do_check_false(WindowWatcher.expected);
gInstallUpdate = false;
AddonManager.getAddonsByIDs(["bug542391_1@tests.mozilla.org",
"bug542391_2@tests.mozilla.org",
"bug542391_3@tests.mozilla.org",
"bug542391_4@tests.mozilla.org",
"bug542391_5@tests.mozilla.org"],
"bug542391_5@tests.mozilla.org",
"bug542391_6@tests.mozilla.org"],
function(addons) {
check_state_v3_2(addons);