Merge pull request #2859 from adobe/dangoor/testsplit

Fixes 2747, split unit and integration tests

Author: dangoor

test/SpecRunner.html

@@ -61,6 +61,7 @@
           <div class="nav-collapse">
             <ul class="nav">
               <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>
               <li><a id="ExtensionSuite" href="?suite=ExtensionTestSuite">Extensions</a></li>
               <li><a id="reload" href="#">Reload</a></li>

test/SpecRunner.js

@@ -161,13 +161,14 @@ define(function (require, exports, module) {
 
         // Create a top-level filter to show/hide performance and extensions tests
         var isPerfSuite = (suite === "PerformanceTestSuite"),
-            isExtSuite = (suite === "ExtensionTestSuite");
+            isExtSuite = (suite === "ExtensionTestSuite"),
+            isIntegrationSuite = (suite === "IntegrationTestSuite");
 
         var topLevelFilter = function (spec) {
             var suite = spec.suite;
 
             // unit test suites have no category
-            if (!isPerfSuite && !isExtSuite) {
+            if (!isPerfSuite && !isExtSuite && !isIntegrationSuite) {
                 if (spec.category !== undefined) {
                     // if an individualy spec has a category, filter it out
                     return false;
@@ -185,7 +186,15 @@ define(function (require, exports, module) {
                 return true;
             }
 
-            var category = (isPerfSuite) ? "performance" : "extension";
+            var category;
+            
+            if (isPerfSuite) {
+                category = "performance";
+            } else if (isIntegrationSuite) {
+                category = "integration";
+            } else {
+                category = "extension";
+            }
 
             if (spec.category === category) {
                 return true;

test/spec/CSSUtils-test.js

@@ -1314,6 +1314,8 @@ define(function (require, exports, module) {
 
 
         describe("Working with real public CSSUtils API", function () {
+            this.category = "integration";
+            
             var CSSUtils;
 
             beforeEach(function () {
@@ -1349,6 +1351,8 @@ define(function (require, exports, module) {
 
 
         describe("Working with unsaved changes", function () {
+            this.category = "integration";
+            
             var testPath = SpecRunnerUtils.getTestPath("/spec/CSSUtils-test-files"),
                 CSSUtils,
                 DocumentManager,

test/spec/CodeHint-test.js

@@ -40,6 +40,7 @@ define(function (require, exports, module) {
         initCodeHintTest;
 
     describe("Code Hint Menus", function () {
+        this.category = "integration";
 
         /**
          * Performs setup for a code hint test. Opens a file and set pos.

test/spec/Document-test.js

@@ -37,7 +37,8 @@ define(function (require, exports, module) {
 
 
     describe("Document", function () {
-
+        this.category = "integration";
+        
         var testPath = SpecRunnerUtils.getTestPath("/spec/Document-test-files"),
             testWindow;
 

test/spec/DocumentCommandHandlers-test.js

@@ -39,6 +39,7 @@ define(function (require, exports, module) {
 
 
     describe("DocumentCommandHandlers", function () {
+        this.category = "integration";
 
         var testPath = SpecRunnerUtils.getTestPath("/spec/DocumentCommandHandlers-test-files"),
             testWindow;

test/spec/ExtensionUtils-test.js

@@ -34,6 +34,7 @@ define(function (require, exports, module) {
 
 
     describe("Extension Utils", function () {
+        this.category = "integration";
 
         var testWindow;
 

test/spec/FileIndexManager-test.js

@@ -34,6 +34,8 @@ define(function (require, exports, module) {
         SpecRunnerUtils     = require("spec/SpecRunnerUtils");
 
     describe("FileIndexManager", function () {
+        
+        this.category = "integration";
 
         var testPath = SpecRunnerUtils.getTestPath("/spec/FileIndexManager-test-files");
         var brackets;

test/spec/InlineEditorProviders-test.js

@@ -40,6 +40,8 @@ define(function (require, exports, module) {
         SpecRunnerUtils  = require("spec/SpecRunnerUtils");
 
     describe("InlineEditorProviders", function () {
+        
+        this.category = "integration";
 
         var testPath = SpecRunnerUtils.getTestPath("/spec/InlineEditorProviders-test-files"),
             tempPath = SpecRunnerUtils.getTempDirectory(),

test/spec/JSUtils-test.js

@@ -386,6 +386,8 @@ define(function (require, exports, module) {
 
     describe("JS Indexing: ", function () {
 
+        this.category = "integration";
+        
         var functions;  // populated by indexAndFind()
 
         beforeEach(function () {