Merge pull request #1504 from adobe/jason-sanjose/issue-1494

Fix broken HTMLCodeHints unittests
adobe · Aug 29, 2012 · 2161a9a · 2161a9a
2 parents 7cad4e2 + cd352d6
commit 2161a9a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 37 deletions.
diff --git a/src/extensions/default/HTMLCodeHints/unittests.js b/src/extensions/default/HTMLCodeHints/unittests.js
@@ -30,10 +30,9 @@ define(function (require, exports, module) {
 
     // Modules from the SpecRunner window
     var SpecRunnerUtils = brackets.getModule("spec/SpecRunnerUtils"),
-        Editor          = brackets.getModule("editor/Editor").Editor;
-
-    // Modules from testWindow
-    var HTMLCodeHints, CodeHintManager;
+        Editor          = brackets.getModule("editor/Editor").Editor,
+        CodeHintManager = brackets.getModule("editor/CodeHintManager"),
+        HTMLCodeHints   = require("main");
 
     describe("HTML Attribute Hinting", function () {
 
@@ -52,34 +51,12 @@ define(function (require, exports, module) {
         var testDocument, testEditor;
 
         beforeEach(function () {
-            // Create a new window that will be shared by ALL tests in this spec.
-            // (We need the tests to run in a real Brackets window since HTMLCodeHints requires various core modules (it can't
-            // run 100% in isolation), but popping a new window per testcase is unneeded overhead).
-            if (!testWindow) {
-                SpecRunnerUtils.createTestWindowAndRun(this, function (w) {
-                    testWindow = w;
-
-                    // Get access to the extension's module, so we can unit-test its APIs directly
-                    var extensionRequire = testWindow.brackets.getModule("utils/ExtensionLoader").getRequireContextForExtension("HTMLCodeHints");
-                    HTMLCodeHints = extensionRequire("main");
-                    CodeHintManager = testWindow.brackets.getModule("editor/CodeHintManager");
-                });
-
-                // Once entire spec has finished, then close the window
-                this.after(function () {
-                    SpecRunnerUtils.closeTestWindow();
-                });
-            }
+            // create dummy Document for the Editor
+            testDocument = SpecRunnerUtils.createMockDocument(defaultContent);
 
-            // Create a new, clean-slate Editor for each test
-            runs(function () {
-                // create dummy Document for the Editor
-                testDocument = SpecRunnerUtils.createMockDocument(defaultContent);
-
-                // create Editor instance (containing a CodeMirror instance)
-                $("body").append("<div id='editor'/>");
-                testEditor = new Editor(testDocument, true, "htmlmixed", $("#editor").get(0), {});
-            });
+            // create Editor instance (containing a CodeMirror instance)
+            $("body").append("<div id='editor'/>");
+            testEditor = new Editor(testDocument, true, "htmlmixed", $("#editor").get(0), {});
         });
 
         afterEach(function () {

diff --git a/src/utils/ExtensionLoader.js b/src/utils/ExtensionLoader.js
@@ -37,7 +37,12 @@ define(function (require, exports, module) {
     var NativeFileSystem    = require("file/NativeFileSystem").NativeFileSystem,
         FileUtils           = require("file/FileUtils"),
         Async               = require("utils/Async"),
-        contexts            = {};
+        contexts            = {},
+        globalConfig        = {
+            "text" : "../../../thirdparty/text",
+            "i18n" : "../../../thirdparty/i18n"
+        };
+
     /**
      * Returns the require.js require context used to load an extension
      *
@@ -64,10 +69,7 @@ define(function (require, exports, module) {
                 context: name,
                 baseUrl: config.baseUrl,
                 /* FIXME (issue #1087): can we pass this from the global require context instead of hardcoding twice? */
-                paths: {
-                    "text" : "../../../thirdparty/text",
-                    "i18n" : "../../../thirdparty/i18n"
-                },
+                paths: globalConfig,
                 locale: window.localStorage.getItem("locale") || brackets.app.language
             });
         contexts[name] = extensionRequire;
@@ -106,7 +108,7 @@ define(function (require, exports, module) {
                 var extensionRequire = brackets.libRequire.config({
                     context: name,
                     baseUrl: "../src/" + config.baseUrl,
-                    paths: config.paths
+                    paths: $.extend({}, config.paths, globalConfig)
                 });
 
                 console.log("[Extension] loading unit test " + config.baseUrl);