[fixes #114] - Custom URL/File parsing skipped if file found on disk

davglass · Jul 18, 2017 · ef812c1 · ef812c1
1 parent a1bf8f1
commit ef812c1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/lib/index.js b/lib/index.js
@@ -178,7 +178,7 @@ var flatten = function(options) {
         /*istanbul ignore else*/
         if (fs.lstatSync(licenseFile).isFile()) {
             var content;
-            if (!moduleInfo.licenses || moduleInfo.licenses.indexOf(UNKNOWN) > -1) {
+            if (!moduleInfo.licenses || moduleInfo.licenses.indexOf(UNKNOWN) > -1 || moduleInfo.licenses.indexOf('Custom:') === 0) {
                 //Only re-check the license if we didn't get it from elsewhere
                 content = fs.readFileSync(licenseFile, { encoding: 'utf8' });
                 moduleInfo.licenses = license(content);

diff --git a/package.json b/package.json
@@ -60,6 +60,7 @@
     "github-changes": "^1.0.4",
     "istanbul": "^0.4.3",
     "jenkins-mocha": "^2.6.0",
+    "locale": "^0.1.0",
     "queue": "^1.0.0",
     "request": "^2.34.0",
     "rimraf": "^2.5.4"

diff --git a/tests/test.js b/tests/test.js
@@ -217,6 +217,19 @@ describe('main tests', function() {
         });
     });
 
+    describe('should treat license file over custom urls', function() {
+
+        it('should recognise a custom license at a url', function(done) {
+            checker.init({
+                start: path.join(__dirname, '../node_modules/locale')
+            }, function(err, output) {
+                var item = output[Object.keys(output)[0]];
+                assert.equal(item.licenses, 'MIT*');
+                done();
+            });
+        });
+    });
+
     describe('should treat URLs as custom licenses', function() {
         var output;
         before(function(done) {