Bug 1895453 - convert testing __skipMe calls to skip(). r=freaktechnik

Try: https://treeherder.mozilla.org/#/jobs?repo=try-comm-central&revision=c3da125cdef06d6d7b8b3461a3722f298a63943c

Differential Revision: https://phabricator.services.mozilla.com/D209656

--HG--
extra : moz-landing-system : lando

calendar/test/browser/browser_eventUndoRedo.js

@@ -243,18 +243,18 @@ add_setup(async function () {
  */
 add_task(async function testMenuBarAddEventUndoRedo() {
   return testAddUndoRedoEvent("menu_undo", "menu_redo");
-}).__skipMe = AppConstants.platform == "macosx"; // Can't click menu bar on Mac.
+}).skip(AppConstants.platform == "macosx"); // Can't click menu bar on Mac.
 
 /**
  * Tests the menu bar's undo/redo after modifying an event.
  */
 add_task(async function testMenuBarModifyEventUndoRedo() {
   return testModifyUndoRedoEvent("menu_undo", "menu_redo");
-}).__skipMe = AppConstants.platform == "macosx"; // Can't click menu bar on Mac.
+}).skip(AppConstants.platform == "macosx"); // Can't click menu bar on Mac.
 
 /**
  * Tests the menu bar's undo/redo after deleting an event.
  */
 add_task(async function testMenuBarDeleteEventUndoRedo() {
   return testDeleteUndoRedo("menu_undo", "menu_redo");
-}).__skipMe = AppConstants.platform == "macosx"; // Can't click menu bar on Mac.
+}).skip(AppConstants.platform == "macosx"); // Can't click menu bar on Mac.

calendar/test/browser/browser_taskUndoRedo.js

@@ -229,18 +229,18 @@ add_setup(async function () {
  */
 add_task(async function testMenuBarAddTaskUndoRedo() {
   return taskAddUndoRedoTask("menu_undo", "menu_redo");
-}).__skipMe = AppConstants.platform == "macosx"; // Can't click menu bar on Mac.
+}).skip(AppConstants.platform == "macosx"); // Can't click menu bar on Mac.
 
 /**
  * Tests the menu bar's undo/redo after modifying an event.
  */
 add_task(async function testMenuBarModifyTaskUndoRedo() {
   return testModifyUndoRedoTask("menu_undo", "menu_redo");
-}).__skipMe = AppConstants.platform == "macosx"; // Can't click menu bar on Mac.
+}).skip(AppConstants.platform == "macosx"); // Can't click menu bar on Mac.
 
 /**
  * Tests the menu bar's undo/redo after deleting an event.
  */
 add_task(async function testMenuBarDeleteTaskUndoRedo() {
   return testDeleteUndoRedoTask("menu_undo", "menu_redo");
-}).__skipMe = AppConstants.platform == "macosx"; // Can't click menu bar on Mac.
+}).skip(AppConstants.platform == "macosx"); // Can't click menu bar on Mac.

calendar/test/browser/browser_todayPane.js

@@ -817,4 +817,4 @@ add_task(async function testNewEvent() {
   expectedDate.resetTo(2018, 8, 1, expectedDate.hour, 0, 0, cal.dtz.UTC);
 
   await checkEventDialogDate();
-}).__skipMe = new Date().getUTCHours() == 23;
+}).skip(new Date().getUTCHours() == 23);

mail/base/test/browser/browser_cardsView.js

@@ -260,7 +260,7 @@ add_task(async function testTagsInVerticalView() {
 
   await ensure_cards_view();
   about3Pane.folderTree.focus();
-}).__skipMe = true; // To Do: update the test for tags on Bug 1860900.
+}).skip(); // TODO: update the test for tags on Bug 1860900.
 
 /**
  * This test Checks that:

mail/base/test/browser/browser_editMenu.js

@@ -356,7 +356,7 @@ add_task(async function testDeleteItem() {
   });
 
   Services.focus.focusedWindow = window;
-}).__skipMe = AppConstants.DEBUG; // Too unreliable.
+}).skip(AppConstants.DEBUG); // Too unreliable.
 
 /**
  * Tests the "Favorite Folder" item in the menu is checked/unchecked as expected.

mail/base/test/browser/browser_spacesToolbar.js

@@ -885,7 +885,7 @@ add_task(async function testSpacesToolbarMenubar() {
     menuButton.getAttribute("checked") == "true",
     "The menu item is checked"
   );
-}).__skipMe = AppConstants.platform == "macosx"; // Can't click menu bar on Mac.
+}).skip(AppConstants.platform == "macosx"); // Can't click menu bar on Mac.
 
 add_task(async function testSpacesToolbarOSX() {
   const size = document
@@ -918,7 +918,7 @@ add_task(async function testSpacesToolbarOSX() {
   window.fullScreen = false;
   await new Promise(resolve => requestAnimationFrame(resolve));
   await styleRemovedPromise;
-}).__skipMe = AppConstants.platform != "macosx";
+}).skip(AppConstants.platform != "macosx");
 
 add_task(async function testSpacesToolbarClearedAlignment() {
   // Hide the spaces toolbar to check if the style it's cleared.

mail/components/extensions/test/browser/browser_ext_compose_details_body.js

@@ -682,4 +682,4 @@ add_task(async function testCJK() {
   );
   plainTextWindow.close();
   await Promise.all(closePromises);
-}).__skipMe = AppConstants.platform == "linux" && AppConstants.DEBUG; // Permanent failure on CI, bug 1766758.
+}).skip(AppConstants.platform == "linux" && AppConstants.DEBUG); // Permanent failure on CI, bug 1766758.

mail/components/extensions/test/browser/browser_ext_menus_context_tools_main_menu.js

@@ -77,7 +77,7 @@ add_task(async function test_tools_menu_mv2() {
   );
 
   toolbar.setAttribute("inactive", initialState);
-}).__skipMe = AppConstants.platform == "macosx";
+}).skip(AppConstants.platform == "macosx");
 add_task(async function test_compose_tools_menu_mv2() {
   const testWindow = await openComposeWindow(gAccount);
   await focusWindow(testWindow);
@@ -92,7 +92,7 @@ add_task(async function test_compose_tools_menu_mv2() {
     }
   );
   await BrowserTestUtils.closeWindow(testWindow);
-}).__skipMe = AppConstants.platform == "macosx";
+}).skip(AppConstants.platform == "macosx");
 add_task(async function test_messagewindow_tools_menu_mv2() {
   const testWindow = await openMessageInWindow(gMessage);
   await focusWindow(testWindow);
@@ -107,7 +107,7 @@ add_task(async function test_messagewindow_tools_menu_mv2() {
     }
   );
   await BrowserTestUtils.closeWindow(testWindow);
-}).__skipMe = AppConstants.platform == "macosx";
+}).skip(AppConstants.platform == "macosx");
 add_task(async function test_tools_menu_mv3() {
   const toolbar = window.document.getElementById("toolbar-menubar");
   const initialState = toolbar.getAttribute("inactive");
@@ -125,7 +125,7 @@ add_task(async function test_tools_menu_mv3() {
   );
 
   toolbar.setAttribute("inactive", initialState);
-}).__skipMe = AppConstants.platform == "macosx";
+}).skip(AppConstants.platform == "macosx");
 add_task(async function test_compose_tools_menu_mv3() {
   const testWindow = await openComposeWindow(gAccount);
   await focusWindow(testWindow);
@@ -140,7 +140,7 @@ add_task(async function test_compose_tools_menu_mv3() {
     }
   );
   await BrowserTestUtils.closeWindow(testWindow);
-}).__skipMe = AppConstants.platform == "macosx";
+}).skip(AppConstants.platform == "macosx");
 add_task(async function test_messagewindow_tools_menu_mv3() {
   const testWindow = await openMessageInWindow(gMessage);
   await focusWindow(testWindow);
@@ -155,4 +155,4 @@ add_task(async function test_messagewindow_tools_menu_mv3() {
     }
   );
   await BrowserTestUtils.closeWindow(testWindow);
-}).__skipMe = AppConstants.platform == "macosx";
+}).skip(AppConstants.platform == "macosx");

mail/test/browser/attachment/browser_openAttachment.js

@@ -536,7 +536,7 @@ add_task(async function alwaysAskRemember() {
   const file = await verifyAndFetchSavedAttachment();
   file.remove(false);
   checkHandler("test/alwaysAsk-false", Ci.nsIHandlerInfo.saveToDisk, false);
-}).__skipMe = !IMPROVEMENTS_PREF_SET;
+}).skip(!IMPROVEMENTS_PREF_SET);
 
 /**
  * Open a content type set to always ask without asking (weird but plausible).
@@ -554,7 +554,7 @@ add_task(async function alwaysAskForget() {
   const file = await verifyAndFetchSavedAttachment();
   file.remove(false);
   checkHandler("test/alwaysAsk-false", Ci.nsIHandlerInfo.saveToDisk, true);
-}).__skipMe = !IMPROVEMENTS_PREF_SET;
+}).skip(!IMPROVEMENTS_PREF_SET);
 
 /**
  * Open a content type set to use helper app.

mail/test/browser/composition/browser_attachmentReminder.js

@@ -469,7 +469,7 @@ add_task(async function test_manual_attachment_reminder() {
 
   // Delete the leftover draft message.
   await press_delete();
-}).__skipMe = AppConstants.platform == "linux"; // See bug 1535292.
+}).skip(AppConstants.platform == "linux"); // See bug 1535292.
 
 /**
  * Bug 938759

mail/test/browser/composition/browser_drafts.js

@@ -201,11 +201,11 @@ async function internal_check_delivery_format(editDraft) {
 
 add_task(async function test_save_delivery_format_with_edit_draft() {
   await internal_check_delivery_format(true);
-}).__skipMe = AppConstants.platform == "macosx"; // Can't click menu bar on Mac.
+}).skip(AppConstants.platform == "macosx"); // Can't click menu bar on Mac.
 
 add_task(async function test_save_delivery_format_with_edit_template() {
   await internal_check_delivery_format(false);
-}).__skipMe = AppConstants.platform == "macosx"; // Can't click menu bar on Mac.
+}).skip(AppConstants.platform == "macosx"); // Can't click menu bar on Mac.
 
 /**
  * Tests that 'Edit as New' leaves the original message in drafts folder.

mail/test/browser/composition/browser_sendFormat.js

@@ -483,7 +483,7 @@ add_task(async function test_setting_send_format() {
       `${boldMessage ? "Bold" : "Plain"} message set as ${sendFormat}`
     );
   }
-}).__skipMe = AppConstants.platform == "macosx";
+}).skip(AppConstants.platform == "macosx");
 // Can't click menu bar on Mac to change the send format.
 
 add_task(async function test_saving_draft_with_set_format() {
@@ -525,7 +525,7 @@ add_task(async function test_saving_draft_with_set_format() {
       `Bold draft message set as ${sendFormat}`
     );
   }
-}).__skipMe = AppConstants.platform == "macosx";
+}).skip(AppConstants.platform == "macosx");
 // Can't click menu bar on Mac to change the send format.
 
 add_task(async function test_saving_draft_with_new_preference() {

mail/test/browser/folder-display/browser_messageCommands.js

@@ -399,7 +399,7 @@ add_task(async function test_mark_thread_as_read() {
   );
 
   Services.prefs.setBoolPref("mailnews.mark_message_read.auto", true);
-}).__skipMe = true; // See bug 654362.
+}).skip(); // See bug 654362.
 
 add_task(async function roving_multi_message_buttons() {
   await be_in_folder(unreadFolder);
@@ -467,7 +467,7 @@ add_task(async function roving_multi_message_buttons() {
   EventUtils.synthesizeKey("KEY_Escape", {});
   EventUtils.synthesizeKey("KEY_Escape", {});
   await assert_selected_and_displayed(curMessages);
-}).__skipMe = AppConstants.platform == "macosx";
+}).skip(AppConstants.platform == "macosx");
 
 add_task(async function test_shift_delete_prompt() {
   await be_in_folder(shiftDeleteFolder);

mail/test/browser/folder-display/browser_watchIgnoreThread.js

@@ -117,7 +117,7 @@ add_task(async function test_view_threads_ignored_threads() {
   await select_click_row(0);
   await assert_selected_and_displayed(t2root);
   assert_not_shown(thread1.msgHdrList);
-}).__skipMe = AppConstants.platform == "macosx";
+}).skip(AppConstants.platform == "macosx");
 
 /**
  * Test that Watch Thread makes the thread watched.
@@ -151,4 +151,4 @@ add_task(async function test_watch_thread() {
     undefined,
     "Test ran to completion successfully"
   );
-}).__skipMe = AppConstants.platform == "macosx";
+}).skip(AppConstants.platform == "macosx");

mail/test/browser/folder-widget/browser_messageFilters.js

@@ -137,7 +137,7 @@ add_task(async function key_navigation_test() {
   }
 
   await BrowserTestUtils.closeWindow(filterc);
-}).__skipMe = AppConstants.platform == "macosx";
+}).skip(AppConstants.platform == "macosx");
 
 /*
  * Test that the message filter list shows newsgroup servers.

mail/test/browser/message-header/browser_messageHeader.js

@@ -418,7 +418,7 @@ add_task(async function enter_msg_hdr_toolbar() {
     "fromRecipient0",
     "The sender is now focused"
   );
-}).__skipMe = AppConstants.platform == "macosx";
+}).skip(AppConstants.platform == "macosx");
 
 // Full keyboard navigation on OSX only works if Full Keyboard Access setting is
 // set to All Control in System Keyboard Preferences. This also works with the

mailnews/base/test/unit/test_threadMsgCounts.js

@@ -251,7 +251,7 @@ add_task(async function testGroupedBySortByDate() {
   ]);
 
   injection.deleteFolder(folder);
-}).__skipMe = now.getHours() == 0 && now.getMinutes() < 5;
+}).skip(now.getHours() == 0 && now.getMinutes() < 5);
 // (This test will fail if it runs too close to the start of the day.)
 
 add_task(async function testGroupedBySortByAuthor() {