fix: conflicting options now properly override each other (#489)

shelljs · Jul 27, 2016 · 06ae7d9 · 06ae7d9
1 parent add14ad
commit 06ae7d9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/common.js b/src/common.js
@@ -154,7 +154,7 @@ function parseOptions(opt, map) {
       if (c in map) {
         optionName = map[c];
         if (optionName[0] === '!')
-          options[optionName.slice(1, optionName.length-1)] = false;
+          options[optionName.slice(1)] = false;
         else
           options[optionName] = true;
       } else {

diff --git a/test/common.js b/test/common.js
@@ -74,14 +74,19 @@ assert.ok(result.no_force === false);
 assert.ok(result.force === undefined); // this key shouldn't exist
 
 // common.parseOptions (the last of the conflicting options should hold)
-result = common.parseOptions('-fn', {
+var options = {
   'n': 'no_force',
   'f': '!no_force',
   'R': 'recursive'
-});
+};
+result = common.parseOptions('-fn', options);
 assert.ok(result.recursive === false);
 assert.ok(result.no_force === true);
 assert.ok(result.force === undefined); // this key shouldn't exist
+result = common.parseOptions('-nf', options);
+assert.ok(result.recursive === false);
+assert.ok(result.no_force === false);
+assert.ok(result.force === undefined); // this key shouldn't exist
 
 // common.parseOptions using an object to hold options
 result = common.parseOptions({'-v': 'some text here'}, {