runat-1128988: Fix isRemote test detection

isRemote is a testing flag to allow tests to be skipped if the commands are being run on a remote system. Previously there was some hacky voodoo which (predictably) broken, so now we're explicit about it. We also line up some comments in index.html. Signed-off-by: Joe Walker <[email protected]>
joewalker · Feb 12, 2015 · f488696 · f488696 · joewalker · Feb 18, 2015
1 parent 7127930
commit f488696
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/index.html b/index.html
@@ -34,8 +34,8 @@
       system.addItems(demo.items);        // Extra demo commands
 
       gcli.createTerminal(system).then(function(terminal) {
-        terminal.language.showIntro();   // Intro text
-        test.run(terminal);              // Run the unit test at each startup
+        terminal.language.showIntro();    // Intro text
+        test.run(terminal, false);        // Run the unit test at each startup
       }).then(null, console.error.bind(console));
     });
   </script>

diff --git a/lib/gcli/test/index.js b/lib/gcli/test/index.js
@@ -69,7 +69,7 @@ var addDebugAids = exports.addDebugAids = function(options) {
  * - Runs the unit tests automatically on startup
  * - Registers a 'test' command to re-run the unit tests
  */
-exports.run = function(terminal) {
+exports.run = function(terminal, isRemote) {
   var options = {
     terminal: terminal,
     window: window,
@@ -78,7 +78,7 @@ exports.run = function(terminal) {
     isNode: false,
     isFirefox: false,
     isPhantomjs: (window.navigator.userAgent.indexOf('hantom') !== -1),
-    isRemote: (terminal.system.connection != null),
+    isRemote: isRemote,
     hideExec: true
   };
 

diff --git a/remote.html b/remote.html
@@ -30,7 +30,7 @@
       var options = { connector: 'websocket' };
       cnx.connect(options).then(function(system) {
         gcli.createTerminal(system).then(function(terminal) {
-          test.run(terminal);
+          test.run(terminal, true);
         });
       }).then(null, console.error.bind(console));
     });