Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-23 21:17:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 677646 - Install Add-on from file no longer works. r=dtownsend

Browse Source
This commit is contained in:
Blair McBride 2011-08-16 18:16:37 +12:00
parent 6be5d3f249
commit 5ddae03ee0
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
toolkit/mozapps/extensions/content/extensions.js
View File

@ -1106,7 +1106,7 @@ var gViewController = {
if (installs.length > 0) {
// Display the normal install confirmation for the installs
AddonManager.installAddonsFromWebpage("application/x-xpinstall",
this, null, installs);
window, null, installs);
}
return;
}

18
toolkit/mozapps/extensions/test/browser/browser_bug567127.js
View File

@ -9,6 +9,7 @@ var gFilePickerFiles = [];
var gMockFilePickerFactory;
var gMockFilePickerFactoryCID;
var gManagerWindow;
var gSawInstallNotification = false;
function MockFilePicker() { }
@ -97,6 +98,16 @@ WindowOpenListener.prototype = {
};
var gInstallNotificationObserver = {
observe: function(aSubject, aTopic, aData) {
var installInfo = aSubject.QueryInterface(Ci.amIWebInstallInfo);
isnot(installInfo.originatingWindow, null, "Notification should have non-null originatingWindow");
gSawInstallNotification = true;
Services.obs.removeObserver(this, "addon-install-started");
}
};
function test_confirmation(aWindow, aExpectedURLs) {
var list = aWindow.document.getElementById("itemList");
is(list.childNodes.length, aExpectedURLs.length, "Should be the right number of installs");
@ -135,6 +146,8 @@ function test() {
}
function end_test() {
is(gSawInstallNotification, true, "Should have seen addon-install-started notification.");
var compReg = Components.manager.QueryInterface(Components.interfaces.nsIComponentRegistrar);
compReg.unregisterFactory(gMockFilePickerFactoryCID,
gMockFilePickerFactory);
@ -151,9 +164,12 @@ add_test(function() {
];
gFilePickerFiles = filePaths.map(function(aPath) aPath.file);
Services.obs.addObserver(gInstallNotificationObserver,
"addon-install-started", false);
new WindowOpenListener(INSTALL_URI, function(aWindow) {
test_confirmation(aWindow, filePaths.map(function(aPath) aPath.spec));
}, run_next_test);
gManagerWindow.gViewController.doCommand("cmd_installFromFile");
});