Bug 1100698, e10s, rewrite and reenable browser_save_video.js and browser_default_image_filename.js, r=gijs

browser/base/content/test/general/browser.ini

@@ -385,7 +385,7 @@ skip-if = buildapp == 'mulet' || e10s # e10s: Bug 933103 - mochitest's EventUtil
 [browser_save_link_when_window_navigates.js]
 skip-if = buildapp == 'mulet' || e10s # Bug 933103 - mochitest's EventUtils.synthesizeMouse functions not e10s friendly
 [browser_save_video.js]
-skip-if = buildapp == 'mulet' || e10s # Bug 1100698 - test uses synthesizeMouse and then does a load of other stuff that breaks in e10s
+skip-if = buildapp == 'mulet'
 [browser_save_video_frame.js]
 [browser_scope.js]
 [browser_searchSuggestionUI.js]

browser/base/content/test/general/browser_save_video.js

@@ -8,70 +8,68 @@ MockFilePicker.init(window);
  * TestCase for bug 564387
  * <https://bugzilla.mozilla.org/show_bug.cgi?id=564387>
  */
-function test() {
-  waitForExplicitFinish();
+add_task(function* () {
   var fileName;
 
+  let loadPromise = BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
   gBrowser.loadURI("http://mochi.test:8888/browser/browser/base/content/test/general/web_video.html");
+  yield loadPromise;
 
-  gBrowser.addEventListener("pageshow", function pageShown(event) {
-    if (event.target.location == "about:blank")
-      return;
-    gBrowser.removeEventListener("pageshow", pageShown);
+  let popupShownPromise = BrowserTestUtils.waitForEvent(document, "popupshown");
 
-    executeSoon(function () {
-      document.addEventListener("popupshown", contextMenuOpened);
+  yield BrowserTestUtils.synthesizeMouseAtCenter("#video1",
+                                                 { type: "contextmenu", button: 2 },
+                                                 gBrowser.selectedBrowser);
+  info("context menu click on video1");
 
-      var video1 = gBrowser.contentDocument.getElementById("video1");
-      EventUtils.synthesizeMouseAtCenter(video1,
-                                         { type: "contextmenu", button: 2 },
-                                         gBrowser.contentWindow);
-      info("context menu click on video1");
-    });
-  });
+  yield popupShownPromise;
 
-  function contextMenuOpened(event) {
-    event.currentTarget.removeEventListener("popupshown", contextMenuOpened);
-    info("context menu opened on video1");
+  info("context menu opened on video1");
 
-    // Create the folder the video will be saved into.
-    var destDir = createTemporarySaveDirectory();
-    var destFile = destDir.clone();
+  // Create the folder the video will be saved into.
+  var destDir = createTemporarySaveDirectory();
+  var destFile = destDir.clone();
 
-    MockFilePicker.displayDirectory = destDir;
-    MockFilePicker.showCallback = function(fp) {
-      fileName = fp.defaultString;
-      destFile.append (fileName);
-      MockFilePicker.returnFiles = [destFile];
-      MockFilePicker.filterIndex = 1; // kSaveAsType_URL
-    };
+  MockFilePicker.displayDirectory = destDir;
+  MockFilePicker.showCallback = function(fp) {
+    fileName = fp.defaultString;
+    destFile.append(fileName);
+    MockFilePicker.returnFiles = [destFile];
+    MockFilePicker.filterIndex = 1; // kSaveAsType_URL
+  };
+
+  let transferCompletePromise = new Promise((resolve) => {
+    function onTransferComplete(downloadSuccess) {
+      ok(downloadSuccess, "Video file should have been downloaded successfully");
+
+      is(fileName, "web-video1-expectedName.ogv",
+         "Video file name is correctly retrieved from Content-Disposition http header");
+      resolve();
+    }
 
     mockTransferCallback = onTransferComplete;
     mockTransferRegisterer.register();
+  });
 
-    registerCleanupFunction(function () {
-      mockTransferRegisterer.unregister();
-      MockFilePicker.cleanup();
-      destDir.remove(true);
-    });
+  registerCleanupFunction(function () {
+    mockTransferRegisterer.unregister();
+    MockFilePicker.cleanup();
+    destDir.remove(true);
+  });
 
-    // Select "Save Video As" option from context menu
-    var saveVideoCommand = document.getElementById("context-savevideo");
-    saveVideoCommand.doCommand();
-    info("context-savevideo command executed");
+  // Select "Save Video As" option from context menu
+  var saveVideoCommand = document.getElementById("context-savevideo");
+  saveVideoCommand.doCommand();
+  info("context-savevideo command executed");
 
-    event.target.hidePopup();
-  }
+  let contextMenu = document.getElementById("contentAreaContextMenu");
+  let popupHiddenPromise = BrowserTestUtils.waitForEvent(contextMenu, "popuphidden");
+  contextMenu.hidePopup();
+  yield popupHiddenPromise;
 
-  function onTransferComplete(downloadSuccess) {
-    ok(downloadSuccess, "Video file should have been downloaded successfully");
+  yield transferCompletePromise;
+});
 
-    is(fileName, "web-video1-expectedName.ogv",
-       "Video file name is correctly retrieved from Content-Disposition http header");
-
-    finish();
-  }
-}
 
 Cc["@mozilla.org/moz/jssubscript-loader;1"]
   .getService(Ci.mozIJSSubScriptLoader)

toolkit/content/tests/browser/browser.ini

@@ -14,7 +14,6 @@ skip-if = e10s # Bug ?????? - intermittent crash of child process reported when
 skip-if = e10s # Bug 1064580
 [browser_contentTitle.js]
 [browser_default_image_filename.js]
-skip-if = e10s # Bug 933103 - mochitest's EventUtils.synthesizeMouse functions not e10s friendly
 [browser_f7_caret_browsing.js]
 skip-if = e10s
 [browser_findbar.js]

toolkit/content/tests/browser/browser_default_image_filename.js

@@ -8,43 +8,38 @@ MockFilePicker.init(window);
  * TestCase for bug 564387
  * <https://bugzilla.mozilla.org/show_bug.cgi?id=564387>
  */
-function test() {
-  waitForExplicitFinish();
-  var fileName;
-
+add_task(function* () {
+  let loadPromise = BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
   gBrowser.loadURI("data:image/gif;base64,R0lGODlhEAAOALMAAOazToeHh0tLS/7LZv/0jvb29t/f3//Ub//ge8WSLf/rhf/3kdbW1mxsbP//mf///yH5BAAAAAAALAAAAAAQAA4AAARe8L1Ekyky67QZ1hLnjM5UUde0ECwLJoExKcppV0aCcGCmTIHEIUEqjgaORCMxIC6e0CcguWw6aFjsVMkkIr7g77ZKPJjPZqIyd7sJAgVGoEGv2xsBxqNgYPj/gAwXEQA7");
+  yield loadPromise;
 
-  gBrowser.addEventListener("pageshow", function pageShown(event) {
-    if (event.target.location == "about:blank")
-      return;
-    gBrowser.removeEventListener("pageshow", pageShown);
+  let popupShownPromise = BrowserTestUtils.waitForEvent(document, "popupshown");
 
-    executeSoon(function () {
-      document.addEventListener("popupshown", contextMenuOpened);
+  yield BrowserTestUtils.synthesizeMouseAtCenter("img",
+                                                 { type: "contextmenu", button: 2 },
+                                                 gBrowser.selectedBrowser);
 
-      var img = gBrowser.contentDocument.getElementsByTagName("img")[0];
-      EventUtils.synthesizeMouseAtCenter(img,
-                                         { type: "contextmenu", button: 2 },
-                                         gBrowser.contentWindow);
-    });
-  });
-
-  function contextMenuOpened(event) {
-    event.currentTarget.removeEventListener("popupshown", contextMenuOpened);
+  yield popupShownPromise;
 
+  let showFilePickerPromise = new Promise(resolve => {
     MockFilePicker.showCallback = function(fp) {
       is(fp.defaultString, "index.gif");
-      executeSoon(finish);
-    };
+      resolve();
+    }
+  });
 
-    registerCleanupFunction(function () {
-      MockFilePicker.cleanup();
-    });
+  registerCleanupFunction(function () {
+    MockFilePicker.cleanup();
+  });
 
-    // Select "Save Image As" option from context menu
-    var saveImageAsCommand = document.getElementById("context-saveimage");
-    saveImageAsCommand.doCommand();
+  // Select "Save Image As" option from context menu
+  var saveImageAsCommand = document.getElementById("context-saveimage");
+  saveImageAsCommand.doCommand();
 
-    event.target.hidePopup();
-  }
-}
+  yield showFilePickerPromise;
+
+  let contextMenu = document.getElementById("contentAreaContextMenu");
+  let popupHiddenPromise = BrowserTestUtils.waitForEvent(contextMenu, "popuphidden");
+  contextMenu.hidePopup();
+  yield popupHiddenPromise;
+});