Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 15:23:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1330791 - Enable the no-redeclare rule for eslint in /services and fix the associated errors. r=markh

Browse Source 
MozReview-Commit-ID: 7ADLmPB4eSu

--HG--
extra : rebase_source : 94a966d6cbc5c2b6b6097355fc3aa84dd50e27f5
This commit is contained in:
Jared Wein 2017-01-12 18:19:47 -05:00
parent 49ca473486
commit 516a926c6e
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
services/.eslintrc.js
View File

@ -16,6 +16,5 @@ module.exports = {
"no-native-reassign": "warn",
"no-nested-ternary": "warn",
"no-octal": "warn",
"no-redeclare": "warn",
}
};

2
services/sync/tests/tps/test_bookmark_conflict.js
View File

@ -79,7 +79,7 @@ var bookmarkMods = {
};
// a list of bookmarks to delete during a 'delete' action
var bookmarksToDelete = {
bookmarksToDelete = {
"menu": [
{ folder: "foldera" },
{ folder: "folderb" },

2
services/sync/tests/unit/test_utils_deriveKey.js
View File

@ -38,7 +38,7 @@ function run_test() {
do_check_eq(cryptoSvc.decrypt(cryptoSvc.encrypt("bacon", der_key, iv), der_key, iv), "bacon");
// Base64, 16-byte output.
var der_key = Utils.deriveEncodedKeyFromPassphrase(der_passphrase, der_salt, 16);
der_key = Utils.deriveEncodedKeyFromPassphrase(der_passphrase, der_salt, 16);
_("Derived key in base64: " + der_key);
do_check_eq("d2zG0d2cBfXnRwMUGyMwyg==", der_key);
do_check_eq(cryptoSvc.decrypt(cryptoSvc.encrypt("bacon", der_key, iv), der_key, iv), "bacon");