Bug 1330791 - Enable the no-mixed-spaces-and-tabs rule and fix the associated errors. r=markh
authorJared Wein <jwein@mozilla.com>
Thu, 12 Jan 2017 17:24:41 -0500
changeset 377603 6caa811ef3d70476aa42ce35471d35cad23a0a6d
parent 377602 ddad29b58dc109550461240152afc473056e3c2d
child 377604 e7eb16354b019068369f7eb7df22e9f23aae181a
push id1419
push userjlund@mozilla.com
push dateMon, 10 Apr 2017 20:44:07 +0000
treeherdermozilla-release@5e6801b73ef6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmarkh
bugs1330791
milestone53.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1330791 - Enable the no-mixed-spaces-and-tabs rule and fix the associated errors. r=markh MozReview-Commit-ID: D1CTiez7BDy
services/.eslintrc.js
services/cloudsync/tests/xpcshell/test_bookmarks.js
--- a/services/.eslintrc.js
+++ b/services/.eslintrc.js
@@ -11,17 +11,16 @@ module.exports = {
     "brace-style": "warn",
     "consistent-return": "warn",
     "no-cond-assign": "warn",
     "no-else-return": "warn",
     "no-empty": "warn",
     "no-ex-assign": "warn",
     "no-func-assign": "warn",
     "no-irregular-whitespace": "warn",
-    "no-mixed-spaces-and-tabs": "warn",
     "no-native-reassign": "warn",
     "no-nested-ternary": "warn",
     "no-octal": "warn",
     "no-redeclare": "warn",
     "no-unreachable": "warn",
     "no-unsafe-finally": "warn",
     "no-unused-vars": "warn",
     "no-useless-call": "warn"
--- a/services/cloudsync/tests/xpcshell/test_bookmarks.js
+++ b/services/cloudsync/tests/xpcshell/test_bookmarks.js
@@ -1,73 +1,69 @@
 /* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
+* http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
 Cu.import("resource://gre/modules/CloudSync.jsm");
 
 function run_test() {
   run_next_test();
 }
 
-function cleanup() {
-
-}
-
 add_task(function* test_merge_bookmarks_flat() {
   try {
-	  let rootFolder = yield CloudSync().bookmarks.getRootFolder("TEST");
-	  ok(rootFolder.id, "root folder id is ok");
+    let rootFolder = yield CloudSync().bookmarks.getRootFolder("TEST");
+    ok(rootFolder.id, "root folder id is ok");
 
-	  let items = [
-		{"id":"G_UL4ZhOyX8m", "type":rootFolder.BOOKMARK, "title":"reddit: the front page of the internet 1", "uri":"http://www.reddit.com", index:2},
-		{"id":"G_UL4ZhOyX8n", "type":rootFolder.BOOKMARK, "title":"reddit: the front page of the internet 2", "uri":"http://www.reddit.com?1", index:1},
-	  ];
-	  yield rootFolder.mergeRemoteItems(items);
+    let items = [
+      {"id":"G_UL4ZhOyX8m", "type":rootFolder.BOOKMARK, "title":"reddit: the front page of the internet 1", "uri":"http://www.reddit.com", index:2},
+      {"id":"G_UL4ZhOyX8n", "type":rootFolder.BOOKMARK, "title":"reddit: the front page of the internet 2", "uri":"http://www.reddit.com?1", index:1},
+    ];
+    yield rootFolder.mergeRemoteItems(items);
 
-	  let localItems = yield rootFolder.getLocalItems();
-	  equal(Object.keys(localItems).length, items.length, "found merged items");
+    let localItems = yield rootFolder.getLocalItems();
+    equal(Object.keys(localItems).length, items.length, "found merged items");
   } finally {
-  	yield CloudSync().bookmarks.deleteRootFolder("TEST");
+    yield CloudSync().bookmarks.deleteRootFolder("TEST");
   }
 });
 
 add_task(function* test_merge_bookmarks_in_folders() {
   try {
-	  let rootFolder = yield CloudSync().bookmarks.getRootFolder("TEST");
-	  ok(rootFolder.id, "root folder id is ok");
+    let rootFolder = yield CloudSync().bookmarks.getRootFolder("TEST");
+    ok(rootFolder.id, "root folder id is ok");
 
-	  let items = [
-	  	{"id":"G_UL4ZhOyX8m", "type":rootFolder.BOOKMARK, "title":"reddit: the front page of the internet 1", "uri":"http://www.reddit.com", index:2},
-	    {"id":"G_UL4ZhOyX8n", "type":rootFolder.BOOKMARK, parent:"G_UL4ZhOyX8x", "title":"reddit: the front page of the internet 2", "uri":"http://www.reddit.com/?a=å%20ä%20ö", index:1},
-	    {"id":"G_UL4ZhOyX8x", "type":rootFolder.FOLDER},
-	  ];
-	  yield rootFolder.mergeRemoteItems(items);
+    let items = [
+      {"id":"G_UL4ZhOyX8m", "type":rootFolder.BOOKMARK, "title":"reddit: the front page of the internet 1", "uri":"http://www.reddit.com", index:2},
+      {"id":"G_UL4ZhOyX8n", "type":rootFolder.BOOKMARK, parent:"G_UL4ZhOyX8x", "title":"reddit: the front page of the internet 2", "uri":"http://www.reddit.com/?a=å%20ä%20ö", index:1},
+      {"id":"G_UL4ZhOyX8x", "type":rootFolder.FOLDER},
+    ];
+    yield rootFolder.mergeRemoteItems(items);
 
-	  let localItems = yield rootFolder.getLocalItems();
-	  equal(localItems.length, items.length, "found merged items");
+    let localItems = yield rootFolder.getLocalItems();
+    equal(localItems.length, items.length, "found merged items");
 
-	  localItems.forEach(function(item) {
-	    ok(item.id == "G_UL4ZhOyX8m" ||
-	       item.id == "G_UL4ZhOyX8n" ||
-	       item.id == "G_UL4ZhOyX8x");
-	    if (item.id == "G_UL4ZhOyX8n") {
-	    	equal(item.parent, "G_UL4ZhOyX8x")
-	    } else {
-	    	equal(item.parent, rootFolder.id);
-	    }
-	  });
+    localItems.forEach(function(item) {
+      ok(item.id == "G_UL4ZhOyX8m" ||
+         item.id == "G_UL4ZhOyX8n" ||
+         item.id == "G_UL4ZhOyX8x");
+      if (item.id == "G_UL4ZhOyX8n") {
+        equal(item.parent, "G_UL4ZhOyX8x")
+      } else {
+        equal(item.parent, rootFolder.id);
+      }
+    });
 
-	  let folder = (yield rootFolder.getLocalItemsById(["G_UL4ZhOyX8x"]))[0];
-	  equal(folder.id, "G_UL4ZhOyX8x");
-	  equal(folder.type, rootFolder.FOLDER);
+    let folder = (yield rootFolder.getLocalItemsById(["G_UL4ZhOyX8x"]))[0];
+    equal(folder.id, "G_UL4ZhOyX8x");
+    equal(folder.type, rootFolder.FOLDER);
 
-	  let bookmark = (yield rootFolder.getLocalItemsById(["G_UL4ZhOyX8n"]))[0];
-	  equal(bookmark.id, "G_UL4ZhOyX8n");
-	  equal(bookmark.parent, "G_UL4ZhOyX8x");
-	  equal(bookmark.title, "reddit: the front page of the internet 2");
-	  equal(bookmark.index, 0);
-	  equal(bookmark.uri, "http://www.reddit.com/?a=%C3%A5%20%C3%A4%20%C3%B6");
+    let bookmark = (yield rootFolder.getLocalItemsById(["G_UL4ZhOyX8n"]))[0];
+    equal(bookmark.id, "G_UL4ZhOyX8n");
+    equal(bookmark.parent, "G_UL4ZhOyX8x");
+    equal(bookmark.title, "reddit: the front page of the internet 2");
+    equal(bookmark.index, 0);
+    equal(bookmark.uri, "http://www.reddit.com/?a=%C3%A5%20%C3%A4%20%C3%B6");
   } finally {
-	yield CloudSync().bookmarks.deleteRootFolder("TEST");
+    yield CloudSync().bookmarks.deleteRootFolder("TEST");
   }
 });