fix paths so unit tests work again

Makefile.dryice.js

@@ -1,4 +1,3 @@
-#!/usr/bin/env node
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
@@ -43,7 +42,8 @@ var aceHome = __dirname;
 console.log('# ace ---------');
 
 var project = copy.createCommonJsProject([
-    aceHome + '/support/pilot/lib',
+    aceHome + '/support/gcli/support/pilot/lib',
+    aceHome + '/support/gcli/lib',
     aceHome + '/lib',
     aceHome + '/demo'
 ]);
@@ -190,7 +190,8 @@ console.log('# worker ---------');
 
 var jsWorker = copy.createDataObject();
 var workerProject = copy.createCommonJsProject([
-    aceHome + '/support/pilot/lib',
+    aceHome + '/support/gcli/support/pilot/lib',
+    aceHome + '/support/gcli/lib',
     aceHome + '/lib'
 ]);
 copy({

demo/boot.js

@@ -39,8 +39,8 @@ require({
     paths: {
         demo: "../demo",
         ace: "../lib/ace",
-        gcli: "../support/cockpit/lib/gcli",
-        pilot: "../support/cockpit/support/pilot/lib/pilot"
+        gcli: "../support/gcli/lib/gcli",
+        pilot: "../support/gcli/support/pilot/lib/pilot"
     }
 });
 

lib/ace/test/all.js

@@ -35,7 +35,12 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-require("../../../support/paths");
+if (typeof process !== "undefined") {
+    require("../../../support/paths");
+    require("ace/test/mockdom");
+}
 
-var test = require("asyncjs/test");
-test.walkTestCases(__dirname + "/..").exec()
+require("gcli/index").startup();
+
+var test = require("asyncjs").test;
+test.walkTestCases(__dirname + "/..").exec();

package.json

@@ -15,15 +15,15 @@
             "directories": {
                 "lib": "lib/ace",
                 "dependencies": {
-                    "cockpit": ">=0.1.1",
+                    "gcli": ">=0.1.1",
                     "pilot": ">=0.1.1"
                 }
             }
         }
     },
     "dependencies": {
-        "pilot": ">=0.1.1",
-        "cockpit": ">=0.1.1",
+        /* "pilot": ">=0.1.1", */
+        /* "gcli": ">=0.1.1", */
         "teleport": ">=0.2.6",
         "asyncjs": ">=0.0.2",
         "jsdom": ">=0.1.23",

support/paths.js

@@ -1,6 +1,7 @@
 require("./requireJS-node");
 require.paths.unshift(__dirname + "/../lib");
-require.paths.unshift(__dirname + "/pilot/lib");
-require.paths.unshift(__dirname + "/async/lib");
-require.paths.unshift(__dirname + "/jsdom/lib");
+require.paths.unshift(__dirname + "/../support/gcli/support/pilot/lib");
+require.paths.unshift(__dirname + "/../support/gcli/lib");
+require.paths.unshift(__dirname + "/../node_modules/async/lib");
+require.paths.unshift(__dirname + "/../node_modules/jsdom/lib");
 require.paths.unshift(__dirname);