Get tests up and running again

lib/ace/test/all.js

@@ -37,7 +37,7 @@
 
 require("../../../support/paths");
 
-var async = require("asyncjs");
+var async = require("async");
 
 async.concat(
     require("./change_document_test"),

lib/ace/test/change_document_test.js

@@ -155,7 +155,7 @@ var Test = {
     }
 };
 
-module.exports = require("asyncjs/test").testcase(Test);
+module.exports = require("async/test").testcase(Test);
 });
 
 if (module === require.main) {

lib/ace/test/document_test.js

@@ -37,9 +37,10 @@
  * ***** END LICENSE BLOCK ***** */
 
 var Document        = require("../document").Document,
+    EditSession     = require("../edit_session").EditSession,
     Range           = require("../range").Range,
     assert          = require("./assertions"),
-    async           = require("asyncjs");
+    async           = require("async");
 
 var Test = {
 
@@ -320,30 +321,30 @@ var Test = {
     "test: documentToScreen": function() {
         var tabSize = 4;
         var wrapLimit = 12;
-        var doc = new Document(["foo bar foo bar"]);
+        var session = new EditSession(["foo bar foo bar"]);
-        doc.setUseWrapMode(true);
+        session.setUseWrapMode(true);
-        doc.setWrapLimit(12);
+        session.setWrapLimit(12);
 
-        assert.position(doc.documentToScreenPosition(0, 11), 0, 11);
+        assert.position(session.documentToScreenPosition(0, 11), 0, 11);
-        assert.position(doc.documentToScreenPosition(0, 12), 1, 0);
+        assert.position(session.documentToScreenPosition(0, 12), 1, 0);
     },
 
     "test: screenToDocument": function() {
         var tabSize = 4;
         var wrapLimit = 12;
-        var doc = new Document(["foo bar foo bar"]);
+        var session = new EditSession(["foo bar foo bar"]);
-        doc.setUseWrapMode(true);
+        session.setUseWrapMode(true);
-        doc.setWrapLimit(12);
+        session.setWrapLimit(12);
 
-        assert.position(doc.screenToDocumentPosition(1, 0), 0, 12);
+        assert.position(session.screenToDocumentPosition(1, 0), 0, 12);
-        assert.position(doc.screenToDocumentPosition(0, 11), 0, 11);
+        assert.position(session.screenToDocumentPosition(0, 11), 0, 11);
         // Check if the position is clamped the right way.
-        assert.position(doc.screenToDocumentPosition(0, 12), 0, 11);
+        assert.position(session.screenToDocumentPosition(0, 12), 0, 11);
-        assert.position(doc.screenToDocumentPosition(0, 20), 0, 11);
+        assert.position(session.screenToDocumentPosition(0, 20), 0, 11);
     }
 };
 
-module.exports = require("asyncjs/test").testcase(Test);
+module.exports = require("async/test").testcase(Test);
 
 if (module === require.main) {
     require("../../../support/paths");

lib/ace/test/edit_session_test.js

@@ -42,7 +42,7 @@ var EditSession     = require("ace/edit_session").EditSession,
     MockRenderer    = require("./mockrenderer"),
     Range           = require("ace/range").Range,
     assert          = require("./assertions"),
-    async           = require("asyncjs");
+    async           = require("async");
 
 var Test = {
 
@@ -266,7 +266,7 @@ var Test = {
     }
 };
 
-module.exports = require("asyncjs/test").testcase(Test);
+module.exports = require("async/test").testcase(Test);
 });
 
 if (module === require.main) {

lib/ace/test/event_emitter_test.js

@@ -60,7 +60,7 @@ var Test = {
     }
 };
 
-module.exports = require("asyncjs/test").testcase(Test)
+module.exports = require("async/test").testcase(Test)
 
 if (module === require.main)
     module.exports.exec()

lib/ace/test/mode/css_test.js

@@ -70,7 +70,7 @@ var Test = {
     }
 };
 
-module.exports = require("asyncjs/test").testcase(Test);
+module.exports = require("async/test").testcase(Test);
 });
 
 if (module === require.main) {

lib/ace/test/mode/css_tokenizer_test.js

@@ -84,7 +84,7 @@ var Test = {
     }
 };
 
-module.exports = require("asyncjs/test").testcase(Test, "css tokenizer");
+module.exports = require("async/test").testcase(Test, "css tokenizer");
 
 });
 

lib/ace/test/mode/html_test.js

@@ -62,7 +62,7 @@ var Test = {
     }
 };
 
-module.exports = require("asyncjs/test").testcase(Test);
+module.exports = require("async/test").testcase(Test);
 });
 
 if (module === require.main) {

lib/ace/test/mode/html_tokenizer_test.js

@@ -65,7 +65,7 @@ var Test = {
     }    
 };
 
-module.exports = require("asyncjs/test").testcase(Test);
+module.exports = require("async/test").testcase(Test);
 });
 
 if (module === require.main) {

lib/ace/test/mode/javascript_test.js

@@ -144,7 +144,7 @@ var Test = {
     }
 };
 
-module.exports = require("asyncjs/test").testcase(Test);
+module.exports = require("async/test").testcase(Test);
 });
 
 if (module === require.main) {

lib/ace/test/mode/javascript_tokenizer_test.js

@@ -101,7 +101,7 @@ var Test = {
     }
 };
 
-module.exports = require("asyncjs/test").testcase(Test);
+module.exports = require("async/test").testcase(Test);
 });
 
 if (module === require.main) {

lib/ace/test/mode/text_test.js

@@ -59,7 +59,7 @@ var Test = {
     }
 };
 
-module.exports = require("asyncjs/test").testcase(Test);
+module.exports = require("async/test").testcase(Test);
 });
 
 if (module === require.main) {

lib/ace/test/mode/xml_test.js

@@ -70,7 +70,7 @@ var Test = {
     }
 };
 
-module.exports = require("asyncjs/test").testcase(Test);
+module.exports = require("async/test").testcase(Test);
 });
 
 if (module === require.main) {

lib/ace/test/mode/xml_tokenizer_test.js

@@ -60,7 +60,7 @@ var Test = {
     }
 };
 
-module.exports = require("asyncjs/test").testcase(Test);
+module.exports = require("async/test").testcase(Test);
 });
 
 if (module === require.main) {

lib/ace/test/navigation_test.js

@@ -150,7 +150,7 @@ var Test = {
     }
 };
 
-module.exports = require("asyncjs/test").testcase(Test)
+module.exports = require("async/test").testcase(Test)
 });
 
 if (module === require.main) {

lib/ace/test/range_test.js

@@ -161,7 +161,7 @@ var Test = {
     }
 };
 
-module.exports = require("asyncjs/test").testcase(Test);
+module.exports = require("async/test").testcase(Test);
 });
 
 if (module === require.main) {

lib/ace/test/search_test.js

@@ -344,7 +344,7 @@ var Test = {
     }
 };
 
-module.exports = require("asyncjs/test").testcase(Test)
+module.exports = require("async/test").testcase(Test)
 });
 
 if (module === require.main) {

lib/ace/test/selection_test.js

@@ -290,7 +290,7 @@ var Test = {
     }
 };
 
-module.exports = require("asyncjs/test").testcase(Test);
+module.exports = require("async/test").testcase(Test);
 });
 
 if (module === require.main) {

lib/ace/test/text_edit_test.js

@@ -438,7 +438,7 @@ var Test = {
     }
 };
 
-module.exports = require("asyncjs/test").testcase(Test);
+module.exports = require("async/test").testcase(Test);
 });
 
 if (module === require.main) {

lib/ace/test/virtual_renderer_test.js

@@ -72,7 +72,7 @@ var Test = {
     // change tab size after setDocument (for text layer)
 };
 
-module.exports = require("asyncjs/test").testcase(Test);
+module.exports = require("async/test").testcase(Test);
 });
 
 if (module === require.main) {

support/paths.js

@@ -1,4 +1,6 @@
 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);