Merge pull request #4384 from adobe/iwehrman/enable-jslint-before-uni…

…t-tests Explicitly enable JSLint before running JSLint unit tests
adobe · Jul 9, 2013 · 97b957e · 97b957e
2 parents 64357cd + 99eee11
commit 97b957e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/extensions/default/JSLint/main.js b/src/extensions/default/JSLint/main.js
@@ -313,4 +313,7 @@ define(function (require, exports, module) {
         toggleCollapsed(_prefs.getValue("collapsed"));
 
     });
+
+    // for unit tests
+    exports.setEnabled = setEnabled;
 });
diff --git a/src/extensions/default/JSLint/unittests.js b/src/extensions/default/JSLint/unittests.js
@@ -35,6 +35,8 @@ define(function (require, exports, module) {
             testWindow,
             $,
             brackets,
+            extensionRequire,
+            JSLint,
             EditorManager;
 
         var toggleJSLintResults = function (visible) {
@@ -50,6 +52,9 @@ define(function (require, exports, module) {
                     $ = testWindow.$;
                     brackets = testWindow.brackets;
                     EditorManager = testWindow.brackets.test.EditorManager;
+                    extensionRequire = brackets.test.ExtensionLoader.getRequireContextForExtension("JSLint");
+                    JSLint = extensionRequire("main");
+                    JSLint.setEnabled(true);
                 });
             });
 
@@ -63,6 +68,8 @@ define(function (require, exports, module) {
             $             = null;
             brackets      = null;
             EditorManager = null;
+            extensionRequire    = null;
+            JSLint              = null;
             SpecRunnerUtils.closeTestWindow();
         });