Bug 1251622 - fix save link tests to work in e10s, rs=trivial,green-try
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Fri, 26 Feb 2016 16:07:44 +0000
changeset 322124 466778edc2204b9cf1db4ad4921aabeee93f24d1
parent 322123 231428749f764ea5779cf7addb2f74de75bcaa2f
child 322125 1249401fb8b0431d56ef9c96d017b13e777f3089
push id5913
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 16:57:49 +0000
treeherdermozilla-beta@dcaf0a6fa115 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstrivial, green-try
bugs1251622
milestone47.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1251622 - fix save link tests to work in e10s, rs=trivial,green-try MozReview-Commit-ID: CvQIMjZKCXl
browser/base/content/test/general/browser.ini
browser/base/content/test/general/browser_save_link-perwindowpb.js
browser/base/content/test/general/browser_save_private_link_perwindowpb.js
--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -387,21 +387,21 @@ support-files =
 [browser_restore_isAppTab.js]
 [browser_sanitize-passwordDisabledHosts.js]
 [browser_sanitize-sitepermissions.js]
 [browser_sanitize-timespans.js]
 skip-if = buildapp == 'mulet'
 [browser_sanitizeDialog.js]
 skip-if = buildapp == 'mulet'
 [browser_save_link-perwindowpb.js]
-skip-if = buildapp == 'mulet' || e10s # Bug 933103 - mochitest's EventUtils.synthesizeMouse functions not e10s friendly
+skip-if = buildapp == 'mulet'
 [browser_save_private_link_perwindowpb.js]
-skip-if = buildapp == 'mulet' || e10s # e10s: Bug 933103 - mochitest's EventUtils.synthesizeMouse functions not e10s friendly
+skip-if = buildapp == 'mulet'
 [browser_save_link_when_window_navigates.js]
-skip-if = buildapp == 'mulet' || e10s # Bug 933103 - mochitest's EventUtils.synthesizeMouse functions not e10s friendly
+skip-if = buildapp == 'mulet'
 [browser_save_video.js]
 skip-if = buildapp == 'mulet'
 [browser_save_video_frame.js]
 [browser_scope.js]
 [browser_contentSearchUI.js]
 support-files =
   contentSearchUI.html
   contentSearchUI.js
--- a/browser/base/content/test/general/browser_save_link-perwindowpb.js
+++ b/browser/base/content/test/general/browser_save_link-perwindowpb.js
@@ -30,17 +30,17 @@ function triggerSave(aWindow, aCallback)
       aWindow.document.addEventListener("popupshown", contextMenuOpened, false);
 
       var link = testBrowser.contentDocument.getElementById("fff");
       info("link: " + link);
       EventUtils.synthesizeMouseAtCenter(link,
                                          { type: "contextmenu", button: 2 },
                                          testBrowser.contentWindow);
       info("right clicked!");
-    }, testBrowser.contentWindow);
+    }, testBrowser);
   }, false);
 
   function contextMenuOpened(event) {
     info("contextMenuOpened");
     aWindow.document.removeEventListener("popupshown", contextMenuOpened);
 
     // Create the folder the link will be saved into.
     var destDir = createTemporarySaveDirectory();
--- a/browser/base/content/test/general/browser_save_private_link_perwindowpb.js
+++ b/browser/base/content/test/general/browser_save_private_link_perwindowpb.js
@@ -101,17 +101,17 @@ function test() {
       aWindow.gBrowser.removeEventListener("pageshow", pageShown);
 
       waitForFocus(function () {
         aWindow.document.addEventListener("popupshown", contextMenuOpened, false);
         var img = aWindow.gBrowser.selectedBrowser.contentDocument.getElementById("img");
         EventUtils.synthesizeMouseAtCenter(img,
                                            { type: "contextmenu", button: 2 },
                                            aWindow.gBrowser.contentWindow);
-      }, aWindow.gBrowser.selectedBrowser.contentWindow);
+      }, aWindow.gBrowser.selectedBrowser);
     });
   }
 
   function testOnWindow(aOptions, aCallback) {
     whenNewWindowLoaded(aOptions, function(aWin) {
       windowsToClose.push(aWin);
       // execute should only be called when need, like when you are opening
       // web pages on the test. If calling executeSoon() is not necesary, then