summaryrefslogtreecommitdiffstats
path: root/security/manager/ssl/tests/mochitest
diff options
context:
space:
mode:
Diffstat (limited to 'security/manager/ssl/tests/mochitest')
-rw-r--r--security/manager/ssl/tests/mochitest/browser/browser_add_exception_dialog.js2
-rw-r--r--security/manager/ssl/tests/mochitest/browser/browser_deleteCert_ui.js2
-rw-r--r--security/manager/ssl/tests/mochitest/browser/browser_downloadCert_ui.js2
-rw-r--r--security/manager/ssl/tests/mochitest/browser/browser_editCACertTrust.js2
-rw-r--r--security/manager/ssl/tests/mochitest/browser/browser_exportP12_passwordUI.js2
-rw-r--r--security/manager/ssl/tests/mochitest/browser/browser_loadPKCS11Module_ui.js4
-rw-r--r--security/manager/ssl/tests/mochitest/browser/head.js2
-rw-r--r--security/manager/ssl/tests/mochitest/mixedcontent/mochitest.toml1
8 files changed, 9 insertions, 8 deletions
diff --git a/security/manager/ssl/tests/mochitest/browser/browser_add_exception_dialog.js b/security/manager/ssl/tests/mochitest/browser/browser_add_exception_dialog.js
index 0916ac5ce4..fa8a887753 100644
--- a/security/manager/ssl/tests/mochitest/browser/browser_add_exception_dialog.js
+++ b/security/manager/ssl/tests/mochitest/browser/browser_add_exception_dialog.js
@@ -20,7 +20,7 @@ function test() {
function testAddCertificate() {
win.removeEventListener("load", testAddCertificate);
- Services.obs.addObserver(async function onCertUI(aSubject, aTopic, aData) {
+ Services.obs.addObserver(async function onCertUI() {
Services.obs.removeObserver(onCertUI, "cert-exception-ui-ready");
ok(win.gCert, "The certificate information should be available now");
diff --git a/security/manager/ssl/tests/mochitest/browser/browser_deleteCert_ui.js b/security/manager/ssl/tests/mochitest/browser/browser_deleteCert_ui.js
index a8ff7cc8fb..7e8fa034ff 100644
--- a/security/manager/ssl/tests/mochitest/browser/browser_deleteCert_ui.js
+++ b/security/manager/ssl/tests/mochitest/browser/browser_deleteCert_ui.js
@@ -92,7 +92,7 @@ function openDeleteCertConfirmDialog(tabID) {
gCertArray,
retVals
);
- return new Promise((resolve, reject) => {
+ return new Promise(resolve => {
win.addEventListener(
"load",
function () {
diff --git a/security/manager/ssl/tests/mochitest/browser/browser_downloadCert_ui.js b/security/manager/ssl/tests/mochitest/browser/browser_downloadCert_ui.js
index 51715b1352..c01ed84122 100644
--- a/security/manager/ssl/tests/mochitest/browser/browser_downloadCert_ui.js
+++ b/security/manager/ssl/tests/mochitest/browser/browser_downloadCert_ui.js
@@ -56,7 +56,7 @@ function openCertDownloadDialog(cert) {
cert,
returnVals
);
- return new Promise((resolve, reject) => {
+ return new Promise(resolve => {
win.addEventListener(
"load",
function () {
diff --git a/security/manager/ssl/tests/mochitest/browser/browser_editCACertTrust.js b/security/manager/ssl/tests/mochitest/browser/browser_editCACertTrust.js
index 9a36eca7bf..5743e01f6f 100644
--- a/security/manager/ssl/tests/mochitest/browser/browser_editCACertTrust.js
+++ b/security/manager/ssl/tests/mochitest/browser/browser_editCACertTrust.js
@@ -31,7 +31,7 @@ function openEditCertTrustDialog() {
"",
gCert
);
- return new Promise((resolve, reject) => {
+ return new Promise(resolve => {
win.addEventListener(
"load",
function () {
diff --git a/security/manager/ssl/tests/mochitest/browser/browser_exportP12_passwordUI.js b/security/manager/ssl/tests/mochitest/browser/browser_exportP12_passwordUI.js
index 8e6af27cbb..dc3b754531 100644
--- a/security/manager/ssl/tests/mochitest/browser/browser_exportP12_passwordUI.js
+++ b/security/manager/ssl/tests/mochitest/browser/browser_exportP12_passwordUI.js
@@ -73,7 +73,7 @@ function openSetP12PasswordDialog() {
"",
returnVals
);
- return new Promise((resolve, reject) => {
+ return new Promise(resolve => {
win.addEventListener(
"load",
function () {
diff --git a/security/manager/ssl/tests/mochitest/browser/browser_loadPKCS11Module_ui.js b/security/manager/ssl/tests/mochitest/browser/browser_loadPKCS11Module_ui.js
index 9e4e244123..4b7b78df8d 100644
--- a/security/manager/ssl/tests/mochitest/browser/browser_loadPKCS11Module_ui.js
+++ b/security/manager/ssl/tests/mochitest/browser/browser_loadPKCS11Module_ui.js
@@ -38,7 +38,7 @@ const gMockPKCS11ModuleDB = {
}
},
- deleteModule(moduleName) {
+ deleteModule() {
Assert.ok(false, `deleteModule: should not be called`);
},
@@ -102,7 +102,7 @@ var gMockPromptServiceCID = MockRegistrar.register(
);
var gMockFilePicker = SpecialPowers.MockFilePicker;
-gMockFilePicker.init(window);
+gMockFilePicker.init(window.browsingContext);
var gTempFile = Services.dirsvc.get("TmpD", Ci.nsIFile);
gTempFile.append("browser_loadPKCS11Module_ui-fakeModule");
diff --git a/security/manager/ssl/tests/mochitest/browser/head.js b/security/manager/ssl/tests/mochitest/browser/head.js
index 1ae951d7a5..f64e2afc6e 100644
--- a/security/manager/ssl/tests/mochitest/browser/head.js
+++ b/security/manager/ssl/tests/mochitest/browser/head.js
@@ -70,7 +70,7 @@ function readCertificate(filename, trustString) {
*/
async function openCertManager() {
let win = window.openDialog("chrome://pippki/content/certManager.xhtml");
- return new Promise((resolve, reject) => {
+ return new Promise(resolve => {
win.addEventListener(
"load",
function () {
diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/mochitest.toml b/security/manager/ssl/tests/mochitest/mixedcontent/mochitest.toml
index 1a37ba6f38..4935021410 100644
--- a/security/manager/ssl/tests/mochitest/mixedcontent/mochitest.toml
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/mochitest.toml
@@ -7,6 +7,7 @@ skip-if = [
prefs = [
"security.mixed_content.upgrade_display_content=false",
"dom.security.https_first=false",
+ "dom.block_download_insecure=false",
]
support-files = [
"alloworigin.sjs",