Fix test runner (#5686)

* fix test runner not opening in browser

* remove unused amd-loader

* remove spurious warnings about messages in tests

* fix sckipped mode loading test

Author: nightwing

src/anchor_test.js

@@ -1,7 +1,3 @@
-if (typeof process !== "undefined") {
-    require("amd-loader");
-}
-
 "use strict";
 
 var Document = require("./document").Document;

src/background_tokenizer_test.js

@@ -1,7 +1,3 @@
-if (typeof process !== "undefined") {
-    require("amd-loader");
-}
-
 "use strict";
 
 var EditSession = require("./edit_session").EditSession;

src/commands/command_manager_test.js

@@ -1,7 +1,3 @@
-if (typeof process !== "undefined") {
-    require("amd-loader");
-}
-
 "use strict";
 
 var CommandManager = require("./command_manager").CommandManager;

src/config_test.js

@@ -1,14 +1,13 @@
-if (typeof process !== "undefined") {
-    require("amd-loader");
-}
-
 "use strict";
 
 var config = require("./config");
 var assert = require("./test/assertions");
+var {defaultEnglishMessages} = require("./lib/default_english_messages");
 
 module.exports = {
-
+    tearDown: function() {
+        config.setMessages(defaultEnglishMessages);
+    },
     "test: path resolution" : function(done) {
         config.set("packaged", true);
         var url = config.moduleUrl("kr_theme", "theme");

src/document_test.js

@@ -1,7 +1,3 @@
-if (typeof process !== "undefined") {
-    require("amd-loader");
-}
-
 "use strict";
 
 var Document = require("./document").Document;

src/edit_session_test.js

@@ -1106,24 +1106,50 @@ module.exports = {
     },
 
     "test: mode loading" : function(next) {
-        if (!require.undef) {
-            console.log("Skipping test: This test only runs in the browser");
-            next();
-            return;
-        }
+        delete EditSession.prototype.$modes["ace/mode/javascript"];
+        delete EditSession.prototype.$modes["ace/mode/css"];
+        delete EditSession.prototype.$modes["ace/mode/sh"];
+        require("./config").setLoader(function(name, onLoad) {
+            if (name == "ace/mode/javascript") {
+                return onLoad(null, require("./mode/javascript"));
+            }
+            if (name == "ace/mode/sh") {
+                return setTimeout(function() {
+                    return onLoad(null, require("./mode/sh"));
+                });
+            }
+            if (name == "ace/mode/css") {
+                return setTimeout(function() {
+                    return onLoad(null, require("./mode/css"));
+                });
+            }
+        });
         var session = new EditSession([]);
         session.setMode("ace/mode/javascript");
-        assert.equal(session.$modeid, "ace/mode/javascript");
-        session.on("changeMode", function() {
-            assert.equal(session.$modeid, "ace/mode/javascript");
+        assert.equal(session.$modeId, "ace/mode/javascript");
+
+        var modeChangeCallbacks = 0;
+        session.once("changeMode", function() {
+            assert.equal(session.$modeId, "ace/mode/sh");
+            modeChangeCallbacks++;
         });
-        session.setMode("ace/mode/sh", function(mode) {
-            assert.ok(!mode);
+        session.setMode("ace/mode/sh", function() {
+            assert.equal(session.$mode.$id, "ace/mode/sh");
+            modeChangeCallbacks++;
         });
+        assert.equal(session.$modeId, "ace/mode/sh");
+        assert.equal(session.$mode.$id, "ace/mode/javascript");
         setTimeout(function() {
-            session.setMode("ace/mode/javascript", function(mode) {
-                session.setMode("ace/mode/javascript");
-                assert.equal(session.$modeid, "ace/mode/javascript");
+            assert.equal(modeChangeCallbacks, 2);
+            session.setMode("ace/mode/javascript");
+            assert.equal(session.$mode.$id, "ace/mode/javascript");
+            session.setMode("ace/mode/sh");
+            assert.equal(session.$mode.$id, "ace/mode/sh");
+            session.setMode("ace/mode/css");
+            assert.equal(session.$mode.$id, "ace/mode/sh");
+            // TODO this should not error
+            // session.destroy();
+            setTimeout(function() {
                 next();
             });
         }, 0);

src/ext/beautify_test.js

@@ -1,7 +1,3 @@
-if (typeof process !== "undefined") {
-    require("amd-loader");
-}
-
 "use strict";
 
 var assert = require("assert");

src/ext/emmet_test.js

@@ -1,7 +1,3 @@
-if (typeof process !== "undefined") {
-    require("amd-loader");
-}
-
 "use strict";
 
 require("../test/mockdom");

src/ext/error_marker_test.js

@@ -1,7 +1,3 @@
-if (typeof process !== "undefined") {
-    require("amd-loader");
-}
-
 "use strict";
 
 var assert = require("./../test/assertions");

src/ext/hardwrap_test.js

@@ -1,7 +1,3 @@
-if (typeof process !== "undefined") {
-    require("amd-loader");
-}
-
 "use strict";
 
 var assert = require("./../test/assertions");

src/ext/static_highlight_test.js

@@ -1,7 +1,3 @@
-if (typeof process !== "undefined") {
-    require("amd-loader");
-}
-
 "use strict";
 
 var assert = require("assert");

src/ext/whitespace_test.js

@@ -1,7 +1,3 @@
-if (typeof process !== "undefined") {
-    require("amd-loader");
-}
-
 "use strict";
 
 require("../test/mockdom");

src/incremental_search_test.js

@@ -1,7 +1,3 @@
-if (typeof process !== "undefined") {
-    require("amd-loader");
-}
-
 "use strict";
 
 var emacs = require('./keyboard/emacs');

src/keyboard/keybinding_test.js

@@ -1,7 +1,3 @@
-if (typeof process !== "undefined") {
-    require("amd-loader");
-}
-
 "use strict";
 
 var EditSession = require("./../edit_session").EditSession,

src/keyboard/textinput_test.js

@@ -1,9 +1,5 @@
 /*global CustomEvent*/
 
-if (typeof process !== "undefined") {
-    require("amd-loader");
-}
-
 "use strict";
 
 require("../test/mockdom");

src/keyboard/vim_ace_test.js

@@ -1,9 +1,5 @@
 /*global CustomEvent*/
 
-if (typeof process !== "undefined") {
-    require("amd-loader");
-}
-
 "use strict";
 
 var assert = require("./../test/assertions");

src/lib/app_config.js

@@ -156,7 +156,7 @@ class AppConfig {
      */
     nls(key, defaultString, params) {
         if (!messages[key])  {
-            warn("No message found for the key '" + key + "' in the provided messages, trying to find a translation for the default string '" + defaultString + "'.");
+            warn("No message found for the key '" + key + "' in messages with id " + messages.$id + ", trying to find a translation for the default string '" + defaultString + "'.");
             if (!messages[defaultString]) {
                 warn("No message found for the default string '" + defaultString + "' in the provided messages. Falling back to the default English message.");
             }

src/lib/event_emitter_test.js

@@ -1,7 +1,3 @@
-if (typeof process !== "undefined") {
-    require("amd-loader");
-}
-
 "use strict";
 
 var oop = require("../lib/oop");

src/mode/_test/highlight_rules_test.js

@@ -10,8 +10,6 @@ var editor = new Editor(new MockRenderer());
 if (!fs.existsSync)
     fs.existsSync = path.existsSync;
 
-require("amd-loader");
-
 var cwd = __dirname + "/";
 var root = path.normalize(cwd + Array(4).join("../"));
 

src/mode/ada_test.js

@@ -1,7 +1,3 @@
-if (typeof process !== "undefined") {
-    require("amd-loader");
-}
-
 "use strict";
 
 var EditSession = require("../edit_session").EditSession;

src/mode/coldfusion_test.js

@@ -1,7 +1,3 @@
-if (typeof process !== "undefined") {
-    require("amd-loader");
-}
-
 "use strict";
 
 var EditSession = require("../edit_session").EditSession;

src/mode/css_test.js

@@ -1,7 +1,3 @@
-if (typeof process !== "undefined") {
-    require("amd-loader");
-}
-
 "use strict";
 
 var EditSession = require("../edit_session").EditSession;

src/mode/folding/basic_test.js

@@ -1,6 +1,3 @@
-if (typeof process !== "undefined")
-    require("amd-loader");
-
 "use strict";
 
 var BasicMode = require("../basic").Mode;

src/mode/folding/coffee_test.js

@@ -1,6 +1,3 @@
-if (typeof process !== "undefined")
-    require("amd-loader");
-
 "use strict";
 
 var CoffeeMode = require("../coffee").Mode;

src/mode/folding/cstyle_test.js

@@ -1,6 +1,3 @@
-if (typeof process !== "undefined")
-    require("amd-loader");
-
 "use strict";
 
 var JavaScriptMode = require("../javascript").Mode;

src/mode/folding/fold_mode_test.js

@@ -1,6 +1,3 @@
-if (typeof process !== "undefined")
-    require("amd-loader");
-
 "use strict";
 
 var MarkdownMode = require("../markdown").Mode;

src/mode/folding/html_test.js

@@ -1,6 +1,3 @@
-if (typeof process !== "undefined")
-    require("amd-loader");
-
 "use strict";
 
 var HtmlMode = require("../html").Mode;

src/mode/folding/javascript_test.js

@@ -1,6 +1,3 @@
-if (typeof process !== "undefined")
-    require("amd-loader");
-
 "use strict";
 
 var JavaScriptMode = require("../javascript").Mode;

src/mode/folding/latex_test.js

@@ -1,5 +1,3 @@
-if (typeof process !== "undefined") require("amd-loader");
-
 "use strict";
 
 var LatexMode = require("../latex").Mode;

src/mode/folding/lua_test.js

@@ -1,5 +1,3 @@
-if (typeof process !== "undefined") require("amd-loader");
-
 "use strict";
 
 var LuaMode = require("../lua").Mode;

src/mode/folding/php_test.js

@@ -1,5 +1,3 @@
-if (typeof process !== "undefined") require("amd-loader");
-
 "use strict";
 
 var PHPMode = require("../php").Mode;

src/mode/folding/pythonic_test.js

@@ -1,6 +1,3 @@
-if (typeof process !== "undefined")
-    require("amd-loader");
-
 "use strict";
 
 var PythonMode = require("../python").Mode;

src/mode/folding/ruby_test.js

@@ -1,6 +1,3 @@
-if (typeof process !== "undefined")
-    require("amd-loader");
-
 "use strict";
 
 var RubyMode = require("../ruby").Mode;

src/mode/folding/vbscript_test.js

@@ -1,6 +1,3 @@
-if (typeof process !== "undefined")
-    require("amd-loader");
-
 "use strict";
 
 var VBScriptMode = require("../vbscript").Mode;

src/mode/folding/xml_test.js

@@ -1,6 +1,3 @@
-if (typeof process !== "undefined")
-    require("amd-loader");
-
 "use strict";
 
 var XmlMode = require("../xml").Mode;

src/mode/folding/yaml_test.js

@@ -1,6 +1,3 @@
-if (typeof process !== "undefined")
-    require("amd-loader");
-
 "use strict";
 
 var YamlMode = require("../yaml").Mode;

src/mode/html_test.js

@@ -1,7 +1,3 @@
-if (typeof process !== "undefined") {
-    require("amd-loader");
-}
-
 "use strict";
 
 var EditSession = require("../edit_session").EditSession;

src/mode/javascript_test.js

@@ -1,7 +1,3 @@
-if (typeof process !== "undefined") {
-    require("amd-loader");
-}
-
 "use strict";
 
 var EditSession = require("../edit_session").EditSession;

src/mode/logiql_test.js

@@ -1,7 +1,3 @@
-if (typeof process !== "undefined") {
-    require("amd-loader");
-}
-
 "use strict";
 
 var EditSession = require("../edit_session").EditSession;

src/mode/odin_test.js

@@ -1,7 +1,3 @@
-if (typeof process !== "undefined") {
-    require("amd-loader");
-}
-
 "use strict";
 
 var EditSession = require("../edit_session").EditSession;

src/mode/php_test.js

@@ -1,7 +1,3 @@
-if (typeof process !== "undefined") {
-    require("amd-loader");
-}
-
 "use strict";
 
 var EditSession = require("../edit_session").EditSession;

src/mode/plain_text_test.js

@@ -1,7 +1,3 @@
-if (typeof process !== "undefined") {
-    require("amd-loader");
-}
-
 "use strict";
 
 var EditSession = require("../edit_session").EditSession;

src/mode/python_test.js

@@ -1,7 +1,3 @@
-if (typeof process !== "undefined") {
-    require("amd-loader");
-}
-
 "use strict";
 
 var EditSession = require("../edit_session").EditSession;