mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-20 00:35:44 +00:00
Bug 1600864 - Remove legacy aboutDialog-appUpdater.js implementation r=bytesized
This patch reverts the relevant parts of D54837 Differential Revision: https://phabricator.services.mozilla.com/D55612
This commit is contained in:
Drew Willcoxon
parent
78ec00ea9e
commit
5a0de3ee53
@ -1,507 +0,0 @@
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
// Note: this file is included in aboutDialog.xhtml and preferences/advanced.xhtml
|
||||
// if MOZ_UPDATER is defined.
|
||||
|
||||
/* import-globals-from aboutDialog.js */
|
||||
|
||||
const PREF_APP_UPDATE_CANCELATIONS_OSX = "app.update.cancelations.osx";
|
||||
const PREF_APP_UPDATE_ELEVATE_NEVER = "app.update.elevate.never";
|
||||
|
||||
function onUnload(aEvent) {
|
||||
if (gAppUpdater) {
|
||||
if (gAppUpdater.isChecking) {
|
||||
gAppUpdater.checker.stopCurrentCheck();
|
||||
}
|
||||
// Safe to call even when there isn't a download in progress.
|
||||
gAppUpdater.removeDownloadListener();
|
||||
gAppUpdater = null;
|
||||
}
|
||||
}
|
||||
|
||||
function appUpdater(options = {}) {
|
||||
XPCOMUtils.defineLazyServiceGetter(
|
||||
this,
|
||||
"aus",
|
||||
"@mozilla.org/updates/update-service;1",
|
||||
"nsIApplicationUpdateService"
|
||||
);
|
||||
XPCOMUtils.defineLazyServiceGetter(
|
||||
this,
|
||||
"checker",
|
||||
"@mozilla.org/updates/update-checker;1",
|
||||
"nsIUpdateChecker"
|
||||
);
|
||||
XPCOMUtils.defineLazyServiceGetter(
|
||||
this,
|
||||
"um",
|
||||
"@mozilla.org/updates/update-manager;1",
|
||||
"nsIUpdateManager"
|
||||
);
|
||||
|
||||
this.options = options;
|
||||
this.updateDeck = document.getElementById("updateDeck");
|
||||
this.promiseAutoUpdateSetting = null;
|
||||
|
||||
this.bundle = Services.strings.createBundle(
|
||||
"chrome://browser/locale/browser.properties"
|
||||
);
|
||||
|
||||
let manualURL = Services.urlFormatter.formatURLPref("app.update.url.manual");
|
||||
let manualLink = document.getElementById("manualLink");
|
||||
manualLink.textContent = manualURL;
|
||||
manualLink.href = manualURL;
|
||||
document.getElementById("failedLink").href = manualURL;
|
||||
|
||||
if (this.updateDisabledByPolicy) {
|
||||
this.selectPanel("policyDisabled");
|
||||
return;
|
||||
}
|
||||
|
||||
if (this.isReadyForRestart) {
|
||||
this.selectPanel("apply");
|
||||
return;
|
||||
}
|
||||
|
||||
if (this.aus.isOtherInstanceHandlingUpdates) {
|
||||
this.selectPanel("otherInstanceHandlingUpdates");
|
||||
return;
|
||||
}
|
||||
|
||||
if (this.isDownloading) {
|
||||
this.startDownload();
|
||||
// selectPanel("downloading") is called from setupDownloadingUI().
|
||||
return;
|
||||
}
|
||||
|
||||
if (this.isStaging) {
|
||||
this.waitForUpdateToStage();
|
||||
// selectPanel("applying"); is called from waitForUpdateToStage().
|
||||
return;
|
||||
}
|
||||
|
||||
// We might need this value later, so start loading it from the disk now.
|
||||
this.promiseAutoUpdateSetting = UpdateUtils.getAppUpdateAutoEnabled();
|
||||
|
||||
// That leaves the options
|
||||
// "Check for updates, but let me choose whether to install them", and
|
||||
// "Automatically install updates".
|
||||
// In both cases, we check for updates without asking.
|
||||
// In the "let me choose" case, we ask before downloading though, in onCheckComplete.
|
||||
this.checkForUpdates();
|
||||
}
|
||||
|
||||
appUpdater.prototype = {
|
||||
// true when there is an update check in progress.
|
||||
isChecking: false,
|
||||
|
||||
// true when there is an update ready to be applied on restart or staged.
|
||||
get isPending() {
|
||||
if (this.update) {
|
||||
return (
|
||||
this.update.state == "pending" ||
|
||||
this.update.state == "pending-service" ||
|
||||
this.update.state == "pending-elevate"
|
||||
);
|
||||
}
|
||||
return (
|
||||
this.um.activeUpdate &&
|
||||
(this.um.activeUpdate.state == "pending" ||
|
||||
this.um.activeUpdate.state == "pending-service" ||
|
||||
this.um.activeUpdate.state == "pending-elevate")
|
||||
);
|
||||
},
|
||||
|
||||
// true when there is an update already staged.
|
||||
get isApplied() {
|
||||
if (this.update) {
|
||||
return (
|
||||
this.update.state == "applied" || this.update.state == "applied-service"
|
||||
);
|
||||
}
|
||||
return (
|
||||
this.um.activeUpdate &&
|
||||
(this.um.activeUpdate.state == "applied" ||
|
||||
this.um.activeUpdate.state == "applied-service")
|
||||
);
|
||||
},
|
||||
|
||||
get isStaging() {
|
||||
if (!this.updateStagingEnabled) {
|
||||
return false;
|
||||
}
|
||||
let errorCode;
|
||||
if (this.update) {
|
||||
errorCode = this.update.errorCode;
|
||||
} else if (this.um.activeUpdate) {
|
||||
errorCode = this.um.activeUpdate.errorCode;
|
||||
}
|
||||
// If the state is pending and the error code is not 0, staging must have
|
||||
// failed.
|
||||
return this.isPending && errorCode == 0;
|
||||
},
|
||||
|
||||
// true when an update ready to restart to finish the update process.
|
||||
get isReadyForRestart() {
|
||||
if (this.updateStagingEnabled) {
|
||||
let errorCode;
|
||||
if (this.update) {
|
||||
errorCode = this.update.errorCode;
|
||||
} else if (this.um.activeUpdate) {
|
||||
errorCode = this.um.activeUpdate.errorCode;
|
||||
}
|
||||
// If the state is pending and the error code is not 0, staging must have
|
||||
// failed and Firefox should be restarted to try to apply the update
|
||||
// without staging.
|
||||
return this.isApplied || (this.isPending && errorCode != 0);
|
||||
}
|
||||
return this.isPending;
|
||||
},
|
||||
|
||||
// true when there is an update download in progress.
|
||||
get isDownloading() {
|
||||
if (this.update) {
|
||||
return this.update.state == "downloading";
|
||||
}
|
||||
return this.um.activeUpdate && this.um.activeUpdate.state == "downloading";
|
||||
},
|
||||
|
||||
// true when updating has been disabled by enterprise policy
|
||||
get updateDisabledByPolicy() {
|
||||
return Services.policies && !Services.policies.isAllowed("appUpdate");
|
||||
},
|
||||
|
||||
// true when updating in background is enabled.
|
||||
get updateStagingEnabled() {
|
||||
return !this.updateDisabledByPolicy && this.aus.canStageUpdates;
|
||||
},
|
||||
|
||||
/**
|
||||
* Sets the panel of the updateDeck.
|
||||
*
|
||||
* @param aChildID
|
||||
* The id of the deck's child to select, e.g. "apply".
|
||||
*/
|
||||
selectPanel(aChildID) {
|
||||
let panel = document.getElementById(aChildID);
|
||||
|
||||
let button = panel.querySelector("button");
|
||||
if (button) {
|
||||
if (aChildID == "downloadAndInstall") {
|
||||
let updateVersion = gAppUpdater.update.displayVersion;
|
||||
// Include the build ID if this is an "a#" (nightly or aurora) build
|
||||
if (/a\d+$/.test(updateVersion)) {
|
||||
let buildID = gAppUpdater.update.buildID;
|
||||
let year = buildID.slice(0, 4);
|
||||
let month = buildID.slice(4, 6);
|
||||
let day = buildID.slice(6, 8);
|
||||
updateVersion += ` (${year}-${month}-${day})`;
|
||||
}
|
||||
button.label = this.bundle.formatStringFromName(
|
||||
"update.downloadAndInstallButton.label",
|
||||
[updateVersion]
|
||||
);
|
||||
button.accessKey = this.bundle.GetStringFromName(
|
||||
"update.downloadAndInstallButton.accesskey"
|
||||
);
|
||||
}
|
||||
this.updateDeck.selectedPanel = panel;
|
||||
if (
|
||||
this.options.buttonAutoFocus &&
|
||||
(!document.commandDispatcher.focusedElement || // don't steal the focus
|
||||
document.commandDispatcher.focusedElement.localName == "button")
|
||||
) {
|
||||
// except from the other buttons
|
||||
button.focus();
|
||||
}
|
||||
} else {
|
||||
this.updateDeck.selectedPanel = panel;
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Check for updates
|
||||
*/
|
||||
checkForUpdates() {
|
||||
// Clear prefs that could prevent a user from discovering available updates.
|
||||
if (Services.prefs.prefHasUserValue(PREF_APP_UPDATE_CANCELATIONS_OSX)) {
|
||||
Services.prefs.clearUserPref(PREF_APP_UPDATE_CANCELATIONS_OSX);
|
||||
}
|
||||
if (Services.prefs.prefHasUserValue(PREF_APP_UPDATE_ELEVATE_NEVER)) {
|
||||
Services.prefs.clearUserPref(PREF_APP_UPDATE_ELEVATE_NEVER);
|
||||
}
|
||||
this.selectPanel("checkingForUpdates");
|
||||
this.isChecking = true;
|
||||
this.checker.checkForUpdates(this.updateCheckListener, true);
|
||||
// after checking, onCheckComplete() is called
|
||||
},
|
||||
|
||||
/**
|
||||
* Handles oncommand for the "Restart to Update" button
|
||||
* which is presented after the download has been downloaded.
|
||||
*/
|
||||
buttonRestartAfterDownload() {
|
||||
if (!this.isReadyForRestart) {
|
||||
return;
|
||||
}
|
||||
|
||||
gAppUpdater.selectPanel("restarting");
|
||||
|
||||
// Notify all windows that an application quit has been requested.
|
||||
let cancelQuit = Cc["@mozilla.org/supports-PRBool;1"].createInstance(
|
||||
Ci.nsISupportsPRBool
|
||||
);
|
||||
Services.obs.notifyObservers(
|
||||
cancelQuit,
|
||||
"quit-application-requested",
|
||||
"restart"
|
||||
);
|
||||
|
||||
// Something aborted the quit process.
|
||||
if (cancelQuit.data) {
|
||||
gAppUpdater.selectPanel("apply");
|
||||
return;
|
||||
}
|
||||
|
||||
// If already in safe mode restart in safe mode (bug 327119)
|
||||
if (Services.appinfo.inSafeMode) {
|
||||
Services.startup.restartInSafeMode(Ci.nsIAppStartup.eAttemptQuit);
|
||||
return;
|
||||
}
|
||||
|
||||
Services.startup.quit(
|
||||
Ci.nsIAppStartup.eAttemptQuit | Ci.nsIAppStartup.eRestart
|
||||
);
|
||||
},
|
||||
|
||||
/**
|
||||
* Implements nsIUpdateCheckListener. The methods implemented by
|
||||
* nsIUpdateCheckListener are in a different scope from nsIIncrementalDownload
|
||||
* to make it clear which are used by each interface.
|
||||
*/
|
||||
updateCheckListener: {
|
||||
/**
|
||||
* See nsIUpdateService.idl
|
||||
*/
|
||||
onCheckComplete(aRequest, aUpdates) {
|
||||
gAppUpdater.isChecking = false;
|
||||
gAppUpdater.update = gAppUpdater.aus.selectUpdate(aUpdates);
|
||||
if (!gAppUpdater.update) {
|
||||
gAppUpdater.selectPanel("noUpdatesFound");
|
||||
return;
|
||||
}
|
||||
|
||||
if (gAppUpdater.update.unsupported) {
|
||||
if (gAppUpdater.update.detailsURL) {
|
||||
let unsupportedLink = document.getElementById("unsupportedLink");
|
||||
unsupportedLink.href = gAppUpdater.update.detailsURL;
|
||||
}
|
||||
gAppUpdater.selectPanel("unsupportedSystem");
|
||||
return;
|
||||
}
|
||||
|
||||
if (!gAppUpdater.aus.canApplyUpdates) {
|
||||
gAppUpdater.selectPanel("manualUpdate");
|
||||
return;
|
||||
}
|
||||
|
||||
if (!gAppUpdater.promiseAutoUpdateSetting) {
|
||||
gAppUpdater.promiseAutoUpdateSetting = UpdateUtils.getAppUpdateAutoEnabled();
|
||||
}
|
||||
gAppUpdater.promiseAutoUpdateSetting.then(updateAuto => {
|
||||
if (updateAuto) {
|
||||
// automatically download and install
|
||||
gAppUpdater.startDownload();
|
||||
} else {
|
||||
// ask
|
||||
gAppUpdater.selectPanel("downloadAndInstall");
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
/**
|
||||
* See nsIUpdateService.idl
|
||||
*/
|
||||
onError(aRequest, aUpdate) {
|
||||
// Errors in the update check are treated as no updates found. If the
|
||||
// update check fails repeatedly without a success the user will be
|
||||
// notified with the normal app update user interface so this is safe.
|
||||
gAppUpdater.isChecking = false;
|
||||
gAppUpdater.selectPanel("noUpdatesFound");
|
||||
},
|
||||
|
||||
/**
|
||||
* See nsISupports.idl
|
||||
*/
|
||||
QueryInterface: ChromeUtils.generateQI(["nsIUpdateCheckListener"]),
|
||||
},
|
||||
|
||||
/**
|
||||
* Shows the applying UI until the update has finished staging
|
||||
*/
|
||||
waitForUpdateToStage() {
|
||||
if (!this.update) {
|
||||
this.update = this.um.activeUpdate;
|
||||
}
|
||||
this.update.QueryInterface(Ci.nsIWritablePropertyBag);
|
||||
this.update.setProperty("foregroundDownload", "true");
|
||||
this.selectPanel("applying");
|
||||
this.updateUIWhenStagingComplete();
|
||||
},
|
||||
|
||||
/**
|
||||
* Starts the download of an update mar.
|
||||
*/
|
||||
startDownload() {
|
||||
if (!this.update) {
|
||||
this.update = this.um.activeUpdate;
|
||||
}
|
||||
this.update.QueryInterface(Ci.nsIWritablePropertyBag);
|
||||
this.update.setProperty("foregroundDownload", "true");
|
||||
|
||||
let state = this.aus.downloadUpdate(this.update, false);
|
||||
if (state == "failed") {
|
||||
this.selectPanel("downloadFailed");
|
||||
return;
|
||||
}
|
||||
|
||||
this.setupDownloadingUI();
|
||||
},
|
||||
|
||||
/**
|
||||
* Switches to the UI responsible for tracking the download.
|
||||
*/
|
||||
setupDownloadingUI() {
|
||||
this.downloadStatus = document.getElementById("downloadStatus");
|
||||
this.downloadStatus.textContent = DownloadUtils.getTransferTotal(
|
||||
0,
|
||||
this.update.selectedPatch.size
|
||||
);
|
||||
this.selectPanel("downloading");
|
||||
this.aus.addDownloadListener(this);
|
||||
},
|
||||
|
||||
removeDownloadListener() {
|
||||
if (this.aus) {
|
||||
this.aus.removeDownloadListener(this);
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* See nsIRequestObserver.idl
|
||||
*/
|
||||
onStartRequest(aRequest) {},
|
||||
|
||||
/**
|
||||
* See nsIRequestObserver.idl
|
||||
*/
|
||||
onStopRequest(aRequest, aStatusCode) {
|
||||
switch (aStatusCode) {
|
||||
case Cr.NS_ERROR_UNEXPECTED:
|
||||
if (
|
||||
this.update.selectedPatch.state == "download-failed" &&
|
||||
(this.update.isCompleteUpdate || this.update.patchCount != 2)
|
||||
) {
|
||||
// Verification error of complete patch, informational text is held in
|
||||
// the update object.
|
||||
this.removeDownloadListener();
|
||||
this.selectPanel("downloadFailed");
|
||||
break;
|
||||
}
|
||||
// Verification failed for a partial patch, complete patch is now
|
||||
// downloading so return early and do NOT remove the download listener!
|
||||
break;
|
||||
case Cr.NS_BINDING_ABORTED:
|
||||
// Do not remove UI listener since the user may resume downloading again.
|
||||
break;
|
||||
case Cr.NS_OK:
|
||||
this.removeDownloadListener();
|
||||
if (this.updateStagingEnabled) {
|
||||
this.selectPanel("applying");
|
||||
this.updateUIWhenStagingComplete();
|
||||
} else {
|
||||
this.updateUIWhenDownloadComplete();
|
||||
}
|
||||
break;
|
||||
default:
|
||||
this.removeDownloadListener();
|
||||
this.selectPanel("downloadFailed");
|
||||
break;
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* See nsIProgressEventSink.idl
|
||||
*/
|
||||
onStatus(aRequest, aStatus, aStatusArg) {},
|
||||
|
||||
/**
|
||||
* See nsIProgressEventSink.idl
|
||||
*/
|
||||
onProgress(aRequest, aProgress, aProgressMax) {
|
||||
this.downloadStatus.textContent = DownloadUtils.getTransferTotal(
|
||||
aProgress,
|
||||
aProgressMax
|
||||
);
|
||||
},
|
||||
|
||||
/**
|
||||
* This function registers an observer that watches for the download to
|
||||
* complete. Once it does, it updates the UI accordingly.
|
||||
*/
|
||||
updateUIWhenDownloadComplete() {
|
||||
let observer = (aSubject, aTopic, aData) => {
|
||||
this.selectPanel("apply");
|
||||
Services.obs.removeObserver(observer, "update-downloaded");
|
||||
};
|
||||
Services.obs.addObserver(observer, "update-downloaded");
|
||||
},
|
||||
|
||||
/**
|
||||
* This function registers an observer that watches for the staging process
|
||||
* to complete. Once it does, it updates the UI to either request that the
|
||||
* user restarts to install the update on success, request that the user
|
||||
* manually download and install the newer version, or automatically download
|
||||
* a complete update if applicable.
|
||||
*/
|
||||
updateUIWhenStagingComplete() {
|
||||
let observer = (aSubject, aTopic, aData) => {
|
||||
// Update the UI when the background updater is finished
|
||||
let status = aData;
|
||||
if (
|
||||
status == "applied" ||
|
||||
status == "applied-service" ||
|
||||
status == "pending" ||
|
||||
status == "pending-service" ||
|
||||
status == "pending-elevate"
|
||||
) {
|
||||
// If the update is successfully applied, or if the updater has
|
||||
// fallen back to non-staged updates, show the "Restart to Update"
|
||||
// button.
|
||||
this.selectPanel("apply");
|
||||
} else if (status == "failed") {
|
||||
// Background update has failed, let's show the UI responsible for
|
||||
// prompting the user to update manually.
|
||||
this.selectPanel("downloadFailed");
|
||||
} else if (status == "downloading") {
|
||||
// We've fallen back to downloading the complete update because the
|
||||
// partial update failed to get staged in the background.
|
||||
// Therefore we need to keep our observer.
|
||||
this.setupDownloadingUI();
|
||||
return;
|
||||
}
|
||||
Services.obs.removeObserver(observer, "update-staged");
|
||||
};
|
||||
Services.obs.addObserver(observer, "update-staged");
|
||||
},
|
||||
|
||||
/**
|
||||
* See nsISupports.idl
|
||||
*/
|
||||
QueryInterface: ChromeUtils.generateQI([
|
||||
"nsIProgressEventSink",
|
||||
"nsIRequestObserver",
|
||||
]),
|
||||
};
|
||||
@ -7,36 +7,17 @@
|
||||
|
||||
/* import-globals-from aboutDialog.js */
|
||||
|
||||
// These two eslint directives should be removed when we remove handling for the
|
||||
// legacy app updater.
|
||||
/* eslint-disable prettier/prettier */
|
||||
/* global AppUpdater, appUpdater, onUnload */
|
||||
|
||||
var { XPCOMUtils } = ChromeUtils.import(
|
||||
"resource://gre/modules/XPCOMUtils.jsm"
|
||||
);
|
||||
XPCOMUtils.defineLazyModuleGetters(this, {
|
||||
AppUpdater: "resource:///modules/AppUpdater.jsm",
|
||||
DownloadUtils: "resource://gre/modules/DownloadUtils.jsm",
|
||||
UpdateUtils: "resource://gre/modules/UpdateUtils.jsm",
|
||||
});
|
||||
|
||||
var gAppUpdater;
|
||||
|
||||
(() => {
|
||||
|
||||
// If the new app updater is preffed off, load the legacy version.
|
||||
if (!Services.prefs.getBoolPref("browser.aboutDialogNewAppUpdater", false)) {
|
||||
Services.scriptloader.loadSubScript(
|
||||
"chrome://browser/content/aboutDialog-appUpdater-legacy.js",
|
||||
this
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
XPCOMUtils.defineLazyModuleGetters(this, {
|
||||
AppUpdater: "resource:///modules/AppUpdater.jsm",
|
||||
});
|
||||
|
||||
function onUnload(aEvent) {
|
||||
if (gAppUpdater) {
|
||||
gAppUpdater.stopCurrentCheck();
|
||||
@ -228,8 +209,3 @@ appUpdater.prototype = {
|
||||
this._appUpdater.startDownload();
|
||||
},
|
||||
};
|
||||
|
||||
this.onUnload = onUnload;
|
||||
this.appUpdater = appUpdater;
|
||||
|
||||
})();
|
||||
|
||||
@ -5,7 +5,6 @@ browser.jar:
|
||||
% content browser %content/browser/ contentaccessible=yes
|
||||
|
||||
content/browser/aboutDialog-appUpdater.js (content/aboutDialog-appUpdater.js)
|
||||
content/browser/aboutDialog-appUpdater-legacy.js (content/aboutDialog-appUpdater-legacy.js)
|
||||
* content/browser/aboutDialog.xhtml (content/aboutDialog.xhtml)
|
||||
content/browser/aboutDialog.js (content/aboutDialog.js)
|
||||
content/browser/aboutDialog.css (content/aboutDialog.css)
|
||||
|
||||
@ -14,7 +14,6 @@ support-files =
|
||||
prefs =
|
||||
app.update.BITS.enabled=true
|
||||
app.update.langpack.enabled=true
|
||||
browser.aboutDialogNewAppUpdater=true
|
||||
|
||||
# BITS Download Tests
|
||||
#####################
|
||||
|
||||
@ -11,7 +11,6 @@ support-files =
|
||||
prefs =
|
||||
app.update.BITS.enabled=false
|
||||
app.update.langpack.enabled=true
|
||||
browser.aboutDialogNewAppUpdater=true
|
||||
|
||||
# About Dialog Application Update Tests
|
||||
[browser_aboutDialog_bc_downloading.js]
|
||||
@ -38,7 +37,6 @@ reason = test must be able to prevent file deletion.
|
||||
skip-if = os != 'win'
|
||||
reason = Windows only feature.
|
||||
[browser_aboutDialog_fc_check_unsupported.js]
|
||||
[browser_aboutDialog_newAppUpdater.js]
|
||||
|
||||
# about:preferences Application Update Tests
|
||||
[browser_aboutPrefs_bc_downloading.js]
|
||||
|
||||
@ -1,71 +0,0 @@
|
||||
[DEFAULT]
|
||||
skip-if = os != 'win'
|
||||
reason = BITS is only available on Windows.
|
||||
dupe-manifest =
|
||||
tags = appupdate bits
|
||||
head = head.js
|
||||
support-files =
|
||||
../data/shared.js
|
||||
../data/sharedUpdateXML.js
|
||||
app_update.sjs
|
||||
downloadPage.html
|
||||
testConstants.js
|
||||
|
||||
prefs =
|
||||
app.update.BITS.enabled=true
|
||||
app.update.langpack.enabled=true
|
||||
|
||||
# BITS Download Tests
|
||||
#####################
|
||||
|
||||
# About Dialog Application Update Tests
|
||||
[browser_aboutDialog_bc_downloading.js]
|
||||
[browser_aboutDialog_bc_downloading_staging.js]
|
||||
[browser_aboutDialog_bc_downloading_notify.js]
|
||||
[browser_aboutDialog_bc_downloaded.js]
|
||||
[browser_aboutDialog_bc_downloaded_staging.js]
|
||||
[browser_aboutDialog_bc_downloaded_staged.js]
|
||||
[browser_aboutDialog_bc_downloaded_stagingFailure.js]
|
||||
[browser_aboutDialog_fc_downloadAuto.js]
|
||||
[browser_aboutDialog_fc_downloadAuto_staging.js]
|
||||
[browser_aboutDialog_fc_downloadOptIn.js]
|
||||
[browser_aboutDialog_fc_downloadOptIn_staging.js]
|
||||
[browser_aboutDialog_fc_patch_completeBadSize.js]
|
||||
[browser_aboutDialog_fc_patch_partialBadSize.js]
|
||||
[browser_aboutDialog_fc_patch_partialBadSize_complete.js]
|
||||
[browser_aboutDialog_fc_patch_partialBadSize_completeBadSize.js]
|
||||
|
||||
# about:preferences Application Update Tests
|
||||
[browser_aboutPrefs_bc_downloading.js]
|
||||
[browser_aboutPrefs_bc_downloading_staging.js]
|
||||
[browser_aboutPrefs_bc_downloaded.js]
|
||||
[browser_aboutPrefs_bc_downloaded_staging.js]
|
||||
[browser_aboutPrefs_bc_downloaded_stagingFailure.js]
|
||||
[browser_aboutPrefs_bc_downloaded_staged.js]
|
||||
[browser_aboutPrefs_fc_downloadAuto.js]
|
||||
[browser_aboutPrefs_fc_downloadAuto_staging.js]
|
||||
[browser_aboutPrefs_fc_downloadOptIn.js]
|
||||
[browser_aboutPrefs_fc_downloadOptIn_staging.js]
|
||||
[browser_aboutPrefs_fc_patch_completeBadSize.js]
|
||||
[browser_aboutPrefs_fc_patch_partialBadSize.js]
|
||||
[browser_aboutPrefs_fc_patch_partialBadSize_complete.js]
|
||||
[browser_aboutPrefs_fc_patch_partialBadSize_completeBadSize.js]
|
||||
|
||||
# Doorhanger Application Update Tests
|
||||
[browser_doorhanger_bc_downloaded.js]
|
||||
[browser_doorhanger_bc_downloaded_staged.js]
|
||||
[browser_doorhanger_bc_downloadAutoFailures.js]
|
||||
[browser_doorhanger_bc_downloadAutoFailures_bgWin.js]
|
||||
[browser_doorhanger_bc_downloadOptIn.js]
|
||||
[browser_doorhanger_bc_downloadOptIn_bgWin.js]
|
||||
[browser_doorhanger_bc_downloadOptIn_staging.js]
|
||||
[browser_doorhanger_bc_patch_completeBadSize.js]
|
||||
[browser_doorhanger_bc_patch_partialBadSize.js]
|
||||
[browser_doorhanger_bc_patch_partialBadSize_complete.js]
|
||||
[browser_doorhanger_bc_patch_partialBadSize_completeBadSize.js]
|
||||
[browser_doorhanger_sp_patch_completeApplyFailure.js]
|
||||
[browser_doorhanger_sp_patch_partialApplyFailure.js]
|
||||
[browser_doorhanger_sp_patch_partialApplyFailure_complete.js]
|
||||
[browser_doorhanger_sp_patch_partialApplyFailure_complete_staging.js]
|
||||
[browser_doorhanger_sp_patch_partialApplyFailure_completeBadSize.js]
|
||||
[browser_doorhanger_bc_downloaded_disableBITS.js]
|
||||
@ -1,92 +0,0 @@
|
||||
[DEFAULT]
|
||||
dupe-manifest =
|
||||
tags = appupdate internal
|
||||
head = head.js
|
||||
support-files =
|
||||
../data/shared.js
|
||||
../data/sharedUpdateXML.js
|
||||
app_update.sjs
|
||||
downloadPage.html
|
||||
testConstants.js
|
||||
prefs =
|
||||
app.update.BITS.enabled=false
|
||||
app.update.langpack.enabled=true
|
||||
|
||||
# About Dialog Application Update Tests
|
||||
[browser_aboutDialog_bc_downloading.js]
|
||||
[browser_aboutDialog_bc_downloading_staging.js]
|
||||
[browser_aboutDialog_bc_downloading_notify.js]
|
||||
[browser_aboutDialog_bc_downloaded.js]
|
||||
[browser_aboutDialog_bc_downloaded_staging.js]
|
||||
[browser_aboutDialog_bc_downloaded_stagingFailure.js]
|
||||
[browser_aboutDialog_bc_downloaded_staged.js]
|
||||
[browser_aboutDialog_fc_downloadAuto.js]
|
||||
[browser_aboutDialog_fc_downloadAuto_staging.js]
|
||||
[browser_aboutDialog_fc_downloadOptIn.js]
|
||||
[browser_aboutDialog_fc_downloadOptIn_staging.js]
|
||||
[browser_aboutDialog_fc_patch_completeBadSize.js]
|
||||
[browser_aboutDialog_fc_patch_partialBadSize.js]
|
||||
[browser_aboutDialog_fc_patch_partialBadSize_complete.js]
|
||||
[browser_aboutDialog_fc_patch_partialBadSize_completeBadSize.js]
|
||||
[browser_aboutDialog_fc_check_cantApply.js]
|
||||
skip-if = os != 'win'
|
||||
reason = test must be able to prevent file deletion.
|
||||
[browser_aboutDialog_fc_check_malformedXML.js]
|
||||
[browser_aboutDialog_fc_check_noUpdate.js]
|
||||
[browser_aboutDialog_fc_check_otherInstance.js]
|
||||
skip-if = os != 'win'
|
||||
reason = Windows only feature.
|
||||
[browser_aboutDialog_fc_check_unsupported.js]
|
||||
[browser_aboutDialog_legacyAppUpdater.js]
|
||||
|
||||
# about:preferences Application Update Tests
|
||||
[browser_aboutPrefs_bc_downloading.js]
|
||||
[browser_aboutPrefs_bc_downloading_staging.js]
|
||||
[browser_aboutPrefs_bc_downloaded.js]
|
||||
[browser_aboutPrefs_bc_downloaded_staging.js]
|
||||
[browser_aboutPrefs_bc_downloaded_stagingFailure.js]
|
||||
[browser_aboutPrefs_bc_downloaded_staged.js]
|
||||
[browser_aboutPrefs_fc_downloadAuto.js]
|
||||
[browser_aboutPrefs_fc_downloadAuto_staging.js]
|
||||
[browser_aboutPrefs_fc_downloadOptIn.js]
|
||||
[browser_aboutPrefs_fc_downloadOptIn_staging.js]
|
||||
[browser_aboutPrefs_fc_patch_completeBadSize.js]
|
||||
[browser_aboutPrefs_fc_patch_partialBadSize.js]
|
||||
[browser_aboutPrefs_fc_patch_partialBadSize_complete.js]
|
||||
[browser_aboutPrefs_fc_patch_partialBadSize_completeBadSize.js]
|
||||
[browser_aboutPrefs_fc_check_cantApply.js]
|
||||
skip-if = os != 'win'
|
||||
reason = test must be able to prevent file deletion.
|
||||
[browser_aboutPrefs_fc_check_malformedXML.js]
|
||||
[browser_aboutPrefs_fc_check_noUpdate.js]
|
||||
[browser_aboutPrefs_fc_check_otherInstance.js]
|
||||
skip-if = os != 'win'
|
||||
reason = Windows only feature.
|
||||
[browser_aboutPrefs_fc_check_unsupported.js]
|
||||
[browser_aboutPrefs_settings.js]
|
||||
|
||||
# Doorhanger Application Update Tests
|
||||
[browser_doorhanger_bc_check_cantApply.js]
|
||||
skip-if = os != 'win'
|
||||
reason = test must be able to prevent file deletion.
|
||||
[browser_doorhanger_bc_check_malformedXML.js]
|
||||
[browser_doorhanger_bc_check_unsupported.js]
|
||||
[browser_doorhanger_bc_downloaded.js]
|
||||
[browser_doorhanger_bc_downloaded_staged.js]
|
||||
[browser_doorhanger_bc_downloadAutoFailures.js]
|
||||
[browser_doorhanger_bc_downloadAutoFailures_bgWin.js]
|
||||
[browser_doorhanger_bc_downloadOptIn.js]
|
||||
[browser_doorhanger_bc_downloadOptIn_bgWin.js]
|
||||
[browser_doorhanger_bc_downloadOptIn_staging.js]
|
||||
[browser_doorhanger_bc_patch_completeBadSize.js]
|
||||
[browser_doorhanger_bc_patch_partialBadSize.js]
|
||||
[browser_doorhanger_bc_patch_partialBadSize_complete.js]
|
||||
[browser_doorhanger_bc_patch_partialBadSize_completeBadSize.js]
|
||||
[browser_doorhanger_sp_patch_completeApplyFailure.js]
|
||||
[browser_doorhanger_sp_patch_partialApplyFailure.js]
|
||||
[browser_doorhanger_sp_patch_partialApplyFailure_complete.js]
|
||||
[browser_doorhanger_sp_patch_partialApplyFailure_complete_staging.js]
|
||||
[browser_doorhanger_sp_patch_partialApplyFailure_completeBadSize.js]
|
||||
|
||||
# Elevation Dialog Tests
|
||||
[browser_elevationDialog.js]
|
||||
@ -1,21 +0,0 @@
|
||||
/* Any copyright is dedicated to the Public Domain.
|
||||
* http://creativecommons.org/publicdomain/zero/1.0/ */
|
||||
|
||||
"use strict";
|
||||
|
||||
// This makes sure the legacy app updater is used when the new one is preffed
|
||||
// off.
|
||||
add_task(async function aboutDialog_legacyAppUpdater() {
|
||||
let aboutDialog = await waitForAboutDialog();
|
||||
registerCleanupFunction(() => {
|
||||
aboutDialog.close();
|
||||
});
|
||||
await TestUtils.waitForCondition(
|
||||
() => aboutDialog.gAppUpdater,
|
||||
"Wait for gAppUpdater to be set"
|
||||
);
|
||||
Assert.ok(
|
||||
!aboutDialog.gAppUpdater._appUpdater,
|
||||
"gAppUpdater._appUpdater should not be defined when using the legacy app updater"
|
||||
);
|
||||
});
|
||||
@ -1,20 +0,0 @@
|
||||
/* Any copyright is dedicated to the Public Domain.
|
||||
* http://creativecommons.org/publicdomain/zero/1.0/ */
|
||||
|
||||
"use strict";
|
||||
|
||||
// This makes sure the new app updater is used when preffed on.
|
||||
add_task(async function aboutDialog_newAppUpdater() {
|
||||
let aboutDialog = await waitForAboutDialog();
|
||||
registerCleanupFunction(() => {
|
||||
aboutDialog.close();
|
||||
});
|
||||
await TestUtils.waitForCondition(
|
||||
() => aboutDialog.gAppUpdater,
|
||||
"Wait for gAppUpdater to be set"
|
||||
);
|
||||
Assert.ok(
|
||||
aboutDialog.gAppUpdater._appUpdater,
|
||||
"gAppUpdater._appUpdater should be defined when using the new app updater"
|
||||
);
|
||||
});
|
||||
@ -8,10 +8,8 @@ FINAL_TARGET = '_tests/xpcshell/toolkit/mozapps/update/tests/data'
|
||||
|
||||
if not CONFIG['MOZ_SUITE']:
|
||||
BROWSER_CHROME_MANIFESTS += ['browser/browser.ini']
|
||||
BROWSER_CHROME_MANIFESTS += ['browser/browser.legacy.ini']
|
||||
if CONFIG['MOZ_BITS_DOWNLOAD']:
|
||||
BROWSER_CHROME_MANIFESTS += ['browser/browser.bits.ini']
|
||||
BROWSER_CHROME_MANIFESTS += ['browser/browser.legacy.bits.ini']
|
||||
|
||||
XPCSHELL_TESTS_MANIFESTS += [
|
||||
'unit_aus_update/xpcshell.ini',
|
||||
|
||||
Loading…
Reference in New Issue
Block a user