Bug 1534774 - Fix some more MozMill tests on macOS. rs=bustage-fix
authorPaul Morris <paul@paulwmorris.com>
Wed, 03 Jul 2019 00:14:02 +0200
changeset 36015 b532b2516cbebd7edd253cbf7f7788b0818103e0
parent 36014 81b346228baa3efef3636b21ba3f332c3f49e035
child 36016 7f8bd17d9565d9bb4415f4b1a2635fe32d7370c5
push id392
push userclokep@gmail.com
push dateMon, 02 Sep 2019 20:17:19 +0000
reviewersbustage-fix
bugs1534774
Bug 1534774 - Fix some more MozMill tests on macOS. rs=bustage-fix
calendar/test/mozmill/cal-recurrence/testWeeklyNRecurrence.js
calendar/test/mozmill/recurrenceRotated/testWeeklyNRecurrence.js
calendar/test/mozmill/views/testDayView.js
calendar/test/mozmill/views/testWeekView.js
--- a/calendar/test/mozmill/cal-recurrence/testWeeklyNRecurrence.js
+++ b/calendar/test/mozmill/cal-recurrence/testWeeklyNRecurrence.js
@@ -99,17 +99,17 @@ function testWeeklyNRecurrence() {
 
     // Check month view.
     switchToView(controller, "month");
     checkMultiWeekView("month");
 
     // Delete event.
     box = lookupEventBox("month", EVENT_BOX, 2, 2, null, EVENTPATH);
     controller.click(box);
-    handleOccurrencePrompt(controller, eid("month-view"), "delete", true);
+    handleOccurrencePrompt(controller, box, "delete", true);
     controller.waitForElementNotPresent(box);
 }
 
 function setRecurrence(recurrence) {
     let { sleep: recsleep, lookup: reclookup, eid: recid } = helpersForController(recurrence);
 
     // weekly
     recurrence.waitForElement(recid("period-list"));
--- a/calendar/test/mozmill/recurrenceRotated/testWeeklyNRecurrence.js
+++ b/calendar/test/mozmill/recurrenceRotated/testWeeklyNRecurrence.js
@@ -102,17 +102,17 @@ function testWeeklyNRecurrence() {
 
     // Check month view.
     switchToView(controller, "month");
     checkMultiWeekView("month");
 
     // Delete event.
     box = lookupEventBox("month", EVENT_BOX, 2, 2, null, EVENTPATH);
     controller.click(box);
-    handleOccurrencePrompt(controller, eid("month-view"), "delete", true);
+    handleOccurrencePrompt(controller, box, "delete", true);
     controller.waitForElementNotPresent(box);
 }
 
 function setRecurrence(recurrence) {
     let { sleep: recsleep, lookup: reclookup, eid: recid } = helpersForController(recurrence);
 
     // weekly
     recurrence.waitForElement(recid("period-list"));
--- a/calendar/test/mozmill/views/testDayView.js
+++ b/calendar/test/mozmill/views/testDayView.js
@@ -97,16 +97,16 @@ function testDayView() {
     let eventName = lookupEventBox("day", EVENT_BOX, null, 1, null,
         `${EVENTPATH}/${getEventDetails("day")}/anon({"flex":"1"})/anon({"anonid":"event-name"})`
     );
     controller.waitForElement(eventName);
     controller.assertJSProperty(eventName, "textContent", TITLE2);
 
     // Delete event
     controller.click(eventBox);
-    controller.keypress(eid("day-view"), "VK_DELETE", {});
+    controller.keypress(eventBox, "VK_DELETE", {});
     controller.waitForElementNotPresent(eventBox);
 }
 
 function teardownTest(module) {
     deleteCalendars(controller, CALENDARNAME);
     closeAllEventDialogs();
 }
--- a/calendar/test/mozmill/views/testWeekView.js
+++ b/calendar/test/mozmill/views/testWeekView.js
@@ -102,16 +102,16 @@ function testWeekView() {
     let eventName = lookupEventBox("week", EVENT_BOX, null, 5, null,
         `${EVENTPATH}/${getEventDetails("week")}/anon({"flex":"1"})/anon({"anonid":"event-name"})`
     );
     controller.waitForElement(eventName);
     controller.assertJSProperty(eventName, "textContent", TITLE2);
 
     // Delete event.
     controller.click(eventBox);
-    controller.keypress(eid("week-view"), "VK_DELETE", {});
+    controller.keypress(eventBox, "VK_DELETE", {});
     controller.waitForElementNotPresent(eventBox);
 }
 
 function teardownTest(module) {
     deleteCalendars(controller, CALENDARNAME);
     closeAllEventDialogs();
 }