Merge pull request #3277 from adobe/jasonsanjose/all-suite

Add "all" suite to run unit, extension, performance and integration tests

Author: redmunds

tasks/test.js

@@ -39,12 +39,13 @@ module.exports = function (grunt) {
             spec            = grunt.option("spec") || "all",
             results         = grunt.option("results") || process.cwd() + "/results.json",
             resultsPath     = common.resolve(results),
-            specRunnerPath  = common.resolve("test/SpecRunner.html");
+            specRunnerPath  = common.resolve("test/SpecRunner.html"),
+            args            = " --startup-path=\"" + specRunnerPath + "?suite=all&spec=" + encodeURIComponent(spec) + "&resultsPath=" + encodeURIComponent(resultsPath) + "\"";
 
         if (platform === "win") {
-            cmd += " --startup-path=" + specRunnerPath + "?spec=" + spec + "^&resultsPath=" + encodeURIComponent(resultsPath);
+            cmd += args;
         } else if (platform === "mac") {
-            cmd = "open \"" + cmd + "\" -W --args --startup-path=\"" + specRunnerPath + "?spec=" + spec + "&resultsPath=" + encodeURIComponent(resultsPath) + "\"";
+            cmd = "open \"" + cmd + "\" -W --args " + args;
         }
 
         grunt.log.writeln(cmd);
@@ -56,8 +57,5 @@ module.exports = function (grunt) {
             done(false);
         });
     });
-
-    function execTest(task, platform) {
-    }
 
 };

test/SpecRunner.html

@@ -63,6 +63,7 @@
           <a class="brand" href="#">Brackets Tests</a>
           <div class="nav-collapse">
             <ul class="nav">
+              <li><a id="all" href="?suite=all">All</a></li>
               <li><a id="UnitTestSuite" href="?suite=UnitTestSuite">Unit</a></li>
               <li><a id="IntegrationTestSuite" href="?suite=IntegrationTestSuite">Integration</a></li>
               <li><a id="PerformanceTestSuite" href="?suite=PerformanceTestSuite">Performance</a></li>

test/SpecRunner.js

@@ -65,7 +65,7 @@ define(function (require, exports, module) {
     require("test/UnitTestSuite");
     require("test/PerformanceTestSuite");
 
-    var suite,
+    var selectedSuite,
         params = new UrlParams(),
         reporter,
         _nodeConnectionDeferred = new $.Deferred(),
@@ -127,7 +127,7 @@ define(function (require, exports, module) {
             window.location.reload(true);
         });
 
-        $("#" + suite).closest("li").toggleClass("active", true);
+        $("#" + selectedSuite).closest("li").toggleClass("active", true);
 
         AppInit._dispatchReady(AppInit.APP_READY);
 
@@ -200,15 +200,30 @@ define(function (require, exports, module) {
                 );
         });
 
-        suite = params.get("suite") || localStorage.getItem("SpecRunner.suite") || "UnitTestSuite";
+        selectedSuite = params.get("suite") || localStorage.getItem("SpecRunner.suite") || "UnitTestSuite";
 
         // Create a top-level filter to show/hide performance and extensions tests
-        var isPerfSuite = (suite === "PerformanceTestSuite"),
-            isExtSuite = (suite === "ExtensionTestSuite"),
-            isIntegrationSuite = (suite === "IntegrationTestSuite");
+        var runAll = (selectedSuite === "all"),
+            isPerfSuite = (selectedSuite === "PerformanceTestSuite"),
+            isExtSuite = (selectedSuite === "ExtensionTestSuite"),
+            isIntegrationSuite = (selectedSuite === "IntegrationTestSuite"),
+            category;
+            
+        if (isPerfSuite) {
+            category = "performance";
+        } else if (isIntegrationSuite) {
+            category = "integration";
+        } else if (isExtSuite) {
+            category = "extension";
+        }
 
         var topLevelFilter = function (spec) {
-            var suite = spec.suite;
+            // special case "all" suite to run unit, perf, extension, and integration tests
+            if (runAll) {
+                return true;
+            }
+
+            var currentSuite = spec.suite;
 
             // unit test suites have no category
             if (!isPerfSuite && !isExtSuite && !isIntegrationSuite) {
@@ -217,38 +232,28 @@ define(function (require, exports, module) {
                     return false;
                 }
 
-                while (suite) {
-                    if (suite.category !== undefined) {
+                while (currentSuite) {
+                    if (currentSuite.category !== undefined) {
                         // any suite in the hierarchy may specify a category
                         return false;
                     }
 
-                    suite = suite.parentSuite;
+                    currentSuite = currentSuite.parentSuite;
                 }
 
                 return true;
             }
 
-            var category;
-            
-            if (isPerfSuite) {
-                category = "performance";
-            } else if (isIntegrationSuite) {
-                category = "integration";
-            } else {
-                category = "extension";
-            }
-            
             if (spec.category === category) {
                 return true;
             }
 
-            while (suite) {
-                if (suite.category === category) {
+            while (currentSuite) {
+                if (currentSuite.category === category) {
                     return true;
                 }
 
-                suite = suite.parentSuite;
+                currentSuite = currentSuite.parentSuite;
             }
 
             return false;
@@ -263,7 +268,7 @@ define(function (require, exports, module) {
         // configure spawned test windows to load extensions
         SpecRunnerUtils.setLoadExtensionsInTestWindow(isExtSuite);
 
-        _loadExtensionTests(suite).done(function () {
+        _loadExtensionTests(selectedSuite).done(function () {
             var jasmineEnv = jasmine.getEnv();
 
             // Initiailize unit test preferences for each spec
@@ -297,7 +302,7 @@ define(function (require, exports, module) {
             reporterView = new BootstrapReporterView(document, reporter);
 
             // remember the suite for the next unit test window launch
-            localStorage.setItem("SpecRunner.suite", suite);
+            localStorage.setItem("SpecRunner.suite", selectedSuite);
 
             $(window.document).ready(_documentReadyHandler);
         });