Bug 1493718 - Clean-up use of __force_skip__ in two tests and re-enable test_view_source_reload. r=aceman

mail/test/mozmill/content-policy/test-view-source.js

@@ -28,14 +28,6 @@ function setupModule(module) {
   }
 
   folder = create_folder("viewsource");
-
-  // Bug 805374 removed the charsetMenu from view source.
-  // Enable this test again when bug 940907 is fixed.
-  test_view_source_reload.__force_skip__ = true;
-
-  // Skip on mac, as we can't click the (native) menus to make it work.
-  if (mc.mozmillModule.isMac)
-    test_view_source_reload.__force_skip__ = true;
 }
 
 function addToFolder(aSubject, aBody, aFolder) {
@@ -90,8 +82,12 @@ function test_view_source_reload() {
 
   let doc = vsc.e("content").contentDocument; // keep a ref to the latin1 doc
 
+  // Click the new window to make it receive further events properly.
+  vsc.click(vsc.eid("content"));
+
+  vsc.click(vsc.eid("menu_view"));
   vsc.click_menus_in_sequence(vsc.e("viewmenu-popup"),
-    [{id: "charsetMenu"}, {label: "Unicode (UTF-8)"}]);
+    [{id: "charsetMenu"}, {label: "Unicode"}]);
 
   vsc.waitFor(() => vsc.e("content").contentDocument != doc &&
                     vsc.e("content").contentDocument.querySelector("pre") != null,
@@ -104,4 +100,6 @@ function test_view_source_reload() {
 
   close_window(vsc);
 }
+// Skip on Mac, as we can't click the (native) menus to make it work.
+test_view_source_reload.EXCLUDED_PLATFORMS = ["darwin"];
 

mail/test/mozmill/folder-widget/test-message-filters.js

@@ -36,10 +36,6 @@ function setupModule(module)
   // Note, the uri is for hostname "invalid" which is the original uri. See
   // setupProtocolTest parameters.
   var prefix = "news://invalid:"+NNTP_PORT+"/";
-
-  if (mc.mozmillModule.isMac) {
-    test_customize_toolbar_doesnt_double_get_mail_menu.__force_skip__ = true;
-  }
 }
 
 /*
@@ -124,6 +120,7 @@ function test_customize_toolbar_doesnt_double_get_mail_menu()
 
   check_getAllNewMsgMenu();
 }
+test_customize_toolbar_doesnt_double_get_mail_menu.EXCLUDED_PLATFORMS = ["darwin"];
 
 /* A helper function that opens up the new filter dialog (assuming that the
  * main filters dialog is already open), creates a simple filter, and then