Merge pull request dthree#315 from mdouglass/master

Fix dthree#270: Fix check for undefined commands so that it does not catch the string 'undefine'
Japh · Aug 15, 2018 · 98d29ed · 98d29ed
2 parents 3bb1453 + 7e73caa
commit 98d29ed
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/dist/vorpal.js b/dist/vorpal.js
@@ -831,7 +831,7 @@ vorpal._exec = function (item) {
     throw new Error('Fatal Error: No session was passed into command for execution: ' + item);
   }
 
-  if (String(item.command).indexOf('undefine') > -1) {
+  if (item.command === undefined) {
     throw new Error('vorpal._exec was called with an undefined command.');
   }
 

diff --git a/lib/vorpal.js b/lib/vorpal.js
@@ -826,7 +826,7 @@ vorpal._exec = function (item) {
     throw new Error('Fatal Error: No session was passed into command for execution: ' + item);
   }
 
-  if (String(item.command).indexOf('undefine') > -1) {
+  if (item.command === undefined) {
     throw new Error('vorpal._exec was called with an undefined command.');
   }
 

diff --git a/test/vorpal.js b/test/vorpal.js
@@ -148,6 +148,11 @@ describe('argument parsing', function () {
     var fixture = obj({ options: {}, variadic:  ['and', 'so', 'on'] });
     obj(vorpal.execSync('multi word command and so on')).should.equal(fixture);
   });
+
+  it('should parse command with undefine in it as invalid', function () {
+    var fixture = obj("Invalid command.");
+    obj(vorpal.execSync('has undefine in it')).should.equal(fixture);
+  })
 });
 
 describe('option parsing', function () {