Merge pull request #5115 from TomMalbran/tom/issue-5093

jasonsanjose · jasonsanjose · commit 4dd21016b183 · 2013-09-09T12:19:11.000-07:00
Fix #5093: Unit Test Failing: ExtensionManager
diff --git a/test/SpecRunner.js b/test/SpecRunner.js
@@ -52,7 +52,8 @@ define(function (require, exports, module) {
         UnitTestReporter        = require("test/UnitTestReporter").UnitTestReporter,
         NodeConnection          = require("utils/NodeConnection"),
         BootstrapReporterView   = require("test/BootstrapReporterView").BootstrapReporterView,
-        ColorUtils              = require("utils/ColorUtils");
+        ColorUtils              = require("utils/ColorUtils"),
+        NativeApp               = require("utils/NativeApp");
 
     // Load modules that self-register and just need to get included in the main project
     require("document/ChangedDocumentTracker");
@@ -357,6 +358,30 @@ define(function (require, exports, module) {
             
             $(window.document).ready(_documentReadyHandler);
         });
+        
+        
+        // Prevent clicks on any link from navigating to a different page (which could lose unsaved
+        // changes). We can't use a simple .on("click", "a") because of https://bugs.jquery.com/ticket/3861:
+        // jQuery hides non-left clicks from such event handlers, yet middle-clicks still cause CEF to
+        // navigate. Also, a capture handler is more reliable than bubble.
+        window.document.body.addEventListener("click", function (e) {
+            // Check parents too, in case link has inline formatting tags
+            var node = e.target, url;
+            console.log(1);
+            while (node) {
+                console.log(node.tagName);
+                if (node.tagName === "A") {
+                    url = node.getAttribute("href");
+                    console.log(url);
+                    if (url && url.match(/^http/)) {
+                        NativeApp.openURLInDefaultBrowser(url);
+                        e.preventDefault();
+                    }
+                    break;
+                }
+                node = node.parentElement;
+            }
+        }, true);
     }
 
     /**
diff --git a/test/spec/ExtensionManager-test.js b/test/spec/ExtensionManager-test.js
@@ -619,6 +619,7 @@ define(function (require, exports, module) {
                     model = new ModelClass();
                     modelDisposed = false;
                     waitsForDone(view.initialize(model), "view initializing");
+                    view.$el.appendTo(document.body);
                 });
                 runs(function () {
                     spyOn(view.model, "dispose").andCallThrough();
@@ -650,8 +651,10 @@ define(function (require, exports, module) {
                 
             
             afterEach(function () {
-                view = null;
-                
+                if (view) {
+                    view.$el.remove();
+                    view = null;
+                }
                 if (model) {
                     model.dispose();
                 }
@@ -835,7 +838,10 @@ define(function (require, exports, module) {
                     runs(function () {
                         var origHref = window.location.href;
                         spyOn(NativeApp, "openURLInDefaultBrowser");
-                        $("a", view.$el).first().click();
+                        
+                        var event = new window.Event("click", { bubbles: false, cancelable: true });
+                        document.querySelector("a[href='https://github.com/someuser']").dispatchEvent(event);
+                        
                         expect(NativeApp.openURLInDefaultBrowser).toHaveBeenCalledWith("https://github.com/someuser");
                         expect(window.location.href).toBe(origHref);
                     });
