diff --git a/lib/ace/test/all.js b/lib/ace/test/all.js index ad1bf2c3..81140835 100644 --- a/lib/ace/test/all.js +++ b/lib/ace/test/all.js @@ -37,6 +37,7 @@ require("../../../support/paths"); +require("./mockdom"); var async = require("asyncjs"); async.concat( diff --git a/lib/ace/test/anchor_test.js b/lib/ace/test/anchor_test.js index 47191799..adeed67f 100644 --- a/lib/ace/test/anchor_test.js +++ b/lib/ace/test/anchor_test.js @@ -35,6 +35,8 @@ * * ***** END LICENSE BLOCK ***** */ +define(function(require, exports, module) { + var Document = require("ace/document").Document; var Anchor = require("ace/anchor").Anchor; var Range = require("ace/range").Range; @@ -173,7 +175,9 @@ var Test = { module.exports = require("asyncjs/test").testcase(Test); -if (module === require.main) { +}); + +if (typeof module !== "undefined" && module === require.main) { require("../../../support/paths"); exports.exec() } diff --git a/lib/ace/test/change_document_test.js b/lib/ace/test/change_document_test.js index 9414bdc0..b4358a1e 100644 --- a/lib/ace/test/change_document_test.js +++ b/lib/ace/test/change_document_test.js @@ -37,8 +37,6 @@ define(function(require, exports, module) { -require("./mockdom"); - var EditSession = require("../edit_session").EditSession, Editor = require("../editor").Editor, Text = require("../mode/text").Mode, @@ -158,7 +156,7 @@ var Test = { module.exports = require("asyncjs/test").testcase(Test); }); -if (module === require.main) { +if (typeof module !== "undefined" && module === require.main) { require("../../../support/paths"); exports.exec() } diff --git a/lib/ace/test/document_test.js b/lib/ace/test/document_test.js index 7b9c625c..b9249e8f 100644 --- a/lib/ace/test/document_test.js +++ b/lib/ace/test/document_test.js @@ -36,6 +36,8 @@ * * ***** END LICENSE BLOCK ***** */ +define(function(require, exports, module) { + var Document = require("../document").Document, Range = require("../range").Range, assert = require("./assertions"), @@ -302,7 +304,9 @@ var Test = { module.exports = require("asyncjs/test").testcase(Test); -if (module === require.main) { +}); + +if (typeof module !== "undefined" && module === require.main) { require("../../../support/paths"); exports.exec() } diff --git a/lib/ace/test/edit_session_test.js b/lib/ace/test/edit_session_test.js index a792acd5..f5b72140 100644 --- a/lib/ace/test/edit_session_test.js +++ b/lib/ace/test/edit_session_test.js @@ -37,8 +37,6 @@ define(function(require, exports, module) { -require("./mockdom"); - var EditSession = require("ace/edit_session").EditSession, Editor = require("../editor").Editor, UndoManager = require("ace/undomanager").UndoManager, @@ -236,7 +234,7 @@ var Test = { wrapLimit = wrapLimit || 12; tabSize = tabSize || 4; splits = computeWrapSplits.call(EditSession.prototype, line, wrapLimit, tabSize); - console.log("String:", line, "Result:", splits, "Expected:", assertEqual); + // console.log("String:", line, "Result:", splits, "Expected:", assertEqual); assert.ok(splits.length == assertEqual.length); for (var i = 0; i < splits.length; i++) { assert.ok(splits[i] == assertEqual[i]); @@ -333,7 +331,7 @@ var Test = { module.exports = require("asyncjs/test").testcase(Test); }); -if (module === require.main) { +if (typeof module !== "undefined" && module === require.main) { require("../../../support/paths"); exports.exec() } \ No newline at end of file diff --git a/lib/ace/test/event_emitter_test.js b/lib/ace/test/event_emitter_test.js index 6ebe5638..19e12596 100644 --- a/lib/ace/test/event_emitter_test.js +++ b/lib/ace/test/event_emitter_test.js @@ -35,10 +35,10 @@ * * ***** END LICENSE BLOCK ***** */ -require("../../../support/paths"); +define(function(require, exports, module) { var oop = require("pilot/oop"); - EventEmitter = require("pilot/event_emitter").EventEmitter, + EventEmitter = require("pilot/event_emitter").EventEmitter, assert = require("./assertions"); var Emitter = function() {}; @@ -61,6 +61,4 @@ var Test = { }; module.exports = require("asyncjs/test").testcase(Test) - -if (module === require.main) - module.exports.exec() +}); \ No newline at end of file diff --git a/lib/ace/test/mode/css_test.js b/lib/ace/test/mode/css_test.js index 654d5c83..e5aa099e 100644 --- a/lib/ace/test/mode/css_test.js +++ b/lib/ace/test/mode/css_test.js @@ -73,7 +73,7 @@ var Test = { module.exports = require("asyncjs/test").testcase(Test); }); -if (module === require.main) { +if (typeof module !== "undefined" && module === require.main) { require("../../../support/paths"); exports.exec() } \ No newline at end of file diff --git a/lib/ace/test/mode/css_tokenizer_test.js b/lib/ace/test/mode/css_tokenizer_test.js index 0618edac..dbad83c8 100644 --- a/lib/ace/test/mode/css_tokenizer_test.js +++ b/lib/ace/test/mode/css_tokenizer_test.js @@ -88,7 +88,7 @@ module.exports = require("asyncjs/test").testcase(Test, "css tokenizer"); }); -if (module === require.main) { +if (typeof module !== "undefined" && module === require.main) { require("../../../support/paths"); exports.exec() } \ No newline at end of file diff --git a/lib/ace/test/mode/html_test.js b/lib/ace/test/mode/html_test.js index 7184ffc2..c614b6b8 100644 --- a/lib/ace/test/mode/html_test.js +++ b/lib/ace/test/mode/html_test.js @@ -65,7 +65,7 @@ var Test = { module.exports = require("asyncjs/test").testcase(Test); }); -if (module === require.main) { +if (typeof module !== "undefined" && module === require.main) { require("../../../support/paths"); - exports.exec() + exports.exec(); } \ No newline at end of file diff --git a/lib/ace/test/mode/html_tokenizer_test.js b/lib/ace/test/mode/html_tokenizer_test.js index 6ba8fdea..14e697ba 100644 --- a/lib/ace/test/mode/html_tokenizer_test.js +++ b/lib/ace/test/mode/html_tokenizer_test.js @@ -68,7 +68,7 @@ var Test = { module.exports = require("asyncjs/test").testcase(Test); }); -if (module === require.main) { +if (typeof module !== "undefined" && module === require.main) { require("../../../support/paths"); - exports.exec() + exports.exec(); } \ No newline at end of file diff --git a/lib/ace/test/mode/javascript_test.js b/lib/ace/test/mode/javascript_test.js index a12c4488..316ea910 100644 --- a/lib/ace/test/mode/javascript_test.js +++ b/lib/ace/test/mode/javascript_test.js @@ -147,7 +147,7 @@ var Test = { module.exports = require("asyncjs/test").testcase(Test); }); -if (module === require.main) { +if (typeof module !== "undefined" && module === require.main) { require("../../../support/paths"); - exports.exec() + exports.exec(); } \ No newline at end of file diff --git a/lib/ace/test/mode/javascript_tokenizer_test.js b/lib/ace/test/mode/javascript_tokenizer_test.js index 73e13f1e..be0fe1ea 100644 --- a/lib/ace/test/mode/javascript_tokenizer_test.js +++ b/lib/ace/test/mode/javascript_tokenizer_test.js @@ -104,7 +104,7 @@ var Test = { module.exports = require("asyncjs/test").testcase(Test); }); -if (module === require.main) { +if (typeof module !== "undefined" && module === require.main) { require("../../../support/paths"); - exports.exec() + exports.exec(); } \ No newline at end of file diff --git a/lib/ace/test/mode/text_test.js b/lib/ace/test/mode/text_test.js index 10ca9d13..1284d97d 100644 --- a/lib/ace/test/mode/text_test.js +++ b/lib/ace/test/mode/text_test.js @@ -62,7 +62,7 @@ var Test = { module.exports = require("asyncjs/test").testcase(Test); }); -if (module === require.main) { +if (typeof module !== "undefined" && module === require.main) { require("../../../support/paths"); - exports.exec() + exports.exec(); } \ No newline at end of file diff --git a/lib/ace/test/mode/xml_test.js b/lib/ace/test/mode/xml_test.js index 72bd56e1..c5e7810a 100644 --- a/lib/ace/test/mode/xml_test.js +++ b/lib/ace/test/mode/xml_test.js @@ -73,7 +73,7 @@ var Test = { module.exports = require("asyncjs/test").testcase(Test); }); -if (module === require.main) { +if (typeof module !== "undefined" && module === require.main) { require("../../../support/paths"); - exports.exec() + exports.exec(); } \ No newline at end of file diff --git a/lib/ace/test/mode/xml_tokenizer_test.js b/lib/ace/test/mode/xml_tokenizer_test.js index e63980ed..dcf22b33 100644 --- a/lib/ace/test/mode/xml_tokenizer_test.js +++ b/lib/ace/test/mode/xml_tokenizer_test.js @@ -63,7 +63,7 @@ var Test = { module.exports = require("asyncjs/test").testcase(Test); }); -if (module === require.main) { +if (typeof module !== "undefined" && module === require.main) { require("../../../support/paths"); - exports.exec() + exports.exec(); } \ No newline at end of file diff --git a/lib/ace/test/navigation_test.js b/lib/ace/test/navigation_test.js index 74a8885a..3174baaa 100644 --- a/lib/ace/test/navigation_test.js +++ b/lib/ace/test/navigation_test.js @@ -37,8 +37,6 @@ define(function(require, exports, module) { -require("./mockdom"); - var EditSession = require("ace/edit_session").EditSession, Editor = require("../editor").Editor, MockRenderer = require("./mockrenderer"), @@ -153,7 +151,7 @@ var Test = { module.exports = require("asyncjs/test").testcase(Test) }); -if (module === require.main) { +if (typeof module !== "undefined" && module === require.main) { require("../../../support/paths"); - exports.exec() + exports.exec(); } diff --git a/lib/ace/test/range_test.js b/lib/ace/test/range_test.js index 74bd136f..b02b32de 100644 --- a/lib/ace/test/range_test.js +++ b/lib/ace/test/range_test.js @@ -164,7 +164,7 @@ var Test = { module.exports = require("asyncjs/test").testcase(Test); }); -if (module === require.main) { +if (typeof module !== "undefined" && module === require.main) { require("../../../support/paths"); - exports.exec() + exports.exec(); } diff --git a/lib/ace/test/search_test.js b/lib/ace/test/search_test.js index 1f42571c..3bd0a05f 100644 --- a/lib/ace/test/search_test.js +++ b/lib/ace/test/search_test.js @@ -347,7 +347,7 @@ var Test = { module.exports = require("asyncjs/test").testcase(Test) }); -if (module === require.main) { +if (typeof module !== "undefined" && module === require.main) { require("../../../support/paths"); - exports.exec() + exports.exec(); } diff --git a/lib/ace/test/selection_test.js b/lib/ace/test/selection_test.js index 06858ec5..445a0e72 100644 --- a/lib/ace/test/selection_test.js +++ b/lib/ace/test/selection_test.js @@ -293,7 +293,7 @@ var Test = { module.exports = require("asyncjs/test").testcase(Test); }); -if (module === require.main) { +if (typeof module !== "undefined" && module === require.main) { require("../../../support/paths"); exports.exec() } diff --git a/lib/ace/test/text_edit_test.js b/lib/ace/test/text_edit_test.js index 9ef70da5..4537464a 100644 --- a/lib/ace/test/text_edit_test.js +++ b/lib/ace/test/text_edit_test.js @@ -36,7 +36,6 @@ * ***** END LICENSE BLOCK ***** */ define(function(require, exports, module) { -require("./mockdom"); var EditSession = require("ace/edit_session").EditSession, Editor = require("../editor").Editor, @@ -441,7 +440,7 @@ var Test = { module.exports = require("asyncjs/test").testcase(Test); }); -if (module === require.main) { +if (typeof module !== "undefined" && module === require.main) { require("../../../support/paths"); - exports.exec() + exports.exec(); } diff --git a/lib/ace/test/virtual_renderer_test.js b/lib/ace/test/virtual_renderer_test.js index 0d4fe8ed..c97dec22 100644 --- a/lib/ace/test/virtual_renderer_test.js +++ b/lib/ace/test/virtual_renderer_test.js @@ -36,7 +36,6 @@ * ***** END LICENSE BLOCK ***** */ define(function(require, exports, module) { -require("./mockdom"); var EditSession = require("ace/edit_session").EditSession, VirtualRenderer = require("../virtual_renderer").VirtualRenderer, @@ -75,7 +74,7 @@ var Test = { module.exports = require("asyncjs/test").testcase(Test); }); -if (module === require.main) { +if (typeof module !== "undefined" && module === require.main) { require("../../../support/paths"); - exports.exec() + exports.exec(); }