Bump package dependencies (#70)

* chore(package): Bump dependencies, regenerate yarn.lock * style: Fix linting errors due to incorrect spacing * refactor: Update tests for sinon 2 syntax(sinon.stub)
cosmiconfig · Jul 21, 2017 · b572915 · b572915
1 parent 9d2ae4e
commit b572915
Show file tree

Hide file tree

Showing 7 changed files with 2,152 additions and 2,019 deletions.
diff --git a/lib/createExplorer.js b/lib/createExplorer.js
@@ -40,7 +40,7 @@ module.exports = function (options) {
       }
       var result = (!options.sync)
         ? loadDefinedFile(absoluteConfigPath, options)
-            .then(transform)
+          .then(transform)
         :  transform(loadDefinedFile(absoluteConfigPath, options));
       if (fileCache) fileCache.set(absoluteConfigPath, result);
       return result;
@@ -59,10 +59,10 @@ module.exports = function (options) {
           return searchDirectory(directory);
         })
       : searchDirectory(
-          isDir.sync(absoluteSearchPath)
+        isDir.sync(absoluteSearchPath)
           ? absoluteSearchPath
           : path.dirname(absoluteSearchPath)
-        );
+      );
   }
 
   function searchDirectory(directory) {

diff --git a/package.json b/package.json
@@ -35,24 +35,24 @@
   "dependencies": {
     "is-directory": "^0.3.1",
     "is-promise": "^2.1.0",
-    "js-yaml": "^3.4.3",
+    "js-yaml": "^3.9.0",
     "minimist": "^1.2.0",
-    "object-assign": "^4.1.0",
+    "object-assign": "^4.1.1",
     "os-homedir": "^1.0.1",
     "parse-json": "^2.2.0",
     "require-from-string": "^1.1.0"
   },
   "devDependencies": {
-    "eslint": "^3.13.0",
+    "eslint": "^4.2.0",
     "eslint-config-davidtheclark-node": "^0.2.0",
     "eslint-plugin-node": "^3.0.5",
     "expect": "^1.20.2",
     "lodash": "^4.17.4",
-    "node-version-check": "^2.1.1",
-    "nyc": "^10.0.0",
-    "sinon": "^1.17.7",
+    "node-version-check": "^2.2.0",
+    "nyc": "^11.0.3",
+    "sinon": "^2.3.8",
     "tap-spec": "^4.1.1",
-    "tape": "^4.6.3"
+    "tape": "^4.7.0"
   },
   "engines": {
     "node": ">=0.12"

diff --git a/test/caches.test.js b/test/caches.test.js
@@ -26,7 +26,7 @@ function statStubIsDirectory(result) {
     },
   });
 
-  statSyncStub = sinon.stub(fs, 'statSync', function () {
+  statSyncStub = sinon.stub(fs, 'statSync').callsFake(function () {
     return {
       isDirectory: function () {
         return result;
@@ -70,7 +70,7 @@ function setup() {
         callback(new Error('irrelevant path ' + searchPath));
     }
   }
-  readFileStub = sinon.stub(fs, 'readFile', readFile);
+  readFileStub = sinon.stub(fs, 'readFile').callsFake(readFile);
 
   readFileSyncStub = makeReadFileSyncStub(readFile);
 }

diff --git a/test/failed-directories.test.js b/test/failed-directories.test.js
@@ -24,7 +24,7 @@ function setup() {
     },
   });
 
-  statSyncStub = sinon.stub(fs, 'statSync', function () {
+  statSyncStub = sinon.stub(fs, 'statSync').callsFake(function () {
     return {
       isDirectory: function () {
         return true;
@@ -61,7 +61,7 @@ test('do not find file, and give up', function (assert) {
         callback(new Error('irrelevant path ' + searchPath));
     }
   }
-  readFileStub = sinon.stub(fs, 'readFile', readFile);
+  readFileStub = sinon.stub(fs, 'readFile').callsFake(readFile);
   readFileSyncStub = makeReadFileSyncStub(readFile);
 
   function doAsserts(result, readFileStub, statStub) { // intentional shadowing
@@ -132,7 +132,7 @@ test('stop at stopDir, and give up', function (assert) {
         callback(new Error('irrelevant path ' + searchPath));
     }
   }
-  readFileStub = sinon.stub(fs, 'readFile', readFile);
+  readFileStub = sinon.stub(fs, 'readFile').callsFake(readFile);
   readFileSyncStub = makeReadFileSyncStub(readFile);
 
   function doAsserts(result, stub) {
@@ -189,7 +189,7 @@ test('find invalid YAML in rc file', function (assert) {
         callback(new Error('irrelevant path ' + searchPath));
     }
   }
-  readFileStub = sinon.stub(fs, 'readFile', readFile);
+  readFileStub = sinon.stub(fs, 'readFile').callsFake(readFile);
   readFileSyncStub = makeReadFileSyncStub(readFile);
 
   function doAsserts(error) {
@@ -234,7 +234,7 @@ test('find invalid JSON in rc file with rcStrictJson', function (assert) {
         callback(new Error('irrelevant path ' + searchPath));
     }
   }
-  readFileStub = sinon.stub(fs, 'readFile', readFile);
+  readFileStub = sinon.stub(fs, 'readFile').callsFake(readFile);
   readFileSyncStub = makeReadFileSyncStub(readFile);
 
   function doAsserts(error) {
@@ -278,7 +278,7 @@ test('find invalid package.json', function (assert) {
         callback(new Error('irrelevant path ' + searchPath));
     }
   }
-  readFileStub = sinon.stub(fs, 'readFile', readFile);
+  readFileStub = sinon.stub(fs, 'readFile').callsFake(readFile);
   readFileSyncStub = makeReadFileSyncStub(readFile);
 
   function doAsserts(error) {
@@ -324,7 +324,7 @@ test('find invalid JS in .config.js file', function (assert) {
         callback(new Error('irrelevant path ' + searchPath));
     }
   }
-  readFileStub = sinon.stub(fs, 'readFile', readFile);
+  readFileStub = sinon.stub(fs, 'readFile').callsFake(readFile);
   readFileSyncStub = makeReadFileSyncStub(readFile);
 
   function doAsserts(error) {
@@ -370,7 +370,7 @@ test('with rcExtensions, find invalid JSON in .foorc.json', function (assert) {
         callback(new Error('irrelevant path ' + searchPath));
     }
   }
-  readFileStub = sinon.stub(fs, 'readFile', readFile);
+  readFileStub = sinon.stub(fs, 'readFile').callsFake(readFile);
   readFileSyncStub = makeReadFileSyncStub(readFile);
 
   function doAsserts(error) {
@@ -419,7 +419,7 @@ test('with rcExtensions, find invalid YAML in .foorc.yaml', function (assert) {
         callback(new Error('irrelevant path ' + searchPath));
     }
   }
-  readFileStub = sinon.stub(fs, 'readFile', readFile);
+  readFileStub = sinon.stub(fs, 'readFile').callsFake(readFile);
   readFileSyncStub = makeReadFileSyncStub(readFile);
 
   function doAsserts(error) {
@@ -468,7 +468,7 @@ test('with rcExtensions, find invalid YAML in .foorc.yml', function (assert) {
         callback(new Error('irrelevant path ' + searchPath));
     }
   }
-  readFileStub = sinon.stub(fs, 'readFile', readFile);
+  readFileStub = sinon.stub(fs, 'readFile').callsFake(readFile);
   readFileSyncStub = makeReadFileSyncStub(readFile);
 
   function doAsserts(error) {
@@ -519,7 +519,7 @@ test('with rcExtensions, find invalid JS in .foorc.js', function (assert) {
         callback(new Error('irrelevant path ' + searchPath));
     }
   }
-  readFileStub = sinon.stub(fs, 'readFile', readFile);
+  readFileStub = sinon.stub(fs, 'readFile').callsFake(readFile);
   readFileSyncStub = makeReadFileSyncStub(readFile);
 
   function doAsserts(error) {

diff --git a/test/makeReadFileSyncStub.js b/test/makeReadFileSyncStub.js
@@ -5,9 +5,7 @@ var fs = require('fs');
 var sinon = require('sinon');
 
 module.exports = function makeReadFileSyncStub(readFile) {
-  return sinon.stub(
-    fs,
-    'readFileSync',
+  return sinon.stub(fs, 'readFileSync').callsFake(
     function readFileSync(search, encoding) {
       var errSync, contentsSync;
 

diff --git a/test/successful-directories.test.js b/test/successful-directories.test.js
@@ -24,7 +24,7 @@ function setup() {
     },
   });
 
-  statSyncStub = sinon.stub(fs, 'statSync', function () {
+  statSyncStub = sinon.stub(fs, 'statSync').callsFake(function () {
     return {
       isDirectory: function () {
         return true;
@@ -64,7 +64,7 @@ test('find rc file in third searched dir, with a package.json lacking prop', fun
         callback(new Error('irrelevant path ' + searchPath));
     }
   }
-  readFileStub = sinon.stub(fs, 'readFile', readFile);
+  readFileStub = sinon.stub(fs, 'readFile').callsFake(readFile);
   readFileSyncStub = makeReadFileSyncStub(readFile);
 
   function doAsserts(result, stub) {
@@ -126,7 +126,7 @@ test('find package.json prop in second searched dir', function (assert) {
         callback(new Error('irrelevant path ' + searchPath));
     }
   }
-  readFileStub = sinon.stub(fs, 'readFile', readFile);
+  readFileStub = sinon.stub(fs, 'readFile').callsFake(readFile);
   readFileSyncStub = makeReadFileSyncStub(readFile);
 
   function doAsserts(result, stub) {
@@ -184,7 +184,7 @@ test('find JS file in first searched dir', function (assert) {
         callback(new Error('irrelevant path ' + searchPath));
     }
   }
-  readFileStub = sinon.stub(fs, 'readFile', readFile);
+  readFileStub = sinon.stub(fs, 'readFile').callsFake(readFile);
   readFileSyncStub = makeReadFileSyncStub(readFile);
 
   function doAsserts(result, stub) {
@@ -239,7 +239,7 @@ test('find package.json in second directory searched, with alternate names', fun
         callback(new Error('irrelevant path ' + searchPath));
     }
   }
-  readFileStub = sinon.stub(fs, 'readFile', readFile);
+  readFileStub = sinon.stub(fs, 'readFile').callsFake(readFile);
   readFileSyncStub = makeReadFileSyncStub(readFile);
 
   function doAsserts(result, stub) {
@@ -305,7 +305,7 @@ test('find rc file in third searched dir, skipping packageProp, with rcStrictJso
         callback(new Error('irrelevant path ' + searchPath));
     }
   }
-  readFileStub = sinon.stub(fs, 'readFile', readFile);
+  readFileStub = sinon.stub(fs, 'readFile').callsFake(readFile);
   readFileSyncStub = makeReadFileSyncStub(readFile);
 
   function doAsserts(result, stub) {
@@ -368,7 +368,7 @@ test('find package.json prop in second searched dir, skipping js and rc', functi
         callback(new Error('irrelevant path ' + searchPath));
     }
   }
-  readFileStub = sinon.stub(fs, 'readFile', readFile);
+  readFileStub = sinon.stub(fs, 'readFile').callsFake(readFile);
   readFileSyncStub = makeReadFileSyncStub(readFile);
 
   function doAsserts(result, stub) {
@@ -434,7 +434,7 @@ test('with rcExtensions, find .foorc.json in second searched dir', function (ass
         callback(new Error('irrelevant path ' + searchPath));
     }
   }
-  readFileStub = sinon.stub(fs, 'readFile', readFile);
+  readFileStub = sinon.stub(fs, 'readFile').callsFake(readFile);
   readFileSyncStub = makeReadFileSyncStub(readFile);
 
   function doAsserts(result, stub) {
@@ -498,7 +498,7 @@ test('with rcExtensions, find .foorc.yaml in first searched dir', function (asse
         callback(new Error('irrelevant path ' + searchPath));
     }
   }
-  readFileStub = sinon.stub(fs, 'readFile', readFile);
+  readFileStub = sinon.stub(fs, 'readFile').callsFake(readFile);
   readFileSyncStub = makeReadFileSyncStub(readFile);
 
   function doAsserts(result, stub) {
@@ -557,7 +557,7 @@ test('with rcExtensions, find .foorc.yml in first searched dir', function (asser
         callback(new Error('irrelevant path ' + searchPath));
     }
   }
-  readFileStub = sinon.stub(fs, 'readFile', readFile);
+  readFileStub = sinon.stub(fs, 'readFile').callsFake(readFile);
   readFileSyncStub = makeReadFileSyncStub(readFile);
 
   function doAsserts(result, stub) {
@@ -618,7 +618,7 @@ test('with rcExtensions, find .foorc.js in first searched dir', function (assert
         callback(new Error('irrelevant path ' + searchPath));
     }
   }
-  readFileStub = sinon.stub(fs, 'readFile', readFile);
+  readFileStub = sinon.stub(fs, 'readFile').callsFake(readFile);
   readFileSyncStub = makeReadFileSyncStub(readFile);
 
   function doAsserts(result, stub) {