Set ESLint one-var to error (2)

fdnk · Aug 17, 2015 · 51ed619 · 51ed619
1 parent 01dd2ac
commit 51ed619
Show file tree

Hide file tree

Showing 35 changed files with 176 additions and 155 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -149,7 +149,12 @@
         "newline-after-var": 0,
         "object-curly-spacing": [0, "never"],
         "object-shorthand": 0,
-        "one-var": 0,
+        "one-var": [2, {
+             // Exactly one declaration for uninitialized variables per function (var) or block (let or const)
+            "uninitialized": "always",
+             // Exactly one declarator per initialized variable declaration per function (var) or block (let or const)
+            "initialized": "never"
+        }],
         "operator-assignment": [0, "always"],
         "operator-linebreak": 0,
         "padded-blocks": 0,

diff --git a/lib/sinon/assert.js b/lib/sinon/assert.js
@@ -97,7 +97,8 @@
 
             callOrder: function assertCallOrder() {
                 verifyIsStub.apply(null, arguments);
-                var expected = "", actual = "";
+                var expected = "";
+                var actual = "";
 
                 if (!sinon.calledInOrder(arguments)) {
                     try {

diff --git a/lib/sinon/extend.js b/lib/sinon/extend.js
@@ -59,8 +59,8 @@
          * Returns the extended target
          */
         function extend(target /*, sources */) {
-            var sources = Array.prototype.slice.call(arguments, 1),
-                source, i, prop;
+            var sources = Array.prototype.slice.call(arguments, 1);
+            var source, i, prop;
 
             for (i = 0; i < sources.length; i++) {
                 source = sources[i];

diff --git a/lib/sinon/format.js b/lib/sinon/format.js
@@ -45,8 +45,8 @@
             return util ? format : valueFormatter;
         }
 
-        var isNode = typeof module !== "undefined" && module.exports && typeof require === "function",
-            formatter;
+        var isNode = typeof module !== "undefined" && module.exports && typeof require === "function";
+        var formatter;
 
         if (isNode) {
             try {

diff --git a/lib/sinon/mock.js b/lib/sinon/mock.js
@@ -110,7 +110,8 @@
 
             verify: function verify() {
                 var expectations = this.expectations || {};
-                var messages = [], met = [];
+                var messages = [];
+                var met = [];
 
                 each(this.proxies, function (proxy) {
                     each(expectations[proxy], function (expectation) {
@@ -134,10 +135,10 @@
             },
 
             invokeMethod: function invokeMethod(method, thisValue, args) {
-                var expectations = this.expectations && this.expectations[method] ? this.expectations[method] : [],
-                    expectationsWithMatchingArgs = [],
-                    currentArgs = args || [],
-                    i;
+                var expectations = this.expectations && this.expectations[method] ? this.expectations[method] : [];
+                var expectationsWithMatchingArgs = [];
+                var currentArgs = args || [];
+                var i, available;
 
                 for (i = 0; i < expectations.length; i += 1) {
                     var expectedArgs = expectations[i].expectedArguments || [];
@@ -153,7 +154,8 @@
                     }
                 }
 
-                var messages = [], available, exhausted = 0;
+                var messages = [];
+                var exhausted = 0;
 
                 for (i = 0; i < expectationsWithMatchingArgs.length; i += 1) {
                     if (expectationsWithMatchingArgs[i].allowsCall(thisValue, args)) {

diff --git a/lib/sinon/sandbox.js b/lib/sinon/sandbox.js
@@ -115,7 +115,9 @@
                 sandbox.args = sandbox.args || [];
                 sandbox.injectedKeys = [];
                 sandbox.injectInto = config.injectInto;
-                var prop, value, exposed = sandbox.inject({});
+                var prop,
+                    value;
+                var exposed = sandbox.inject({});
 
                 if (config.properties) {
                     for (var i = 0, l = config.properties.length; i < l; i++) {

diff --git a/lib/sinon/stub.js b/lib/sinon/stub.js
@@ -21,7 +21,8 @@
                 throw new TypeError("Custom stub should be a function or a property descriptor");
             }
 
-            var wrapper;
+            var wrapper,
+                prop;
 
             if (func) {
                 if (typeof func === "function") {
@@ -48,7 +49,7 @@
             }
 
             if (typeof property === "undefined" && typeof object === "object") {
-                for (var prop in object) {
+                for (prop in object) {
                     if (typeof sinon.getPropertyDescriptor(object, prop).value === "function") {
                         stub(object, prop);
                     }

diff --git a/lib/sinon/test_case.js b/lib/sinon/test_case.js
@@ -47,9 +47,12 @@
 
             prefix = prefix || "test";
             var rPrefix = new RegExp("^" + prefix);
-            var methods = {}, testName, property, method;
+            var methods = {};
             var setUp = tests.setUp;
             var tearDown = tests.tearDown;
+            var testName,
+                property,
+                method;
 
             for (testName in tests) {
                 if (tests.hasOwnProperty(testName) && !/^(setUp|tearDown)$/.test(testName)) {

diff --git a/lib/sinon/util/core.js b/lib/sinon/util/core.js
@@ -92,16 +92,15 @@
                 }
             }
 
-            var error, wrappedMethod;
+            var error, wrappedMethod, i;
 
             // IE 8 does not support hasOwnProperty on the window object and Firefox has a problem
             // when using hasOwn.call on objects from other frames.
             var owned = object.hasOwnProperty ? object.hasOwnProperty(property) : hasOwn.call(object, property);
 
             if (hasES5Support) {
-                var methodDesc = (typeof method === "function") ? {value: method} : method,
-                    wrappedMethodDesc = sinon.getPropertyDescriptor(object, property),
-                    i;
+                var methodDesc = (typeof method === "function") ? {value: method} : method;
+                var wrappedMethodDesc = sinon.getPropertyDescriptor(object, property);
 
                 if (!wrappedMethodDesc) {
                     error = new TypeError("Attempted to wrap " + (typeof wrappedMethod) + " property " +
@@ -212,7 +211,9 @@
                 return a.valueOf() === b.valueOf();
             }
 
-            var prop, aLength = 0, bLength = 0;
+            var prop;
+            var aLength = 0;
+            var bLength = 0;
 
             if (aString === "[object Array]" && a.length !== b.length) {
                 return false;
@@ -258,7 +259,9 @@
 
         sinon.functionToString = function toString() {
             if (this.getCall && this.callCount) {
-                var thisValue, prop, i = this.callCount;
+                var thisValue,
+                    prop;
+                var i = this.callCount;
 
                 while (i--) {
                     thisValue = this.getCall(i).thisValue;
@@ -291,7 +294,9 @@
         };
 
         sinon.getPropertyDescriptor = function getPropertyDescriptor(object, property) {
-            var proto = object, descriptor;
+            var proto = object;
+            var descriptor;
+
             while (proto && !(descriptor = Object.getOwnPropertyDescriptor(proto, property))) {
                 proto = Object.getPrototypeOf(proto);
             }

diff --git a/lib/sinon/util/fake_server.js b/lib/sinon/util/fake_server.js
@@ -91,8 +91,9 @@
                     "autoRespondAfter": true,
                     "respondImmediately": true,
                     "fakeHTTPMethods": true
-                },
-                setting;
+                };
+                var setting;
+
                 config = config || {};
                 for (setting in config) {
                     if (whitelist.hasOwnProperty(setting) && config.hasOwnProperty(setting)) {

diff --git a/lib/sinon/util/fake_timers.js b/lib/sinon/util/fake_timers.js
@@ -23,7 +23,8 @@
         var llx = typeof lolex !== "undefined" ? lolex : lol;
 
         s.useFakeTimers = function () {
-            var now, methods = Array.prototype.slice.call(arguments);
+            var now;
+            var methods = Array.prototype.slice.call(arguments);
 
             if (typeof methods[0] === "string") {
                 now = 0;

diff --git a/test/assert-test.js b/test/assert-test.js
@@ -1,10 +1,10 @@
 (function (root) {
     "use strict";
 
-    var buster = root.buster || require("buster"),
-        sinon = root.sinon || require("../lib/sinon"),
-        assert = buster.assert,
-        refute = buster.refute;
+    var buster = root.buster || require("buster");
+    var sinon = root.sinon || require("../lib/sinon");
+    var assert = buster.assert;
+    var refute = buster.refute;
 
     buster.testCase("sinon.assert", {
         setUp: function () {

diff --git a/test/call-test.js b/test/call-test.js
@@ -1,10 +1,10 @@
 (function (root) {
     "use strict";
 
-    var buster = root.buster || require("buster"),
-        sinon = root.sinon || require("../lib/sinon"),
-        assert = buster.assert,
-        refute = buster.refute;
+    var buster = root.buster || require("buster");
+    var sinon = root.sinon || require("../lib/sinon");
+    var assert = buster.assert;
+    var refute = buster.refute;
 
     function spyCallSetUp() {
         this.thisValue = {};

diff --git a/test/collection-test.js b/test/collection-test.js
@@ -1,9 +1,9 @@
 (function (root) {
     "use strict";
 
-    var buster = root.buster || require("buster"),
-        sinon = root.sinon || require("../lib/sinon"),
-        assert = buster.assert;
+    var buster = root.buster || require("buster");
+    var sinon = root.sinon || require("../lib/sinon");
+    var assert = buster.assert;
 
     buster.testCase("sinon.collection", {
         "creates fake collection": function () {

diff --git a/test/extend-test.js b/test/extend-test.js
@@ -1,9 +1,9 @@
 (function (root) {
     "use strict";
 
-    var buster = root.buster || require("buster"),
-        sinon = root.sinon || require("../lib/sinon"),
-        assert = buster.assert;
+    var buster = root.buster || require("buster");
+    var sinon = root.sinon || require("../lib/sinon");
+    var assert = buster.assert;
 
     buster.testCase("sinon.extend", {
         "should return unaltered target when only one argument": function () {
@@ -26,29 +26,29 @@
 
         "should copy toString method into target": function () {
             var target = {
-                    hello: "world",
-                    toString: function () {
-                        return "hello world";
-                    }
-                },
-                source = {
-                    toString: function () {
-                        return "hello source";
-                    }
-                };
+                hello: "world",
+                toString: function () {
+                    return "hello world";
+                }
+            };
+            var source = {
+                toString: function () {
+                    return "hello source";
+                }
+            };
 
             sinon.extend(target, source);
 
             assert.same(target.toString, source.toString);
         },
 
         "must copy the last occuring property into the target": function () {
-            var target = { a: 0, b: 0, c: 0, d: 0 },
-                source1 = { a: 1, b: 1, c: 1 },
-                source2 = { a: 2, b: 2 },
-                soruce3 = { a: 3 };
+            var target = { a: 0, b: 0, c: 0, d: 0 };
+            var source1 = { a: 1, b: 1, c: 1 };
+            var source2 = { a: 2, b: 2 };
+            var source3 = { a: 3 };
 
-            sinon.extend(target, source1, source2, soruce3);
+            sinon.extend(target, source1, source2, source3);
 
             assert.equals(target.a, 3);
             assert.equals(target.b, 2);

diff --git a/test/format-test.js b/test/format-test.js
@@ -1,9 +1,9 @@
 (function (root) {
     "use strict";
 
-    var buster = root.buster || require("buster"),
-        sinon = root.sinon || require("../lib/sinon"),
-        assert = buster.assert;
+    var buster = root.buster || require("buster");
+    var sinon = root.sinon || require("../lib/sinon");
+    var assert = buster.assert;
 
     buster.testCase("sinon.format", {
         "formats with formatio by default": function () {

diff --git a/test/hello-world-test.js b/test/hello-world-test.js
@@ -1,8 +1,10 @@
+// this is a very simple testcase primarily used for debugging
+// issues with the AMD setup
 (function (root) {
     "use strict";
 
-    var buster = root.buster || require("buster"),
-        assert = buster.assert;
+    var buster = root.buster || require("buster");
+    var assert = buster.assert;
 
     buster.testCase("hello world", {
         "hello world test": function () {

diff --git a/test/issues/issues-test.js b/test/issues/issues-test.js
@@ -1,10 +1,10 @@
 (function (root) {
     "use strict";
 
-    var buster = root.buster || require("buster"),
-        sinon = root.sinon || require("../../lib/sinon"),
-        assert = buster.assert,
-        refute = buster.refute;
+    var buster = root.buster || require("buster");
+    var sinon = root.sinon || require("../../lib/sinon");
+    var assert = buster.assert;
+    var refute = buster.refute;
 
     buster.testCase("issues", {
         setUp: function () {

diff --git a/test/log-error-test.js b/test/log-error-test.js
@@ -1,9 +1,9 @@
 (function (root) {
     "use strict";
 
-    var buster = root.buster || require("buster"),
-        sinon = root.sinon || require("../lib/sinon"),
-        assert = buster.assert;
+    var buster = root.buster || require("buster");
+    var sinon = root.sinon || require("../lib/sinon");
+    var assert = buster.assert;
 
     buster.testCase("sinon.log", {
         "is a function": function () {
@@ -27,10 +27,10 @@
         },
 
         "calls sinon.log with a String": function () {
-            var spy = this.sandbox.spy(sinon, "log"),
-                name = "Quisque consequat, elit id suscipit.",
-                message = "Pellentesque gravida orci in tellus tristique, ac commodo nibh congue.",
-                error = new Error();
+            var spy = this.sandbox.spy(sinon, "log");
+            var name = "Quisque consequat, elit id suscipit.";
+            var message = "Pellentesque gravida orci in tellus tristique, ac commodo nibh congue.";
+            var error = new Error();
 
             error.name = name;
             error.message = message;

diff --git a/test/match-test.js b/test/match-test.js
@@ -1,9 +1,9 @@
 (function (root) {
     "use strict";
 
-    var buster = root.buster || require("buster"),
-        sinon = root.sinon || require("../lib/sinon"),
-        assert = buster.assert;
+    var buster = root.buster || require("buster");
+    var sinon = root.sinon || require("../lib/sinon");
+    var assert = buster.assert;
 
     function propertyMatcherTests(matcher) {
         return {

diff --git a/test/mock-test.js b/test/mock-test.js
@@ -1,10 +1,10 @@
 (function (root) {
     "use strict";
 
-    var buster = root.buster || require("buster"),
-        sinon = root.sinon || require("../lib/sinon"),
-        assert = buster.assert,
-        refute = buster.refute;
+    var buster = root.buster || require("buster");
+    var sinon = root.sinon || require("../lib/sinon");
+    var assert = buster.assert;
+    var refute = buster.refute;
 
     buster.testCase("sinon.mock", {
         ".create": {