Merge pull request #5290 from lkcampbell/menu-unit-test

redmunds · redmunds · commit 36b2e4a4821a · 2013-09-26T08:46:30.000-07:00
Reactivate HTML Menu unit tests as part of the test suite
diff --git a/src/utils/Global.js b/src/utils/Global.js
@@ -34,7 +34,14 @@
 define(function (require, exports, module) {
     "use strict";
     
-    var configJSON = require("text!config.json");
+    var configJSON  = require("text!config.json"),
+        UrlParams   = require("utils/UrlParams").UrlParams;
+    
+    var params          = new UrlParams(),
+        hasNativeMenus  = "";
+    
+    // read URL params
+    params.parse();
     
     // Define core brackets namespace if it isn't already defined
     //
@@ -77,7 +84,13 @@ define(function (require, exports, module) {
     
     global.brackets.inBrowser = !global.brackets.hasOwnProperty("fs");
     
-    global.brackets.nativeMenus = (!global.brackets.inBrowser && (global.brackets.platform !== "linux"));
+    hasNativeMenus = params.get("hasNativeMenus");
+    
+    if (hasNativeMenus) {
+        global.brackets.nativeMenus = (hasNativeMenus === "true");
+    } else {
+        global.brackets.nativeMenus = (!global.brackets.inBrowser && (global.brackets.platform !== "linux"));
+    }
     
     global.brackets.isLocaleDefault = function () {
         return !global.localStorage.getItem("locale");
diff --git a/test/spec/Menu-test.js b/test/spec/Menu-test.js
@@ -36,16 +36,16 @@ define(function (require, exports, module) {
         KeyEvent            = require("utils/KeyEvent");
 
 
-    describe("Menus", function () {
+    describe("Menus (Native Shell)", function () {
         
         this.category = "integration";
 
         var testWindow;
 
         beforeFirst(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).
+            var testWindowOptions = {"hasNativeMenus" : true};
+            
+            // Create a new native menu window that will be shared by ALL tests in this spec.
             SpecRunnerUtils.createTestWindowAndRun(this, function (w) {
                 testWindow = w;
 
@@ -54,7 +54,7 @@ define(function (require, exports, module) {
                 Commands          = testWindow.brackets.test.Commands;
                 KeyBindingManager = testWindow.brackets.test.KeyBindingManager;
                 Menus             = testWindow.brackets.test.Menus;
-            });
+            }, testWindowOptions);
         });
         
         afterLast(function () {
@@ -210,11 +210,39 @@ define(function (require, exports, module) {
                 expect($menus.length).toBe(0);
             });
         });
+    });
+
+    
+    describe("Menus (HTML)", function () {
+        
+        this.category = "integration";
+
+        var testWindow;
 
-        if (!brackets.inBrowser) {
-            return;
-        }
+        beforeFirst(function () {
+            var testWindowOptions = {"hasNativeMenus" : false};
+            
+            // Create a new HTML menu window that will be shared by ALL tests in this spec.
+            SpecRunnerUtils.createTestWindowAndRun(this, function (w) {
+                testWindow = w;
 
+                // Load module instances from brackets.test
+                CommandManager    = testWindow.brackets.test.CommandManager;
+                Commands          = testWindow.brackets.test.Commands;
+                KeyBindingManager = testWindow.brackets.test.KeyBindingManager;
+                Menus             = testWindow.brackets.test.Menus;
+            }, testWindowOptions);
+        });
+        
+        afterLast(function () {
+            testWindow        = null;
+            CommandManager    = null;
+            Commands          = null;
+            KeyBindingManager = null;
+            Menus             = null;
+            SpecRunnerUtils.closeTestWindow();
+        });
+        
         describe("Add Menus", function () {
             
             function getTopMenus() {
diff --git a/test/spec/SpecRunnerUtils.js b/test/spec/SpecRunnerUtils.js
@@ -476,8 +476,7 @@ define(function (require, exports, module) {
         waitsForDone(promise, "dismiss dialog");
     }
     
-    
-    function createTestWindowAndRun(spec, callback) {
+    function createTestWindowAndRun(spec, callback, options) {
         runs(function () {
             // Position popup windows in the lower right so they're out of the way
             var testWindowWid = 1000,
@@ -503,6 +502,11 @@ define(function (require, exports, module) {
             // disable initial dialog for live development
             params.put("skipLiveDevelopmentInfo", true);
             
+            // option to launch test window with either native or HTML menus
+            if (options && options.hasOwnProperty("hasNativeMenus")) {
+                params.put("hasNativeMenus", (options.hasNativeMenus ? "true" : "false"));
+            }
+            
             _testWindow = window.open(getBracketsSourceRoot() + "/index.html?" + params.toString(), "_blank", optionsStr);
             
             _testWindow.isBracketsTestWindow = true;
@@ -524,7 +528,7 @@ define(function (require, exports, module) {
                 });
             };
         });
-
+        
         // FIXME (issue #249): Need an event or something a little more reliable...
         waitsFor(
             function isBracketsDoneLoading() {
