fix browser tests

This commit is contained in:
Fabian Jakobs 2011-08-15 13:47:01 +02:00
commit ca6749cd3b
8 changed files with 47 additions and 44 deletions

View file

@ -47,7 +47,7 @@ var lang = require("pilot/lang");
var EditSession = require("ace/edit_session").EditSession; var EditSession = require("ace/edit_session").EditSession;
var Editor = require("ace/editor").Editor; var Editor = require("ace/editor").Editor;
var UndoManager = require("ace/undomanager").UndoManager; var UndoManager = require("ace/undomanager").UndoManager;
var MockRenderer = require("ace/test/mockrenderer"); var MockRenderer = require("ace/test/mockrenderer").MockRenderer;
var Range = require("ace/range").Range; var Range = require("ace/range").Range;
var assert = require("ace/test/assertions"); var assert = require("ace/test/assertions");

View file

@ -46,7 +46,7 @@ var EditSession = require("ace/edit_session").EditSession;
var Editor = require("ace/editor").Editor; var Editor = require("ace/editor").Editor;
var Text = require("ace/mode/text").Mode; var Text = require("ace/mode/text").Mode;
var JavaScriptMode = require("ace/mode/javascript").Mode; var JavaScriptMode = require("ace/mode/javascript").Mode;
var MockRenderer = require("ace/test/mockrenderer"); var MockRenderer = require("ace/test/mockrenderer").MockRenderer;
var assert = require("ace/test/assertions"); var assert = require("ace/test/assertions");
module.exports = { module.exports = {
@ -54,6 +54,8 @@ module.exports = {
setUp : function(next) { setUp : function(next) {
this.session1 = new EditSession(["abc", "def"]); this.session1 = new EditSession(["abc", "def"]);
this.session2 = new EditSession(["ghi", "jkl"]); this.session2 = new EditSession(["ghi", "jkl"]);
this.editor = new Editor(new MockRenderer()); this.editor = new Editor(new MockRenderer());
next(); next();
}, },

View file

@ -45,7 +45,7 @@ define(function(require, exports, module) {
var EditSession = require("ace/edit_session").EditSession; var EditSession = require("ace/edit_session").EditSession;
var Editor = require("ace/editor").Editor; var Editor = require("ace/editor").Editor;
var MockRenderer = require("ace/test/mockrenderer"); var MockRenderer = require("ace/test/mockrenderer").MockRenderer;
var TextMode = require("ace/mode/text").Mode; var TextMode = require("ace/mode/text").Mode;
var assert = require("ace/test/assertions"); var assert = require("ace/test/assertions");

View file

@ -44,7 +44,7 @@ define(function(require, exports, module) {
var EditSession = require("ace/edit_session").EditSession; var EditSession = require("ace/edit_session").EditSession;
var Editor = require("ace/editor").Editor; var Editor = require("ace/editor").Editor;
var MockRenderer = require("ace/test/mockrenderer"); var MockRenderer = require("ace/test/mockrenderer").MockRenderer;
var assert = require("ace/test/assertions"); var assert = require("ace/test/assertions");
module.exports = { module.exports = {

View file

@ -46,7 +46,7 @@ var EditSession = require("ace/edit_session").EditSession;
var Editor = require("ace/editor").Editor; var Editor = require("ace/editor").Editor;
var JavaScriptMode = require("ace/mode/javascript").Mode; var JavaScriptMode = require("ace/mode/javascript").Mode;
var UndoManager = require("ace/undomanager").UndoManager; var UndoManager = require("ace/undomanager").UndoManager;
var MockRenderer = require("ace/test/mockrenderer"); var MockRenderer = require("ace/test/mockrenderer").MockRenderer;
var assert = require("ace/test/assertions"); var assert = require("ace/test/assertions");
module.exports = { module.exports = {

View file

@ -1,7 +1,7 @@
define(function(require, exports, module) { define(function(require, exports, module) {
require("pilot/fixoldbrowsers"); require("pilot/fixoldbrowsers");
var AsyncTest = require("asyncjs").test; var AsyncTest = require("asyncjs/test");
var async = require("asyncjs"); var async = require("asyncjs");
var dom = require("pilot/dom"); var dom = require("pilot/dom");
@ -10,28 +10,32 @@ var failed = 0
var log = document.getElementById("log") var log = document.getElementById("log")
var tests = [ var tests = [
require("ace/editor_change_document_test"), require("ace/anchor_test"),
require("ace/editor_navigation_test"),
require("ace/editor_highlight_selected_word_test"),
require("ace/editor_text_edit_test"),
require("ace/document_test"), require("ace/document_test"),
require("ace/edit_session_test"), require("ace/edit_session_test"),
require("ace/test/event_emitter_test"), require("ace/editor_change_document_test"),
require("ace/range_test"), require("ace/editor_highlight_selected_word_test"),
require("ace/search_test"), require("ace/editor_navigation_test"),
require("ace/selection_test"), require("ace/editor_text_edit_test"),
require("ace/virtual_renderer_test"), require("ace/layer/text_test"),
require("ace/anchor_test"), require("ace/mode/coffee/parser_test"),
require("ace/mode/css_test"), require("ace/mode/css_test"),
require("ace/mode/css_tokenizer_test"), require("ace/mode/css_tokenizer_test"),
require("ace/mode/css_worker"),
require("ace/mode/html_test"), require("ace/mode/html_test"),
require("ace/mode/html_tokenizer_test"), require("ace/mode/html_tokenizer_test"),
require("ace/mode/javascript_test"), require("ace/mode/javascript_test"),
require("ace/mode/javascript_tokenizer_test"), require("ace/mode/javascript_tokenizer_test"),
require("ace/mode/javascript_worker_test"),
require("ace/mode/ruby_tokenizer_test"), require("ace/mode/ruby_tokenizer_test"),
require("ace/mode/text_test"), require("ace/mode/text_test"),
require("ace/mode/xml_test"), require("ace/mode/xml_test"),
require("ace/mode/xml_tokenizer_test") require("ace/mode/xml_tokenizer_test"),
require("ace/range_test"),
require("ace/search_test"),
require("ace/selection_test"),
require("ace/test/event_emitter_test"),
require("ace/virtual_renderer_test")
] ]
async.list(tests) async.list(tests)

View file

@ -37,7 +37,7 @@
define(function(require, exports, module) { define(function(require, exports, module) {
MockRenderer = function(visibleRowCount) { var MockRenderer = exports.MockRenderer = function(visibleRowCount) {
this.container = document.createElement("div"); this.container = document.createElement("div");
this.visibleRowCount = visibleRowCount || 20; this.visibleRowCount = visibleRowCount || 20;
@ -161,5 +161,4 @@ MockRenderer.prototype.textToScreenCoordinates = function() {
} }
}; };
return MockRenderer;
}); });

View file

@ -23,32 +23,30 @@
<div id="log"></div> <div id="log"></div>
<script src="../../../demo/require.js" type="text/javascript" charset="utf-8"></script> <script type="text/javascript">
<script> var require = {
paths: {
require({ ace: "../",
paths: { cockpit: "../../../../support/cockpit/lib/cockpit",
ace: "../lib/ace", pilot: "../../../../support/pilot/lib/pilot"
cockpit: "../support/cockpit/lib/cockpit", },
pilot: "../support/pilot/lib/pilot" packages : [{
}, name: "asyncjs",
packages : [{ location: "./asyncjs",
name: "asyncjs", main: "index"
location: "../lib/ace/test", }, {
lib: "asyncjs", name: "assert",
main: "index" location: "./asyncjs",
}, { main: "assert"
name: "assert", }, {
location: "../lib/ace/test", name: "text",
lib: "asyncjs", location: "../../../demo",
main: "assert" main: "text"
}] }]
}); };
require(["ace/test/all_browser"], function(tests) {
});
</script> </script>
<script src="../../../demo/require.js" data-main="all_browser" type="text/javascript" charset="utf-8"></script>
</body> </body>
</html> </html>