Merge pull request #4618 from adobe/jasonsanjose/integration-test-win…

…dows Reuse test windows during integration suites
adobe · Aug 1, 2013 · 3855dc6 · 3855dc6
2 parents f04c489 + 60fe648
commit 3855dc6
Show file tree

Hide file tree

Showing 7 changed files with 809 additions and 773 deletions.
diff --git a/src/editor/CodeHintManager.js b/src/editor/CodeHintManager.js
@@ -286,6 +286,41 @@ define(function (require, exports, module) {
             });
         }
     }
+
+    /**
+     * @private
+     * Remove a code hint provider
+     * @param {!CodeHintProvider} provider Code hint provider to remove
+     * @param {(string|Array.<string>)=} targetLanguageId Optional set of
+     *     language IDs for languages to remove the provider for. Defaults
+     *     to all languages.
+     */
+    function _removeHintProvider(provider, targetLanguageId) {
+        var languageId,
+            languages,
+            index,
+            providers,
+            targetLanguageIdArr;
+
+        if (Array.isArray(targetLanguageId)) {
+            targetLanguageIdArr = targetLanguageId;
+        } else if (targetLanguageId) {
+            targetLanguageIdArr = [targetLanguageId];
+        } else {
+            targetLanguageIdArr = Object.keys(hintProviders);
+        }
+
+        targetLanguageIdArr.forEach(function (languageId) {
+            providers = hintProviders[languageId];
+
+            for (index = 0; index < providers.length; index++) {
+                if (providers[index].provider === provider) {
+                    providers.splice(index, 1);
+                    break;
+                }
+            }
+        });
+    }
 
     /** 
      *  Return the array of hint providers for the given language id.
@@ -546,6 +581,7 @@ define(function (require, exports, module) {
     CommandManager.register(Strings.CMD_SHOW_CODE_HINTS, Commands.SHOW_CODE_HINTS, _startNewSession);
 
     exports._getCodeHintList        = _getCodeHintList;
+    exports._removeHintProvider     = _removeHintProvider;
 
     // Define public API
     exports.isOpen                  = isOpen;

diff --git a/test/spec/CodeHint-test.js b/test/spec/CodeHint-test.js
@@ -22,7 +22,7 @@
  */
 
 /*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, describe, beforeEach, afterEach, it, runs, waits, waitsForDone, expect, $  */
+/*global define, describe, beforeEach, afterEach, it, runs, waits, waitsForDone, expect, $, beforeFirst, afterLast  */
 
 define(function (require, exports, module) {
     "use strict";
@@ -50,22 +50,21 @@ define(function (require, exports, module) {
          * @param {!string} openFile Project relative file path to open in a main editor.
          * @param {!number} openPos The pos within openFile to place the IP.
          */
-        var _initCodeHintTest = function (openFile, openPos) {
-
+        function initCodeHintTest(openFile, openPos) {
             SpecRunnerUtils.loadProjectInTestWindow(testPath);
 
             runs(function () {
                 var promise = SpecRunnerUtils.openProjectFiles([openFile]);
                 waitsForDone(promise);
             });
+
             runs(function () {
                 var editor = EditorManager.getCurrentFullEditor();
                 editor.setCursorPos(openPos.line, openPos.ch);
             });
-        };
-
-        beforeEach(function () {
-            initCodeHintTest = _initCodeHintTest.bind(this);
+        }
+
+        beforeFirst(function () {
             SpecRunnerUtils.createTestWindowAndRun(this, function (w) {
                 testWindow = w;
 
@@ -79,9 +78,8 @@ define(function (require, exports, module) {
                 KeyBindingManager   = testWindow.brackets.test.KeyBindingManager;
             });
         });
-
-        afterEach(function () {
-            initCodeHintTest    = null;
+
+        afterLast(function () {
             testWindow          = null;
             CodeHintManager     = null;
             EditorManager       = null;
@@ -90,6 +88,11 @@ define(function (require, exports, module) {
             SpecRunnerUtils.closeTestWindow();
         });
 
+        afterEach(function () {
+            runs(function () {
+                testWindow.closeAllFiles();
+            });
+        });
 
         function invokeCodeHints() {
             CommandManager.execute(Commands.SHOW_CODE_HINTS);
@@ -100,14 +103,14 @@ define(function (require, exports, module) {
             var codeHintList = CodeHintManager._getCodeHintList();
             expect(codeHintList).toBeFalsy();
         }
+
         function expectSomeHints() {
             var codeHintList = CodeHintManager._getCodeHintList();
             expect(codeHintList).toBeTruthy();
             expect(codeHintList.isOpen()).toBe(true);
             return codeHintList;
         }
 
-
         describe("Hint Provider Registration", function () {
             beforeEach(function () {
                 initCodeHintTest("test1.html", {line: 0, ch: 0});
@@ -144,6 +147,8 @@ define(function (require, exports, module) {
                 runs(function () {
                     invokeCodeHints();
                     expectMockHints();
+
+                    CodeHintManager._removeHintProvider(mockProvider, ["clojure"], 0);
                 });
             });
 
@@ -156,6 +161,8 @@ define(function (require, exports, module) {
                     editor.setCursorPos(3, 1);
                     invokeCodeHints();
                     expectMockHints();
+
+                    CodeHintManager._removeHintProvider(mockProvider, ["html"], 1);
                 });
             });
 
@@ -174,6 +181,8 @@ define(function (require, exports, module) {
                 runs(function () {
                     invokeCodeHints();
                     expectMockHints();
+
+                    CodeHintManager._removeHintProvider(mockProvider, ["all"], 0);
                 });
             });
         });

diff --git a/test/spec/DocumentCommandHandlers-test.js b/test/spec/DocumentCommandHandlers-test.js
@@ -85,7 +85,13 @@ define(function (require, exports, module) {
 
         afterEach(function () {
             promise = null;
-            testWindow.closeAllDocuments();
+
+            runs(function () {
+                // Call closeAll() directly. Some tests set a spy on the save as
+                // dialog preventing SpecRunnerUtils.closeAllFiles() from
+                // working properly.
+                testWindow.brackets.test.DocumentManager.closeAll();
+            });
         });