Merge pull request #84 from tclindner/fix-79

Fix check for root node in the event it does not exist

Author: tclindner

CHANGELOG.md

@@ -11,6 +11,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Removed
 
+
+## [3.0.1] - 2018-05-14
+### Fixed
+- Addressed issue, from @ntwb, [#79](https://github.com/tclindner/npm-package-json-lint/issues/79).
+
+
 ## [3.0.0] - 2018-05-09
 ### Added
 - Added support for glob based package.json file detection. Addresses [#74](https://github.com/tclindner/npm-package-json-lint/issues/74) from @dnepro.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-package-json-lint",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "Configurable linter for package.json files.",
   "keywords": [
     "lint",

src/Config.js

@@ -128,9 +128,9 @@ class Config {
         config = ConfigFile.load(javaScriptConfigFilePath, this);
       }
 
-      if (config.hasOwnProperty('root') && !config.root) {
-        const parentDir = path.resolve(directory, '../');
-        const parentConfig = this.getProjectHierarchyConfig(parentDir);
+      if (!config.hasOwnProperty('root') || !config.root) {
+        const parentPackageJsonFile = path.resolve(directory, '../', 'package.json');
+        const parentConfig = this.getProjectHierarchyConfig(parentPackageJsonFile);
 
         // Merge base object
         const mergedConfig = Object.assign({}, parentConfig, config);

tests/fixtures/hierarchyWithoutRoot/package.json

@@ -0,0 +1,24 @@
+{
+  "name": "npm-package-json-lint",
+  "version": "0.1.0",
+  "description": "CLI app for linting package.json files.",
+  "keywords": [
+    "lint"
+  ],
+  "homepage": "https://github.com/tclindner/npm-package-json-lint",
+  "author": "Thomas Lindner",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/tclindner/npm-package-json-lint"
+  },
+  "devDependencies": {
+    "mocha": "^2.4.5"
+  },
+  "npmPackageJsonLintConfig": {
+    "root": true,
+    "rules": {
+      "require-author": "off",
+      "version-format": "error"
+    }
+  }
+}

tests/fixtures/hierarchyWithoutRoot/subdirectory/package.json

@@ -0,0 +1,22 @@
+{
+  "name": "npm-package-json-lint",
+  "version": "0.1.0",
+  "description": "CLI app for linting package.json files.",
+  "keywords": [
+    "lint"
+  ],
+  "homepage": "https://github.com/tclindner/npm-package-json-lint",
+  "author": "Thomas Lindner",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/tclindner/npm-package-json-lint"
+  },
+  "devDependencies": {
+    "mocha": "^2.4.5"
+  },
+  "npmPackageJsonLintConfig": {
+    "rules": {
+      "require-author": "error"
+    }
+  }
+}

tests/unit/Config.test.js

@@ -752,6 +752,28 @@ describe('Config Unit Tests', function() {
         ConfigFile.load.restore();
       });
 
+      it('and package.json prop exists and root is not set, the config object should returned', function() {
+        const options = {
+          configFile: '',
+          cwd: process.cwd(),
+          useConfigFiles: false,
+          rules: {}
+        };
+        const config = new Config(options, linterContext);
+
+        const expectedConfigObj = {
+          root: true,
+          rules: {
+            'require-author': 'error',
+            'version-format': 'error'
+          }
+        };
+        const filePath = './tests/fixtures/hierarchyWithoutRoot/subdirectory/package.json';
+        const result = config.getProjectHierarchyConfig(filePath);
+
+        result.should.deep.equal(expectedConfigObj);
+      });
+
       it('and package.json prop exists and has no prop, the config object should returned', function() {
         const options = {
           configFile: '',
@@ -775,9 +797,10 @@ describe('Config Unit Tests', function() {
           }
         });
         stubLoadPkgJson.returns({root: true, rules: {}});
-        stubLoad.returns({rules: {'require-name': 'error'}});
+        stubLoad.returns({root: true, rules: {'require-name': 'error'}});
 
         const expectedConfigObj = {
+          root: true,
           rules: {
             'require-name': 'error'
           }
@@ -1009,7 +1032,8 @@ describe('Config Unit Tests', function() {
         const stubLoadPkgJson = sinon.stub(ConfigFile, 'loadFromPackageJson');
         const stubLoad = sinon.stub(ConfigFile, 'load');
 
-        stubDirname.returns('./npm-package-json-lint/');
+        stubDirname.onCall(0).returns('./npm-package-json-lint/');
+        stubDirname.onCall(1).returns('/home');
         stubExists.returns(false);
 
         const expectedConfigObj = {
@@ -1018,7 +1042,7 @@ describe('Config Unit Tests', function() {
         const filePath = './package.json';
         const result = config.getProjectHierarchyConfig(filePath);
 
-        stubDirname.calledOnce.should.be.true;
+        stubDirname.calledTwice.should.be.true;
         stubDirname.firstCall.calledWithExactly(filePath).should.be.true;
 
         stubExists.calledThrice.should.be.true;
@@ -1056,7 +1080,8 @@ describe('Config Unit Tests', function() {
         const stubLoadPkgJson = sinon.stub(ConfigFile, 'loadFromPackageJson');
         const stubLoad = sinon.stub(ConfigFile, 'load');
 
-        stubDirname.returns('./npm-package-json-lint/');
+        stubDirname.onCall(0).returns('./npm-package-json-lint/');
+        stubDirname.onCall(1).returns('/home');
         stubExists.returns(true);
         stubStats.returns({
           isFile: function() {
@@ -1073,7 +1098,7 @@ describe('Config Unit Tests', function() {
         const filePath = './package.json';
         const result = config.getProjectHierarchyConfig(filePath);
 
-        stubDirname.calledOnce.should.be.true;
+        stubDirname.calledTwice.should.be.true;
         stubDirname.firstCall.calledWithExactly(filePath).should.be.true;
 
         stubExists.calledOnce.should.be.true;