From 779b09973ed88652bafeb6c8d2e9b0ed57b537eb Mon Sep 17 00:00:00 2001 From: Matthew Noorenberghe Date: Wed, 7 Sep 2016 21:41:15 -0700 Subject: [PATCH] Bug 1301287 - Password manager: enable eslint space-infix-ops rule. r=johannh .js files were fixed automatically with --fix MozReview-Commit-ID: wzRpQhqEH7 --HG-- extra : rebase_source : e94d205df56457aca922b710c05cec0bc9d723e5 --- toolkit/components/passwordmgr/.eslintrc | 3 + .../components/passwordmgr/LoginHelper.jsm | 2 +- .../passwordmgr/content/passwordManager.js | 4 +- .../passwordmgr/nsLoginManagerPrompter.js | 2 +- .../test/browser/browser_passwordmgr_sort.js | 4 +- .../chrome/test_privbrowsing_perwindowpb.html | 2 +- .../test_prompt_promptAuth_proxy.html | 2 +- .../passwordmgr/test/notification_common.js | 2 +- .../passwordmgr/test/test_prompt_async.html | 114 +++++++++--------- .../test/unit/test_notifications.js | 2 +- 10 files changed, 70 insertions(+), 67 deletions(-) diff --git a/toolkit/components/passwordmgr/.eslintrc b/toolkit/components/passwordmgr/.eslintrc index eabe7f9ba1cf..4c6bf849d52d 100644 --- a/toolkit/components/passwordmgr/.eslintrc +++ b/toolkit/components/passwordmgr/.eslintrc @@ -21,5 +21,8 @@ // Always require semicolon at end of statement "semi": [2, "always"], + + // Require spaces around operators + "space-infix-ops": 2, } } diff --git a/toolkit/components/passwordmgr/LoginHelper.jsm b/toolkit/components/passwordmgr/LoginHelper.jsm index e5fed061d496..715d3ed805cc 100644 --- a/toolkit/components/passwordmgr/LoginHelper.jsm +++ b/toolkit/components/passwordmgr/LoginHelper.jsm @@ -392,7 +392,7 @@ this.LoginHelper = { const KEY_DELIMITER = ":"; if (!preferredOrigin && resolveBy.includes("scheme")) { - throw new Error("dedupeLogins: `preferredOrigin` is required in order to "+ + throw new Error("dedupeLogins: `preferredOrigin` is required in order to " + "prefer schemes which match it."); } diff --git a/toolkit/components/passwordmgr/content/passwordManager.js b/toolkit/components/passwordmgr/content/passwordManager.js index fd5cbb6f4414..efa15db8d9be 100644 --- a/toolkit/components/passwordmgr/content/passwordManager.js +++ b/toolkit/components/passwordmgr/content/passwordManager.js @@ -162,7 +162,7 @@ let signonsTreeView = { switch (column.id) { case "siteCol": return signon.httpRealm ? - (signon.hostname + " (" + signon.httpRealm + ")"): + (signon.hostname + " (" + signon.httpRealm + ")") : signon.hostname; case "userCol": return signon.username || ""; @@ -383,7 +383,7 @@ function DeleteSignon() { // update selection and/or buttons if (table.length) { // update selection - let nextSelection = (selections[0] < table.length) ? selections[0] : table.length-1; + let nextSelection = (selections[0] < table.length) ? selections[0] : table.length - 1; tree.view.selection.select(nextSelection); tree.treeBoxObject.ensureRowIsVisible(nextSelection); } else { diff --git a/toolkit/components/passwordmgr/nsLoginManagerPrompter.js b/toolkit/components/passwordmgr/nsLoginManagerPrompter.js index 29325e419d2c..352a0470afc5 100644 --- a/toolkit/components/passwordmgr/nsLoginManagerPrompter.js +++ b/toolkit/components/passwordmgr/nsLoginManagerPrompter.js @@ -1581,7 +1581,7 @@ LoginManagerPrompter.prototype = { aAuthInfo.username = username; } else { aAuthInfo.domain = username.substring(0, idx); - aAuthInfo.username = username.substring(idx+1); + aAuthInfo.username = username.substring(idx + 1); } } else { aAuthInfo.username = username; diff --git a/toolkit/components/passwordmgr/test/browser/browser_passwordmgr_sort.js b/toolkit/components/passwordmgr/test/browser/browser_passwordmgr_sort.js index aed8cd375136..0733ee585519 100644 --- a/toolkit/components/passwordmgr/test/browser/browser_passwordmgr_sort.js +++ b/toolkit/components/passwordmgr/test/browser/browser_passwordmgr_sort.js @@ -50,7 +50,7 @@ function test() { Ci.nsILoginInfo, "init"); for (let i = 0; i < 10; i++) pwmgr.addLogin(new nsLoginInfo(urls[i], urls[i], null, users[i], pwds[i], - "u"+(i+1), "p"+(i+1))); + "u" + (i + 1), "p" + (i + 1))); // Open the password manager dialog const PWMGR_DLG = "chrome://passwordmgr/content/passwordManager.xul"; @@ -133,7 +133,7 @@ function test() { let actualValues = getColumnEntries(aCol); is(actualValues.length, expectedValues.length, "Checking length of expected column"); for (let i = 0; i < expectedValues.length; i++) - is(actualValues[i], expectedValues[i], "Checking column entry #"+i); + is(actualValues[i], expectedValues[i], "Checking column entry #" + i); } function getColumnEntries(aCol) { diff --git a/toolkit/components/passwordmgr/test/chrome/test_privbrowsing_perwindowpb.html b/toolkit/components/passwordmgr/test/chrome/test_privbrowsing_perwindowpb.html index 53cdb57c1fb6..3c44955802a5 100644 --- a/toolkit/components/passwordmgr/test/chrome/test_privbrowsing_perwindowpb.html +++ b/toolkit/components/passwordmgr/test/chrome/test_privbrowsing_perwindowpb.html @@ -105,7 +105,7 @@ function loadNextTest() { } ok(true, "Starting test #" + testNum); - iframe.src = prefix + subtests[testNum-1]; + iframe.src = prefix + subtests[testNum - 1]; } function checkTest() { diff --git a/toolkit/components/passwordmgr/test/mochitest/test_prompt_promptAuth_proxy.html b/toolkit/components/passwordmgr/test/mochitest/test_prompt_promptAuth_proxy.html index 2b9eb40308d5..c259c01d31a4 100644 --- a/toolkit/components/passwordmgr/test/mochitest/test_prompt_promptAuth_proxy.html +++ b/toolkit/components/passwordmgr/test/mochitest/test_prompt_promptAuth_proxy.html @@ -44,7 +44,7 @@ var proxyAuthinfo = { // Force parent to not look for tab-modal prompts, as they're not used for auth prompts. isTabModal = false; -const Cc_promptFac= Cc["@mozilla.org/passwordmanager/authpromptfactory;1"]; +const Cc_promptFac = Cc["@mozilla.org/passwordmanager/authpromptfactory;1"]; ok(Cc_promptFac != null, "Access Cc[@mozilla.org/passwordmanager/authpromptfactory;1]"); const Ci_promptFac = Ci.nsIPromptFactory; diff --git a/toolkit/components/passwordmgr/test/notification_common.js b/toolkit/components/passwordmgr/test/notification_common.js index ea5842d579b2..e8a52929de3b 100644 --- a/toolkit/components/passwordmgr/test/notification_common.js +++ b/toolkit/components/passwordmgr/test/notification_common.js @@ -5,7 +5,7 @@ function cleanUpPopupNotifications() { var container = getPopupNotifications(window.top); var notes = container._currentNotifications; info(true, "Removing " + notes.length + " popup notifications."); - for (var i = notes.length-1; i >= 0; i--) { + for (var i = notes.length - 1; i >= 0; i--) { notes[i].remove(); } } diff --git a/toolkit/components/passwordmgr/test/test_prompt_async.html b/toolkit/components/passwordmgr/test/test_prompt_async.html index 78d6805bd204..7d6ccf56e01d 100644 --- a/toolkit/components/passwordmgr/test/test_prompt_async.html +++ b/toolkit/components/passwordmgr/test/test_prompt_async.html @@ -213,29 +213,29 @@ ok(true, "doTest testNum 1"); expectedLoads = 3; expectedDialogs = 3; - iframe1.src = exampleCom + "authenticate.sjs?"+ - "r=1&"+ - "user=user1name&"+ - "pass=user1pass&"+ - "realm=mochirealm&"+ - "proxy_user=proxy_user&"+ - "proxy_pass=proxy_pass&"+ + iframe1.src = exampleCom + "authenticate.sjs?" + + "r=1&" + + "user=user1name&" + + "pass=user1pass&" + + "realm=mochirealm&" + + "proxy_user=proxy_user&" + + "proxy_pass=proxy_pass&" + "proxy_realm=proxy_realm"; - iframe2a.src = exampleOrg + "authenticate.sjs?"+ - "r=2&"+ - "user=user2name&"+ - "pass=user2pass&"+ - "realm=mochirealm2&"+ - "proxy_user=proxy_user&"+ - "proxy_pass=proxy_pass&"+ + iframe2a.src = exampleOrg + "authenticate.sjs?" + + "r=2&" + + "user=user2name&" + + "pass=user2pass&" + + "realm=mochirealm2&" + + "proxy_user=proxy_user&" + + "proxy_pass=proxy_pass&" + "proxy_realm=proxy_realm"; - iframe2b.src = exampleOrg + "authenticate.sjs?"+ - "r=3&"+ - "user=user2name&"+ - "pass=user2pass&"+ - "realm=mochirealm2&"+ - "proxy_user=proxy_user&"+ - "proxy_pass=proxy_pass&"+ + iframe2b.src = exampleOrg + "authenticate.sjs?" + + "r=3&" + + "user=user2name&" + + "pass=user2pass&" + + "realm=mochirealm2&" + + "proxy_user=proxy_user&" + + "proxy_pass=proxy_pass&" + "proxy_realm=proxy_realm"; break; @@ -258,12 +258,12 @@ ok(true, "doTest testNum 3"); expectedLoads = 1; expectedDialogs = 1; - iframe1.src = exampleCom + "authenticate.sjs?"+ - "user=user4name&"+ - "pass=user4pass&"+ - "realm=mochirealm4&"+ - "proxy_user=proxy_user3&"+ - "proxy_pass=proxy_pass3&"+ + iframe1.src = exampleCom + "authenticate.sjs?" + + "user=user4name&" + + "pass=user4pass&" + + "realm=mochirealm4&" + + "proxy_user=proxy_user3&" + + "proxy_pass=proxy_pass3&" + "proxy_realm=proxy_realm3"; break; @@ -274,12 +274,12 @@ ok(true, "doTest testNum 4"); expectedLoads = 1; expectedDialogs = 2; - iframe1.src = exampleCom + "authenticate.sjs?"+ - "user=user4name&"+ - "pass=user4pass&"+ - "realm=mochirealm4&"+ - "proxy_user=proxy_user3&"+ - "proxy_pass=proxy_pass3&"+ + iframe1.src = exampleCom + "authenticate.sjs?" + + "user=user4name&" + + "pass=user4pass&" + + "realm=mochirealm4&" + + "proxy_user=proxy_user3&" + + "proxy_pass=proxy_pass3&" + "proxy_realm=proxy_realm3"; @@ -294,13 +294,13 @@ ok(true, "doTest testNum 5"); expectedLoads = 1; expectedDialogs = 1; - iframe1.src = exampleCom + "authenticate.sjs?"+ - "user=user5name&"+ - "pass=user5pass&"+ - "realm=mochirealm5&"+ - "proxy_user=proxy_user4&"+ - "proxy_pass=proxy_pass4&"+ - "proxy_realm=proxy_realm4&"+ + iframe1.src = exampleCom + "authenticate.sjs?" + + "user=user5name&" + + "pass=user5pass&" + + "realm=mochirealm5&" + + "proxy_user=proxy_user4&" + + "proxy_pass=proxy_pass4&" + + "proxy_realm=proxy_realm4&" + "huge=1"; break; @@ -311,13 +311,13 @@ ok(true, "doTest testNum 6"); expectedLoads = 1; expectedDialogs = 2; - iframe1.src = exampleCom + "authenticate.sjs?"+ - "user=user5name&"+ - "pass=user5pass&"+ - "realm=mochirealm5&"+ - "proxy_user=proxy_user4&"+ - "proxy_pass=proxy_pass4&"+ - "proxy_realm=proxy_realm4&"+ + iframe1.src = exampleCom + "authenticate.sjs?" + + "user=user5name&" + + "pass=user5pass&" + + "realm=mochirealm5&" + + "proxy_user=proxy_user4&" + + "proxy_pass=proxy_pass4&" + + "proxy_realm=proxy_realm4&" + "huge=1"; break; @@ -337,14 +337,14 @@ ok(true, "doTest testNum 8"); expectedLoads = 1; expectedDialogs = 5; - iframe1.src = exampleCom + "authenticate.sjs?"+ - "user=user6name&"+ - "pass=user6pass&"+ - "realm=mochirealm6&"+ - "proxy_user=proxy_user5&"+ - "proxy_pass=proxy_pass5&"+ - "proxy_realm=proxy_realm5&"+ - "huge=1&"+ + iframe1.src = exampleCom + "authenticate.sjs?" + + "user=user6name&" + + "pass=user6pass&" + + "realm=mochirealm6&" + + "proxy_user=proxy_user5&" + + "proxy_pass=proxy_pass5&" + + "proxy_realm=proxy_realm5&" + + "huge=1&" + "multiple=3"; break; @@ -403,7 +403,7 @@ break; default: - ok(false, "Unhandled testNum "+testNum+" in handleDialog"); + ok(false, "Unhandled testNum " + testNum + " in handleDialog"); } if (--expectedDialogs > 0) @@ -526,7 +526,7 @@ break; default: - ok(false, "Unhandled testNum "+testNum+" in doCheck"); + ok(false, "Unhandled testNum " + testNum + " in doCheck"); } } diff --git a/toolkit/components/passwordmgr/test/unit/test_notifications.js b/toolkit/components/passwordmgr/test/unit/test_notifications.js index d8540cc76ee0..41caa2c1b32d 100644 --- a/toolkit/components/passwordmgr/test/unit/test_notifications.js +++ b/toolkit/components/passwordmgr/test/unit/test_notifications.js @@ -84,7 +84,7 @@ testnum++; testdesc = "modifyLogin"; expectedNotification = "modifyLogin"; -expectedData=[testuser1, testuser2]; +expectedData = [testuser1, testuser2]; Services.logins.modifyLogin(testuser1, testuser2); do_check_eq(expectedNotification, null); LoginTestUtils.checkLogins([testuser2]);