diff --git a/lib/ace/test/all.js b/lib/ace/test/all.js index 46b5b55e..f3508da1 100644 --- a/lib/ace/test/all.js +++ b/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"), diff --git a/lib/ace/test/change_document_test.js b/lib/ace/test/change_document_test.js index d00c2af9..dde49216 100644 --- a/lib/ace/test/change_document_test.js +++ b/lib/ace/test/change_document_test.js @@ -47,10 +47,10 @@ var EditSession = require("../edit_session").EditSession, assert = require("./assertions"); var Test = { - + setUp : function(next) { this.session1 = new EditSession(["abc", "def"]); - this.session2 = new EditSession(["ghi", "jkl"]); + this.session2 = new EditSession(["ghi", "jkl"]); this.editor = new Editor(new MockRenderer()); next(); }, @@ -155,7 +155,7 @@ var Test = { } }; -module.exports = require("asyncjs/test").testcase(Test); +module.exports = require("async/test").testcase(Test); }); if (module === require.main) { diff --git a/lib/ace/test/document_test.js b/lib/ace/test/document_test.js index 58cda084..4a33dcb0 100644 --- a/lib/ace/test/document_test.js +++ b/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"]); - doc.setUseWrapMode(true); - doc.setWrapLimit(12); + var session = new EditSession(["foo bar foo bar"]); + session.setUseWrapMode(true); + session.setWrapLimit(12); - assert.position(doc.documentToScreenPosition(0, 11), 0, 11); - assert.position(doc.documentToScreenPosition(0, 12), 1, 0); + assert.position(session.documentToScreenPosition(0, 11), 0, 11); + 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"]); - doc.setUseWrapMode(true); - doc.setWrapLimit(12); + var session = new EditSession(["foo bar foo bar"]); + session.setUseWrapMode(true); + session.setWrapLimit(12); - assert.position(doc.screenToDocumentPosition(1, 0), 0, 12); - assert.position(doc.screenToDocumentPosition(0, 11), 0, 11); + assert.position(session.screenToDocumentPosition(1, 0), 0, 12); + 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(doc.screenToDocumentPosition(0, 20), 0, 11); + assert.position(session.screenToDocumentPosition(0, 12), 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"); diff --git a/lib/ace/test/edit_session_test.js b/lib/ace/test/edit_session_test.js index 1cf721fa..967783cb 100644 --- a/lib/ace/test/edit_session_test.js +++ b/lib/ace/test/edit_session_test.js @@ -42,8 +42,8 @@ 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 = { "test: find matching opening bracket" : function() { @@ -81,16 +81,16 @@ var Test = { "test: move lines down" : function() { var session = new EditSession(["a1", "a2", "a3", "a4"]); - + session.moveLinesDown(0, 1); assert.equal(session.getValue(), ["a3", "a1", "a2", "a4"].join("\n")); - + session.moveLinesDown(1, 2); assert.equal(session.getValue(), ["a3", "a4", "a1", "a2"].join("\n")); - + session.moveLinesDown(2, 3); assert.equal(session.getValue(), ["a3", "a4", "a1", "a2"].join("\n")); - + session.moveLinesDown(2, 2); assert.equal(session.getValue(), ["a3", "a4", "a2", "a1"].join("\n")); }, @@ -100,13 +100,13 @@ var Test = { session.moveLinesUp(2, 3); assert.equal(session.getValue(), ["a1", "a3", "a4", "a2"].join("\n")); - + session.moveLinesUp(1, 2); assert.equal(session.getValue(), ["a3", "a4", "a1", "a2"].join("\n")); - + session.moveLinesUp(0, 1); assert.equal(session.getValue(), ["a3", "a4", "a1", "a2"].join("\n")); - + session.moveLinesUp(2, 2); assert.equal(session.getValue(), ["a3", "a1", "a4", "a2"].join("\n")); }, @@ -177,57 +177,57 @@ var Test = { assert.equal(session.screenToDocumentColumn(0, 15), 12); assert.equal(session.screenToDocumentColumn(0, 19), 13); }, - + "test: insert text in multiple rows": function() { var session = new EditSession(["12", "", "abcd"]); - + var inserted = session.multiRowInsert([0, 1, 2], 2, "juhu 1"); assert.equal(inserted.rows, 0); assert.equal(inserted.columns, 6); - + assert.equal(session.getValue(), ["12juhu 1", " juhu 1", "abjuhu 1cd"].join("\n")); }, "test: undo insert text in multiple rows": function() { var session = new EditSession(["12", "", "abcd"]); - + var undoManager = new UndoManager(); session.setUndoManager(undoManager); - + session.multiRowInsert([0, 1, 2], 2, "juhu 1"); session.$informUndoManager.call(); assert.equal(session.getValue(), ["12juhu 1", " juhu 1", "abjuhu 1cd"].join("\n")); undoManager.undo(); assert.equal(session.getValue(), ["12", "", "abcd"].join("\n")); - + undoManager.redo(); assert.equal(session.getValue(), ["12juhu 1", " juhu 1", "abjuhu 1cd"].join("\n")); }, - + "test: insert new line in multiple rows": function() { var session = new EditSession(["12", "", "abcd"]); - + var inserted = session.multiRowInsert([0, 1, 2], 2, "\n"); assert.equal(inserted.rows, 1); assert.equal(session.getValue(), ["12\n", " \n", "ab\ncd"].join("\n")); }, - + "test: insert multi line text in multiple rows": function() { var session = new EditSession(["12", "", "abcd"]); - + var inserted = session.multiRowInsert([0, 1, 2], 2, "juhu\n12"); assert.equal(inserted.rows, 1); assert.equal(session.getValue(), ["12juhu\n12", " juhu\n12", "abjuhu\n12cd"].join("\n")); }, - + "test: remove right in multiple rows" : function() { var session = new EditSession(["12", "", "abcd"]); session.multiRowRemove([0, 1, 2], new Range(0, 2, 0, 3)); assert.equal(session.getValue(), ["12", "", "abd"].join("\n")); }, - + "test: undo remove right in multiple rows" : function() { var session = new EditSession(["12", "", "abcd"]); var undoManager = new UndoManager(); @@ -236,37 +236,37 @@ var Test = { session.multiRowRemove([0, 1, 2], new Range(0, 1, 0, 3)); session.$informUndoManager.call(); assert.equal(session.getValue(), ["1", "", "ad"].join("\n")); - + undoManager.undo(); assert.equal(session.getValue(), ["12", "", "abcd"].join("\n")); - + undoManager.redo(); assert.equal(session.getValue(), ["1", "", "ad"].join("\n")); }, - + "test get longest line" : function() { var session = new EditSession(["12"]); session.setTabSize(4); assert.equal(session.getWidth(), 2); assert.equal(session.getScreenWidth(), 2); - + session.doc.insertNewLine(0); session.doc.insertLines(1, ["123"]); assert.equal(session.getWidth(), 3); assert.equal(session.getScreenWidth(), 3); - + session.doc.insertNewLine(0); session.doc.insertLines(1, ["\t\t"]); assert.equal(session.getWidth(), 3); assert.equal(session.getScreenWidth(), 8); - + session.setTabSize(2); assert.equal(session.getWidth(), 3); assert.equal(session.getScreenWidth(), 4); } }; -module.exports = require("asyncjs/test").testcase(Test); +module.exports = require("async/test").testcase(Test); }); if (module === require.main) { diff --git a/lib/ace/test/event_emitter_test.js b/lib/ace/test/event_emitter_test.js index 6ebe5638..7a98cd9b 100644 --- a/lib/ace/test/event_emitter_test.js +++ b/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() diff --git a/lib/ace/test/mode/css_test.js b/lib/ace/test/mode/css_test.js index 654d5c83..3b2932c0 100644 --- a/lib/ace/test/mode/css_test.js +++ b/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) { diff --git a/lib/ace/test/mode/css_tokenizer_test.js b/lib/ace/test/mode/css_tokenizer_test.js index 0618edac..f26e82d2 100644 --- a/lib/ace/test/mode/css_tokenizer_test.js +++ b/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"); }); diff --git a/lib/ace/test/mode/html_test.js b/lib/ace/test/mode/html_test.js index 7184ffc2..d9cf64e4 100644 --- a/lib/ace/test/mode/html_test.js +++ b/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) { diff --git a/lib/ace/test/mode/html_tokenizer_test.js b/lib/ace/test/mode/html_tokenizer_test.js index 6ba8fdea..a14ece42 100644 --- a/lib/ace/test/mode/html_tokenizer_test.js +++ b/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) { diff --git a/lib/ace/test/mode/javascript_test.js b/lib/ace/test/mode/javascript_test.js index a12c4488..9fcb9c09 100644 --- a/lib/ace/test/mode/javascript_test.js +++ b/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) { diff --git a/lib/ace/test/mode/javascript_tokenizer_test.js b/lib/ace/test/mode/javascript_tokenizer_test.js index 73e13f1e..ebe44c01 100644 --- a/lib/ace/test/mode/javascript_tokenizer_test.js +++ b/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) { diff --git a/lib/ace/test/mode/text_test.js b/lib/ace/test/mode/text_test.js index 10ca9d13..a39f7d5b 100644 --- a/lib/ace/test/mode/text_test.js +++ b/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) { diff --git a/lib/ace/test/mode/xml_test.js b/lib/ace/test/mode/xml_test.js index 72bd56e1..e2375afb 100644 --- a/lib/ace/test/mode/xml_test.js +++ b/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) { diff --git a/lib/ace/test/mode/xml_tokenizer_test.js b/lib/ace/test/mode/xml_tokenizer_test.js index e63980ed..5905bc64 100644 --- a/lib/ace/test/mode/xml_tokenizer_test.js +++ b/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) { diff --git a/lib/ace/test/navigation_test.js b/lib/ace/test/navigation_test.js index c9bbdaf6..44938b6f 100644 --- a/lib/ace/test/navigation_test.js +++ b/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) { diff --git a/lib/ace/test/range_test.js b/lib/ace/test/range_test.js index 8415f135..4eed2c1a 100644 --- a/lib/ace/test/range_test.js +++ b/lib/ace/test/range_test.js @@ -132,36 +132,36 @@ var Test = { var range = range.extend(2, 5); assert.range(range, 2, 5, 2, 30); - + var range = range.extend(2, 35); assert.range(range, 2, 5, 2, 35); - + var range = range.extend(2, 15); assert.range(range, 2, 5, 2, 35); - + var range = range.extend(1, 4); assert.range(range, 1, 4, 2, 35); - + var range = range.extend(6, 10); assert.range(range, 1, 4, 6, 10); }, - + "test: collapse rows" : function() { var range = new Range(0, 2, 1, 2); - assert.range(range.collapseRows(), 0, 0, 1, 0); + assert.range(range.collapseRows(), 0, 0, 1, 0); var range = new Range(2, 2, 3, 1); - assert.range(range.collapseRows(), 2, 0, 3, 0); + assert.range(range.collapseRows(), 2, 0, 3, 0); var range = new Range(2, 2, 3, 0); - assert.range(range.collapseRows(), 2, 0, 2, 0); + assert.range(range.collapseRows(), 2, 0, 2, 0); var range = new Range(2, 0, 2, 0); - assert.range(range.collapseRows(), 2, 0, 2, 0); + assert.range(range.collapseRows(), 2, 0, 2, 0); } }; -module.exports = require("asyncjs/test").testcase(Test); +module.exports = require("async/test").testcase(Test); }); if (module === require.main) { diff --git a/lib/ace/test/search_test.js b/lib/ace/test/search_test.js index 1f42571c..b33a0d0f 100644 --- a/lib/ace/test/search_test.js +++ b/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) { diff --git a/lib/ace/test/selection_test.js b/lib/ace/test/selection_test.js index 06858ec5..bccf0395 100644 --- a/lib/ace/test/selection_test.js +++ b/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) { diff --git a/lib/ace/test/text_edit_test.js b/lib/ace/test/text_edit_test.js index 0ae2615e..5f63920d 100644 --- a/lib/ace/test/text_edit_test.js +++ b/lib/ace/test/text_edit_test.js @@ -126,19 +126,19 @@ var Test = { "test: indent selected lines" : function() { var session = new EditSession(["a12345", "b12345", "c12345"].join("\n")); var editor = new Editor(new MockRenderer(), session); - + editor.moveCursorTo(1, 0); editor.getSelection().selectDown(); - + editor.indent(); assert.equal(["a12345", " b12345", "c12345"].join("\n"), session.toString()); }, - + "test: no auto indent if cursor is before the {" : function() { var session = new EditSession("{", new JavaScriptMode()); var editor = new Editor(new MockRenderer(), session); - - editor.moveCursorTo(0, 0); + + editor.moveCursorTo(0, 0); editor.onTextInput("\n"); assert.equal(["", "{"].join("\n"), session.toString()); }, @@ -149,7 +149,7 @@ var Test = { editor.moveCursorTo(0, 5); editor.getSelection().selectDown(); - editor.getSelection().selectDown(); + editor.getSelection().selectDown(); editor.blockOutdent(); assert.equal(session.toString(), [" a12345", "b12345", " c12345"].join("\n")); @@ -208,21 +208,21 @@ var Test = { assert.equal([" abc", "cde"].join("\n"), session.toString()); assert.range(editor.getSelectionRange(), 0, 0, 1, 1); }, - + "test: toggle comment lines twice should return the original text" : function() { var session = new EditSession([" abc", "cde", "fg"], new JavaScriptMode()); var editor = new Editor(new MockRenderer(), session); - + editor.moveCursorTo(0, 0); editor.getSelection().selectDown(); editor.getSelection().selectDown(); - + editor.toggleCommentLines(); editor.toggleCommentLines(); - + assert.equal([" abc", "cde", "fg"].join("\n"), session.toString()); }, - + "test: comment lines - if the selection end is at the line start it should stay there": function() { //select down @@ -366,71 +366,71 @@ var Test = { editor.onTextInput("\t"); assert.equal(session.toString(), "\t"); }, - + "test: undo/redo for delete line" : function() { var session = new EditSession(["111", "222", "333"]); var undoManager = new UndoManager(); session.setUndoManager(undoManager); - + var initialText = session.toString(); var editor = new Editor(new MockRenderer(), session); - + editor.removeLines(); var step1 = session.toString(); assert.equal(step1, "222\n333"); session.$informUndoManager.call(); - + editor.removeLines(); var step2 = session.toString(); assert.equal(step2, "333"); session.$informUndoManager.call(); - + editor.removeLines(); var step3 = session.toString(); assert.equal(step3, ""); session.$informUndoManager.call(); - - + + undoManager.undo(); session.$informUndoManager.call(); assert.equal(session.toString(), step2); - + undoManager.undo(); session.$informUndoManager.call(); assert.equal(session.toString(), step1); - + undoManager.undo(); session.$informUndoManager.call(); assert.equal(session.toString(), initialText); - + undoManager.undo(); session.$informUndoManager.call(); assert.equal(session.toString(), initialText); }, - + "test: remove left should remove character left of the cursor" : function() { var session = new EditSession(["123", "456"]); - + var editor = new Editor(new MockRenderer(), session); editor.moveCursorTo(1, 1); editor.removeLeft(); assert.equal(session.toString(), "123\n56"); }, - + "test: remove left should remove line break if cursor is at line start" : function() { var session = new EditSession(["123", "456"]); - + var editor = new Editor(new MockRenderer(), session); editor.moveCursorTo(1, 0); editor.removeLeft(); assert.equal(session.toString(), "123456"); }, - + "test: remove left should remove tabsize spaces if cursor is on a tab stop and preceeded by spaces" : function() { var session = new EditSession(["123", " 456"]); session.setUseSoftTabs(true); session.setTabSize(4); - + var editor = new Editor(new MockRenderer(), session); editor.moveCursorTo(1, 8); editor.removeLeft(); @@ -438,7 +438,7 @@ var Test = { } }; -module.exports = require("asyncjs/test").testcase(Test); +module.exports = require("async/test").testcase(Test); }); if (module === require.main) { diff --git a/lib/ace/test/virtual_renderer_test.js b/lib/ace/test/virtual_renderer_test.js index 0d4fe8ed..83e0351c 100644 --- a/lib/ace/test/virtual_renderer_test.js +++ b/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) { diff --git a/support/paths.js b/support/paths.js index 04902dfb..c0dcee83 100644 --- a/support/paths.js +++ b/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);