fix for buggy cd /history

Fixes #417

disallow cd /

Fixes #416

Author: starpit

app/content/js/command-tree.js

@@ -95,6 +95,7 @@ const CDHelpers = {
               route = `/${A.join('/')}`,
               m = match(A, true)           // make sure the context exists
 
+        debug('cd', m)
         if (!m || !m.children || (m.route !== route && !m.children[A[A.length - 1]])) {
             // maybe we need to load a plugin?
             if (!noRetry) {
@@ -104,7 +105,11 @@ const CDHelpers = {
                 // then the desiredContext does not exist; the caller will handle error reporting
                 return false
             }
-        } else {
+        } else if (m.route !== '/' && (!m.$ || m.options.subtreeHandler)) {
+            // disallow cd /
+            // and: m.$ means that there is a command installed here, so disallow cd'ing;
+            //      so: m.$ && m.options.subtreeHandler means that we installed this as a help handler below
+
             // if the user expressed a synonym, use the main name
             if (m.options && m.options.synonymFor) {
                 return exports.changeContext(m.options.synonymFor.route)()
@@ -305,8 +310,8 @@ exports.subtree = (route, options) => {
         //
         // also listen route e.g. /wsk, and present usage
         //
-        listen(route, help, Object.assign({}, options, { noArgs: true }))
-        listen(`${route}/help`, help, Object.assign({}, options, { noArgs: true }))
+        listen(route, help, Object.assign({}, options, { noArgs: true, subtreeHandler: true }))
+        listen(`${route}/help`, help, Object.assign({}, options, { noArgs: true, subtreeHandler: true }))
 
         return leaf
     }

tests/tests/passes/02/cd.js

@@ -58,9 +58,12 @@ describe('Change contexts via cd', function() {
     doSwitch('..', '/wsk')
     doSwitch('./actions', '/wsk/actions')
     doSwitch('..', '/wsk')
-    doSwitch('..', '/')
+    //doSwitch('..', '/')
     doSwitch('/wsk/triggers', '/wsk/triggers')
 
+    bogusSwitch('/')                            // disallow switching to /
+    bogusSwitch('/history')                     // disallow switching to /history, as it is a command handler not a subtree
+
     doSwitch('/wsk/action', '/wsk/actions')    // test that we switch to /wsk/actions, even when asking to change to /wsk/action
     bogusSwitch('actions')                     // type 'actions' while in /wsk/actions, and expect error
     doSwitch('/wsk/trigger', '/wsk/triggers')  // test that we switch to /wsk/triggers, even when asking to change to /wsk/trigger
@@ -86,9 +89,10 @@ describe('Change contexts via cd', function() {
        .catch(common.oops(this)))
 
     sidecar.close(this)
-    doSwitch('../../', '/', undefined, actionName) // actionName had better still be selected
-    doSwitch('wsk/rules', '/wsk/rules', undefined, actionName) // actionName had better still be selected
-    doSwitch('../..', '/', undefined, actionName) // actionName had better still be selected
+    bogusSwitch('../../')  // this would cd us to /, which is disallowed
+    //doSwitch('../../', '/', undefined, actionName) // actionName had better still be selected
+    // doSwitch('wsk/rules', '/wsk/rules', undefined, actionName) // actionName had better still be selected
+    //doSwitch('../..', '/', undefined, actionName) // actionName had better still be selected
 
     bogusSwitch('ffjdsjfioas990890890890')
 
@@ -104,7 +108,7 @@ describe('Change contexts via cd', function() {
     doSwitch('..', '/wsk', undefined, actionName) // actionName had better still be selected
     doSwitch('actions', '/wsk/actions', undefined, actionName) // actionName had better still be selected
     doSwitch('..', '/wsk', undefined, actionName) // actionName had better still be selected
-    doSwitch('..', '/', undefined, actionName) // actionName had better still be selected
-    doSwitch('wsk', '/wsk', undefined, actionName) // actionName had better still be selected
+    //doSwitch('..', '/', undefined, actionName) // actionName had better still be selected
+    // doSwitch('wsk', '/wsk', undefined, actionName) // actionName had better still be selected
     bogusSwitch('ufdufdasufdsa', undefined, actionName) // actionName had better still be selected
 })

tests/tests/passes/03/create-then-add-parameter/with-context-switching.js

@@ -74,6 +74,6 @@ describe('Create an actions, switch to parameters view, then add parameters with
     doAdd('action set x=6', '{"x":6}')
     doAdd('wsk action set x=7', '{"x":7}')
 
-    doSwitch('..', '/')
-    doAdd('wsk action set x=8', '{"x":8}')
+    //doSwitch('..', '/')
+    //doAdd('wsk action set x=8', '{"x":8}')
 })