Bug 1608765 - Remove duplication of tests for recurrence. r=pmorris
authorGeoff Lankow <geoff@darktrojan.net>
Fri, 21 Feb 2020 21:44:32 +1300
changeset 38557 1ea5b27c62450fe8bd6048e0df3440f19c3e208d
parent 38556 a9db14ef83805e0d7b601fc6ef4b5153b4becd11
child 38558 13584f9e025c50294e64b29482d941e6ac8207af
push id400
push userclokep@gmail.com
push dateMon, 04 May 2020 18:56:09 +0000
reviewerspmorris
bugs1608765
Bug 1608765 - Remove duplication of tests for recurrence. r=pmorris Instead, run the same tests twice with different settings.
calendar/test/browser/recurrence/browser.ini
calendar/test/browser/recurrence/browser_annual.js
calendar/test/browser/recurrence/browser_biweekly.js
calendar/test/browser/recurrence/browser_daily.js
calendar/test/browser/recurrence/browser_lastDayOfMonth.js
calendar/test/browser/recurrence/browser_rotated.ini
calendar/test/browser/recurrence/browser_weeklyN.js
calendar/test/browser/recurrence/browser_weeklyUntil.js
calendar/test/browser/recurrence/browser_weeklyWithException.js
calendar/test/browser/recurrence/head.js
calendar/test/browser/recurrenceRotated/browser.ini
calendar/test/browser/recurrenceRotated/browser_annual.js
calendar/test/browser/recurrenceRotated/browser_biweekly.js
calendar/test/browser/recurrenceRotated/browser_daily.js
calendar/test/browser/recurrenceRotated/browser_lastDayOfMonth.js
calendar/test/browser/recurrenceRotated/browser_weeklyN.js
calendar/test/browser/recurrenceRotated/browser_weeklyUntil.js
calendar/test/browser/recurrenceRotated/browser_weeklyWithException.js
calendar/test/moz.build
--- a/calendar/test/browser/recurrence/browser.ini
+++ b/calendar/test/browser/recurrence/browser.ini
@@ -1,18 +1,19 @@
 [default]
-head = ../head.js
+dupe-manifest =
 prefs =
   extensions.installDistroAddons=true
   mail.provider.suppress_dialog_on_startup=true
   mail.spotlight.firstRunDone=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank
 subsuite = thunderbird
+tags = recurrence
 
 [browser_annual.js]
 [browser_biweekly.js]
 [browser_daily.js]
 [browser_lastDayOfMonth.js]
 [browser_weeklyN.js]
 [browser_weeklyUntil.js]
 [browser_weeklyWithException.js]
--- a/calendar/test/browser/recurrence/browser_annual.js
+++ b/calendar/test/browser/recurrence/browser_annual.js
@@ -28,17 +28,17 @@ const EPOCH = 1970;
 
 add_task(async function testAnnualRecurrence() {
   createCalendar(controller, CALENDARNAME);
   switchToView(controller, "day");
   goToDate(controller, STARTYEAR, 1, 1);
 
   // Create yearly recurring all-day event.
   let eventBox = lookupEventBox("day", ALLDAY, null, 1, null);
-  await invokeEventDialog(controller, eventBox, (event, iframe) => {
+  await invokeEventDialog(controller, eventBox, event => {
     let { eid: eventid } = helpersForController(event);
 
     menulistSelect(eventid("item-repeat"), "yearly", event);
     event.click(eventid("button-saveandclose"));
   });
 
   let checkYears = [STARTYEAR, STARTYEAR + 1, EPOCH - 1, EPOCH, EPOCH + 1];
   for (let year of checkYears) {
@@ -59,23 +59,23 @@ add_task(async function testAnnualRecurr
     controller.waitForElement(lookupEventBox("multiweek", CANVAS_BOX, 1, column, null, EVENTPATH));
 
     // month view
     switchToView(controller, "month");
     controller.waitForElement(lookupEventBox("month", CANVAS_BOX, 1, column, null, EVENTPATH));
   }
 
   // Delete event.
+  goToDate(controller, checkYears[0], 1, 1);
   switchToView(controller, "day");
-  goToDate(controller, checkYears[0], 1, 1);
   const boxPath = getEventBoxPath("day", ALLDAY, null, 1, null) + EVENTPATH;
   const box = lookup(boxPath);
   controller.click(box);
   handleOccurrencePrompt(controller, box, "delete", true);
   controller.waitForElementNotPresent(box);
 
   Assert.ok(true, "Test ran to completion");
 });
 
-registerCleanupFunction(function teardownModule(module) {
+registerCleanupFunction(function teardownModule() {
   deleteCalendars(controller, CALENDARNAME);
   closeAllEventDialogs();
 });
--- a/calendar/test/browser/recurrence/browser_biweekly.js
+++ b/calendar/test/browser/recurrence/browser_biweekly.js
@@ -28,24 +28,25 @@ const HOUR = 8;
 
 add_task(async function testBiweeklyRecurrence() {
   createCalendar(controller, CALENDARNAME);
   switchToView(controller, "day");
   goToDate(controller, 2009, 1, 31);
 
   // Create biweekly event.
   let eventBox = lookupEventBox("day", CANVAS_BOX, null, 1, HOUR);
-  await invokeEventDialog(controller, eventBox, (event, iframe) => {
+  await invokeEventDialog(controller, eventBox, event => {
     let { eid: eventid } = helpersForController(event);
 
     menulistSelect(eventid("item-repeat"), "bi.weekly", event);
     event.click(eventid("button-saveandclose"));
   });
 
   // Check day view.
+  switchToView(controller, "day");
   for (let i = 0; i < 4; i++) {
     controller.waitForElement(lookupEventBox("day", EVENT_BOX, null, 1, null, EVENTPATH));
     viewForward(controller, 14);
   }
 
   // Check week view.
   switchToView(controller, "week");
   goToDate(controller, 2009, 1, 31);
@@ -89,12 +90,12 @@ add_task(async function testBiweeklyRecu
   let box = lookupEventBox("month", CANVAS_BOX, 4, 7, null, EVENTPATH);
   controller.click(box);
   handleOccurrencePrompt(controller, box, "delete", true);
   controller.waitForElementNotPresent(box);
 
   Assert.ok(true, "Test ran to completion");
 });
 
-registerCleanupFunction(function teardownModule(module) {
+registerCleanupFunction(function teardownModule() {
   deleteCalendars(controller, CALENDARNAME);
   closeAllEventDialogs();
 });
--- a/calendar/test/browser/recurrence/browser_daily.js
+++ b/calendar/test/browser/recurrence/browser_daily.js
@@ -75,17 +75,16 @@ add_task(async function testDailyRecurre
 
   for (let week = 2; week <= 4; week++) {
     for (let day = 1; day <= 7; day++) {
       controller.waitForElement(
         lookupEventBox("multiweek", CANVAS_BOX, week, day, null, EVENTPATH)
       );
     }
   }
-
   // Check month view for all 5 weeks.
   switchToView(controller, "month");
   goToDate(controller, 2009, 1, 1);
 
   for (let day = 5; day <= 7; day++) {
     controller.waitForElement(lookupEventBox("month", CANVAS_BOX, 1, day, null, EVENTPATH));
   }
 
@@ -99,30 +98,30 @@ add_task(async function testDailyRecurre
   let saturday = lookupEventBox("month", CANVAS_BOX, 1, 7, null, EVENTPATH);
   controller.click(saturday);
   handleOccurrencePrompt(controller, saturday, "delete", false);
 
   // Verify in all views.
   controller.waitForElementNotPresent(saturday);
 
   switchToView(controller, "multiweek");
-  controller.assertNodeNotExist(lookupEventBox("multiweek", EVENT_BOX, 1, 7, null, EVENTPATH));
+  controller.assertNodeNotExist(lookupEventBox("multiweek", CANVAS_BOX, 1, 7, null, EVENTPATH));
 
   switchToView(controller, "week");
   controller.assertNodeNotExist(lookupEventBox("week", EVENT_BOX, null, 7, null, EVENTPATH));
 
   switchToView(controller, "day");
   controller.assertNodeNotExist(lookupEventBox("day", EVENT_BOX, null, 1, null, EVENTPATH));
 
   // Go to previous day to edit event to occur only on weekdays.
   viewBack(controller, 1);
 
   eventBox = lookupEventBox("day", EVENT_BOX, null, 1, null, EVENTPATH);
   handleOccurrencePrompt(controller, eventBox, "modify", true);
-  await invokeEventDialog(controller, null, (event, iframe) => {
+  await invokeEventDialog(controller, null, event => {
     let { eid: eventid, sleep: eventsleep } = helpersForController(event);
 
     menulistSelect(eventid("item-repeat"), "every.weekday", event);
     eventsleep();
     event.click(eventid("button-saveandclose"));
   });
 
   // Check day view for 7 days.
@@ -149,35 +148,35 @@ add_task(async function testDailyRecurre
   }
 
   // Check multiweek view for 4 weeks.
   switchToView(controller, "multiweek");
   goToDate(controller, 2009, 1, 1);
 
   for (let i = 1; i <= 4; i++) {
     controller.waitForElementNotPresent(
-      lookupEventBox("multiweek", EVENT_BOX, i, 1, null, EVENTPATH)
+      lookupEventBox("multiweek", CANVAS_BOX, i, 1, null, EVENTPATH)
     );
-    controller.assertNodeNotExist(lookupEventBox("multiweek", EVENT_BOX, i, 7, null, EVENTPATH));
+    controller.assertNodeNotExist(lookupEventBox("multiweek", CANVAS_BOX, i, 7, null, EVENTPATH));
   }
 
   // Check month view for all 5 weeks.
   switchToView(controller, "month");
   goToDate(controller, 2009, 1, 1);
 
   for (let i = 1; i <= 5; i++) {
-    controller.waitForElementNotPresent(lookupEventBox("month", EVENT_BOX, i, 1, null, EVENTPATH));
-    controller.assertNodeNotExist(lookupEventBox("month", EVENT_BOX, i, 7, null, EVENTPATH));
+    controller.waitForElementNotPresent(lookupEventBox("month", CANVAS_BOX, i, 1, null, EVENTPATH));
+    controller.assertNodeNotExist(lookupEventBox("month", CANVAS_BOX, i, 7, null, EVENTPATH));
   }
 
   // Delete event.
   day = lookupEventBox("month", CANVAS_BOX, 1, 5, null, EVENTPATH);
   controller.click(day);
   handleOccurrencePrompt(controller, day, "delete", true);
   controller.waitForElementNotPresent(day);
 
   Assert.ok(true, "Test ran to completion");
 });
 
-registerCleanupFunction(function teardownModule(module) {
+registerCleanupFunction(function teardownModule() {
   deleteCalendars(controller, CALENDARNAME);
   closeAllEventDialogs();
 });
--- a/calendar/test/browser/recurrence/browser_lastDayOfMonth.js
+++ b/calendar/test/browser/recurrence/browser_lastDayOfMonth.js
@@ -34,17 +34,17 @@ const HOUR = 8;
 
 add_task(async function testLastDayOfMonthRecurrence() {
   createCalendar(controller, CALENDARNAME);
   switchToView(controller, "day");
   goToDate(controller, 2008, 1, 31); // Start with a leap year.
 
   // Create monthly recurring event.
   let eventBox = lookupEventBox("day", CANVAS_BOX, null, 1, HOUR);
-  await invokeEventDialog(controller, eventBox, (event, iframe) => {
+  await invokeEventDialog(controller, eventBox, event => {
     let { eid: eventid } = helpersForController(event);
 
     plan_for_modal_dialog("Calendar:EventDialog:Recurrence", setRecurrence);
     menulistSelect(eventid("item-repeat"), "custom", event);
     wait_for_modal_dialog("Calendar:EventDialog:Recurrence", TIMEOUT_MODAL_DIALOG);
 
     event.click(eventid("button-saveandclose"));
   });
@@ -116,12 +116,12 @@ function setRecurrence(recurrence) {
   menulistSelect(recid("monthly-ordinal"), "-1", recurrence);
   menulistSelect(recid("monthly-weekday"), "-1", recurrence);
   recsleep();
 
   // Close dialog.
   recurrence.click(reclookup(REC_DLG_ACCEPT));
 }
 
-registerCleanupFunction(function teardownModule(module) {
+registerCleanupFunction(function teardownModule() {
   deleteCalendars(controller, CALENDARNAME);
   closeAllEventDialogs();
 });
new file mode 100644
--- /dev/null
+++ b/calendar/test/browser/recurrence/browser_rotated.ini
@@ -0,0 +1,21 @@
+[default]
+head = head.js
+dupe-manifest =
+prefs =
+  calendar.test.rotateViews=true
+  extensions.installDistroAddons=true
+  mail.provider.suppress_dialog_on_startup=true
+  mail.spotlight.firstRunDone=true
+  mail.winsearch.firstRunDone=true
+  mailnews.start_page.override_url=about:blank
+  mailnews.start_page.url=about:blank
+subsuite = thunderbird
+tags = recurrence-rotated
+
+[browser_annual.js]
+[browser_biweekly.js]
+[browser_daily.js]
+[browser_lastDayOfMonth.js]
+[browser_weeklyN.js]
+[browser_weeklyUntil.js]
+[browser_weeklyWithException.js]
--- a/calendar/test/browser/recurrence/browser_weeklyN.js
+++ b/calendar/test/browser/recurrence/browser_weeklyN.js
@@ -37,17 +37,17 @@ const HOUR = 8;
 
 add_task(async function testWeeklyNRecurrence() {
   createCalendar(controller, CALENDARNAME);
   switchToView(controller, "day");
   goToDate(controller, 2009, 1, 5);
 
   // Create weekly recurring event.
   let eventBox = lookupEventBox("day", CANVAS_BOX, null, 1, HOUR);
-  await invokeEventDialog(controller, eventBox, (event, iframe) => {
+  await invokeEventDialog(controller, eventBox, event => {
     let { eid: eventid } = helpersForController(event);
 
     plan_for_modal_dialog("Calendar:EventDialog:Recurrence", setRecurrence);
     event.waitForElement(eventid("item-repeat"));
     menulistSelect(eventid("item-repeat"), "custom", event);
     wait_for_modal_dialog("Calendar:EventDialog:Recurrence", TIMEOUT_MODAL_DIALOG);
 
     event.click(eventid("button-saveandclose"));
@@ -138,12 +138,12 @@ function checkMultiWeekView(view) {
   for (let i = 2; i < 6; i++) {
     controller.assertNode(lookupEventBox(view, CANVAS_BOX, week, i, null, EVENTPATH));
   }
 
   // Saturday
   controller.assertNodeNotExist(lookupEventBox(view, CANVAS_BOX, week, 7, null, EVENTPATH));
 }
 
-registerCleanupFunction(function teardownModule(module) {
+registerCleanupFunction(function teardownModule() {
   deleteCalendars(controller, CALENDARNAME);
   closeAllEventDialogs();
 });
--- a/calendar/test/browser/recurrence/browser_weeklyUntil.js
+++ b/calendar/test/browser/recurrence/browser_weeklyUntil.js
@@ -39,17 +39,17 @@ const HOUR = 8;
 
 add_task(async function testWeeklyUntilRecurrence() {
   createCalendar(controller, CALENDARNAME);
   switchToView(controller, "day");
   goToDate(controller, 2009, 1, 5); // Monday
 
   // Create weekly recurring event.
   let eventBox = lookupEventBox("day", CANVAS_BOX, null, 1, HOUR);
-  await invokeEventDialog(controller, eventBox, (event, iframe) => {
+  await invokeEventDialog(controller, eventBox, event => {
     let { eid: eventid } = helpersForController(event);
 
     plan_for_modal_dialog("Calendar:EventDialog:Recurrence", setRecurrence);
     event.waitForElement(eventid("item-repeat"));
     menulistSelect(eventid("item-repeat"), "custom", event);
     wait_for_modal_dialog("Calendar:EventDialog:Recurrence", TIMEOUT_MODAL_DIALOG);
 
     event.click(eventid("button-saveandclose"));
@@ -176,15 +176,17 @@ function checkMultiWeekView(view) {
     // Friday
     controller.assertNode(lookupEventBox(view, CANVAS_BOX, week, 6, null, EVENTPATH));
   }
 
   // Monday, last occurrence
   controller.assertNode(lookupEventBox(view, CANVAS_BOX, startWeek + 3, 2, null, EVENTPATH));
 
   // Wednesday
-  controller.assertNodeNotExist(lookupEventBox(view, EVENT_BOX, startWeek + 3, 4, null, EVENTPATH));
+  controller.assertNodeNotExist(
+    lookupEventBox(view, CANVAS_BOX, startWeek + 3, 4, null, EVENTPATH)
+  );
 }
 
-registerCleanupFunction(function teardownModule(module) {
+registerCleanupFunction(function teardownModule() {
   deleteCalendars(controller, CALENDARNAME);
   closeAllEventDialogs();
 });
--- a/calendar/test/browser/recurrence/browser_weeklyWithException.js
+++ b/calendar/test/browser/recurrence/browser_weeklyWithException.js
@@ -44,17 +44,17 @@ const STARTDATE = new Date(2009, 0, 6);
 
 add_task(async function testWeeklyWithExceptionRecurrence() {
   createCalendar(controller, CALENDARNAME);
   switchToView(controller, "day");
   goToDate(controller, 2009, 1, 5);
 
   // Create weekly recurring event.
   let eventBox = lookupEventBox("day", CANVAS_BOX, null, 1, HOUR);
-  await invokeEventDialog(controller, eventBox, (event, iframe) => {
+  await invokeEventDialog(controller, eventBox, event => {
     let { eid: eventid } = helpersForController(event);
 
     event.waitForElement(eventid("item-repeat"));
     plan_for_modal_dialog("Calendar:EventDialog:Recurrence", setRecurrence);
     menulistSelect(eventid("item-repeat"), "custom", event);
     wait_for_modal_dialog("Calendar:EventDialog:Recurrence", TIMEOUT_MODAL_DIALOG);
 
     event.click(eventid("button-saveandclose"));
@@ -167,17 +167,17 @@ add_task(async function testWeeklyWithEx
   switchToView(controller, "multiweek");
   goToDate(controller, 2009, 1, 5);
   checkMultiWeekView("multiweek");
 
   // month view
   switchToView(controller, "month");
   checkMultiWeekView("month");
 
-  // delete event
+  // Delete event.
   switchToView(controller, "day");
   goToDate(controller, 2009, 1, 12);
   path = lookupEventBox("day", EVENT_BOX, null, 1, null, EVENTPATH);
   controller.click(path);
   handleOccurrencePrompt(controller, path, "delete", true);
   controller.waitForElementNotPresent(path);
 
   Assert.ok(true, "Test ran to completion");
@@ -241,19 +241,19 @@ function checkMultiWeekView(view) {
   let assertNodeLookup = (...args) => {
     return controller.assertNode(lookupEventBox(...args));
   };
   let assertNodeNotExistLookup = (...args) => {
     return controller.assertNodeNotExist(lookupEventBox(...args));
   };
 
   // Wait for the first items, then check the ones not to be present.
-  // ASssert exactly two.
+  // Assert exactly two.
   controller.waitForElement(lookupEventBox(view, EVENT_BOX, startWeek, 3, null, "/[0]"));
-  assertNodeLookup(view, EVENT_BOX, startWeek, 3, null, "/[1]");
+  assertNodeLookup(view, CANVAS_BOX, startWeek, 3, null, "/[1]");
   assertNodeNotExistLookup(view, EVENT_BOX, startWeek, 3, null, "/[2]");
   // Then check no item on the 5th.
   assertNodeNotExistLookup(view, EVENT_BOX, startWeek, 2, null, EVENTPATH);
   assertNodeNotExistLookup(view, EVENT_BOX, startWeek, 3, null, "/[2]");
   assertNodeLookup(view, CANVAS_BOX, startWeek, 4, null, EVENTPATH);
   assertNodeNotExistLookup(view, EVENT_BOX, startWeek, 5, null, EVENTPATH);
   assertNodeLookup(view, CANVAS_BOX, startWeek, 6, null, EVENTPATH);
   assertNodeNotExistLookup(view, EVENT_BOX, startWeek, 7, null, EVENTPATH);
@@ -262,12 +262,12 @@ function checkMultiWeekView(view) {
   assertNodeLookup(view, CANVAS_BOX, startWeek + 1, 2, null, EVENTPATH);
   assertNodeLookup(view, CANVAS_BOX, startWeek + 1, 3, null, EVENTPATH);
   assertNodeLookup(view, CANVAS_BOX, startWeek + 1, 4, null, EVENTPATH);
   assertNodeNotExistLookup(view, EVENT_BOX, startWeek + 1, 5, null, EVENTPATH);
   assertNodeLookup(view, CANVAS_BOX, startWeek + 1, 6, null, EVENTPATH);
   assertNodeNotExistLookup(view, EVENT_BOX, startWeek + 1, 7, null, EVENTPATH);
 }
 
-registerCleanupFunction(function teardownModule(module) {
+registerCleanupFunction(function teardownModule() {
   deleteCalendars(controller, CALENDARNAME);
   closeAllEventDialogs();
 });
new file mode 100644
--- /dev/null
+++ b/calendar/test/browser/recurrence/head.js
@@ -0,0 +1,13 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, you can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* globals toggleOrientation */
+
+let isRotated =
+  document.getElementById("calendar_toggle_orientation_command").getAttribute("checked") == "true";
+let shouldBeRotated = Services.prefs.getBoolPref("calendar.test.rotateViews", false);
+
+if (isRotated != shouldBeRotated) {
+  toggleOrientation();
+}
deleted file mode 100644
--- a/calendar/test/browser/recurrenceRotated/browser.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-[default]
-head = ../head.js
-prefs =
-  extensions.installDistroAddons=true
-  mail.provider.suppress_dialog_on_startup=true
-  mail.spotlight.firstRunDone=true
-  mail.winsearch.firstRunDone=true
-  mailnews.start_page.override_url=about:blank
-  mailnews.start_page.url=about:blank
-subsuite = thunderbird
-
-[browser_annual.js]
-[browser_biweekly.js]
-[browser_daily.js]
-[browser_lastDayOfMonth.js]
-[browser_weeklyN.js]
-[browser_weeklyUntil.js]
-[browser_weeklyWithException.js]
deleted file mode 100755
--- a/calendar/test/browser/recurrenceRotated/browser_annual.js
+++ /dev/null
@@ -1,104 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-var mozmill = ChromeUtils.import("resource://testing-common/mozmill/mozmill.jsm");
-
-var {
-  ALLDAY,
-  CALENDARNAME,
-  CANVAS_BOX,
-  EVENTPATH,
-  closeAllEventDialogs,
-  createCalendar,
-  deleteCalendars,
-  goToDate,
-  handleOccurrencePrompt,
-  helpersForController,
-  invokeEventDialog,
-  menulistSelect,
-  switchToView,
-} = ChromeUtils.import("resource://testing-common/mozmill/CalendarUtils.jsm");
-
-var controller = mozmill.getMail3PaneController();
-var { eid, getEventBoxPath, lookup, lookupEventBox } = helpersForController(controller);
-
-const STARTYEAR = 1950;
-const EPOCH = 1970;
-
-add_task(async function testAnnualRecurrence() {
-  createCalendar(controller, CALENDARNAME);
-  switchToView(controller, "day");
-  goToDate(controller, STARTYEAR, 1, 1);
-
-  // Rotate view.
-  controller.mainMenu.click("#ltnViewRotated");
-  controller.waitFor(
-    () =>
-      eid("day-view")
-        .getNode()
-        .getAttribute("orient") == "horizontal"
-  );
-
-  // Create yearly recurring all-day event.
-  let eventBox = lookupEventBox("day", ALLDAY, null, 1, null);
-  await invokeEventDialog(controller, eventBox, (event, iframe) => {
-    let { eid: eventid } = helpersForController(event);
-
-    menulistSelect(eventid("item-repeat"), "yearly", event);
-    event.click(eventid("button-saveandclose"));
-  });
-
-  let checkYears = [STARTYEAR, STARTYEAR + 1, EPOCH - 1, EPOCH, EPOCH + 1];
-  for (let year of checkYears) {
-    goToDate(controller, year, 1, 1);
-    let date = new Date(year, 0, 1);
-    let column = date.getDay() + 1;
-
-    // day view
-    switchToView(controller, "day");
-    controller.waitForElement(lookupEventBox("day", ALLDAY, null, 1, null, EVENTPATH));
-
-    // week view
-    switchToView(controller, "week");
-    controller.waitForElement(lookupEventBox("week", ALLDAY, null, column, null, EVENTPATH));
-
-    // multiweek view
-    switchToView(controller, "multiweek");
-    controller.waitForElement(lookupEventBox("multiweek", CANVAS_BOX, 1, column, null, EVENTPATH));
-
-    // month view
-    switchToView(controller, "month");
-    controller.waitForElement(lookupEventBox("month", CANVAS_BOX, 1, column, null, EVENTPATH));
-  }
-
-  // Delete event.
-  goToDate(controller, checkYears[0], 1, 1);
-  switchToView(controller, "day");
-  const boxPath = getEventBoxPath("day", ALLDAY, null, 1, null) + EVENTPATH;
-  const box = lookup(boxPath);
-  controller.click(box);
-  handleOccurrencePrompt(controller, box, "delete", true);
-  controller.waitForElementNotPresent(box);
-
-  Assert.ok(true, "Test ran to completion");
-});
-
-registerCleanupFunction(function teardownModule(module) {
-  deleteCalendars(controller, CALENDARNAME);
-  // Reset view.
-  if (
-    eid("day-view")
-      .getNode()
-      .getAttribute("orient") == "horizontal"
-  ) {
-    controller.mainMenu.click("#ltnViewRotated");
-  }
-  controller.waitFor(
-    () =>
-      eid("day-view")
-        .getNode()
-        .getAttribute("orient") == "vertical"
-  );
-  closeAllEventDialogs();
-});
deleted file mode 100755
--- a/calendar/test/browser/recurrenceRotated/browser_biweekly.js
+++ /dev/null
@@ -1,125 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-var mozmill = ChromeUtils.import("resource://testing-common/mozmill/mozmill.jsm");
-
-var {
-  CALENDARNAME,
-  CANVAS_BOX,
-  EVENTPATH,
-  EVENT_BOX,
-  closeAllEventDialogs,
-  createCalendar,
-  deleteCalendars,
-  goToDate,
-  handleOccurrencePrompt,
-  helpersForController,
-  invokeEventDialog,
-  menulistSelect,
-  switchToView,
-  viewForward,
-} = ChromeUtils.import("resource://testing-common/mozmill/CalendarUtils.jsm");
-
-var controller = mozmill.getMail3PaneController();
-var { eid, lookupEventBox } = helpersForController(controller);
-
-const HOUR = 8;
-
-add_task(async function testBiweeklyRecurrence() {
-  createCalendar(controller, CALENDARNAME);
-  switchToView(controller, "day");
-  goToDate(controller, 2009, 1, 31);
-
-  // Rotate view.
-  controller.mainMenu.click("#ltnViewRotated");
-  controller.waitFor(
-    () =>
-      eid("day-view")
-        .getNode()
-        .getAttribute("orient") == "horizontal"
-  );
-
-  // Create biweekly event.
-  let eventBox = lookupEventBox("day", CANVAS_BOX, null, 1, HOUR);
-  await invokeEventDialog(controller, eventBox, (event, iframe) => {
-    let { eid: eventid } = helpersForController(event);
-
-    menulistSelect(eventid("item-repeat"), "bi.weekly", event);
-    event.click(eventid("button-saveandclose"));
-  });
-
-  // Check day view.
-  switchToView(controller, "day");
-  for (let i = 0; i < 4; i++) {
-    controller.waitForElement(lookupEventBox("day", EVENT_BOX, null, 1, null, EVENTPATH));
-    viewForward(controller, 14);
-  }
-
-  // Check week view.
-  switchToView(controller, "week");
-  goToDate(controller, 2009, 1, 31);
-
-  for (let i = 0; i < 4; i++) {
-    controller.waitForElement(lookupEventBox("week", EVENT_BOX, null, 7, null, EVENTPATH));
-    viewForward(controller, 2);
-  }
-
-  // Check multiweek view.
-  switchToView(controller, "multiweek");
-  goToDate(controller, 2009, 1, 31);
-
-  // Always two occurrences in view, 1st and 3rd or 2nd and 4th week.
-  for (let i = 0; i < 5; i++) {
-    controller.waitForElement(
-      lookupEventBox("multiweek", CANVAS_BOX, (i % 2) + 1, 7, null, EVENTPATH)
-    );
-    controller.assertNode(lookupEventBox("multiweek", CANVAS_BOX, (i % 2) + 3, 7, null, EVENTPATH));
-    viewForward(controller, 1);
-  }
-
-  // Check month view.
-  switchToView(controller, "month");
-  goToDate(controller, 2009, 1, 31);
-
-  // January
-  controller.waitForElement(lookupEventBox("month", CANVAS_BOX, 5, 7, null, EVENTPATH));
-  viewForward(controller, 1);
-
-  // February
-  controller.waitForElement(lookupEventBox("month", CANVAS_BOX, 2, 7, null, EVENTPATH));
-  controller.assertNode(lookupEventBox("month", CANVAS_BOX, 4, 7, null, EVENTPATH));
-  viewForward(controller, 1);
-
-  // March
-  controller.waitForElement(lookupEventBox("month", CANVAS_BOX, 2, 7, null, EVENTPATH));
-  controller.assertNode(lookupEventBox("month", CANVAS_BOX, 4, 7, null, EVENTPATH));
-
-  // Delete event.
-  let box = lookupEventBox("month", CANVAS_BOX, 4, 7, null, EVENTPATH);
-  controller.click(box);
-  handleOccurrencePrompt(controller, box, "delete", true);
-  controller.waitForElementNotPresent(box);
-
-  Assert.ok(true, "Test ran to completion");
-});
-
-registerCleanupFunction(function teardownModule(module) {
-  deleteCalendars(controller, CALENDARNAME);
-  // Reset view.
-  switchToView(controller, "day");
-  if (
-    eid("day-view")
-      .getNode()
-      .getAttribute("orient") == "horizontal"
-  ) {
-    controller.mainMenu.click("#ltnViewRotated");
-  }
-  controller.waitFor(
-    () =>
-      eid("day-view")
-        .getNode()
-        .getAttribute("orient") == "vertical"
-  );
-  closeAllEventDialogs();
-});
deleted file mode 100755
--- a/calendar/test/browser/recurrenceRotated/browser_daily.js
+++ /dev/null
@@ -1,206 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-var mozmill = ChromeUtils.import("resource://testing-common/mozmill/mozmill.jsm");
-
-var {
-  CALENDARNAME,
-  CANVAS_BOX,
-  EVENTPATH,
-  EVENT_BOX,
-  closeAllEventDialogs,
-  createCalendar,
-  deleteCalendars,
-  goToDate,
-  handleOccurrencePrompt,
-  helpersForController,
-  invokeEventDialog,
-  menulistSelect,
-  switchToView,
-  viewBack,
-  viewForward,
-} = ChromeUtils.import("resource://testing-common/mozmill/CalendarUtils.jsm");
-var { setData } = ChromeUtils.import("resource://testing-common/mozmill/ItemEditingHelpers.jsm");
-
-var controller = mozmill.getMail3PaneController();
-var { eid, lookupEventBox } = helpersForController(controller);
-
-const HOUR = 8;
-
-add_task(async function testDailyRecurrence() {
-  createCalendar(controller, CALENDARNAME);
-  switchToView(controller, "day");
-  goToDate(controller, 2009, 1, 1);
-
-  // Rotate view.
-  controller.mainMenu.click("#ltnViewRotated");
-  controller.waitFor(
-    () =>
-      eid("day-view")
-        .getNode()
-        .getAttribute("orient") == "horizontal"
-  );
-
-  // Create daily event.
-  let eventBox = lookupEventBox("day", CANVAS_BOX, null, 1, HOUR);
-  await invokeEventDialog(controller, eventBox, async (event, iframe) => {
-    let { eid: eventid } = helpersForController(event);
-
-    await setData(event, iframe, { repeat: "daily", repeatuntil: new Date(2009, 2, 20) });
-    event.click(eventid("button-saveandclose"));
-  });
-
-  // Check day view for 7 days.
-  let daybox = lookupEventBox("day", EVENT_BOX, null, 1, null, EVENTPATH);
-  controller.waitForElement(daybox);
-
-  for (let day = 1; day <= 7; day++) {
-    controller.waitForElement(daybox);
-    viewForward(controller, 1);
-  }
-
-  // Check week view for 2 weeks.
-  switchToView(controller, "week");
-  goToDate(controller, 2009, 1, 1);
-
-  for (let day = 5; day <= 7; day++) {
-    controller.waitForElement(lookupEventBox("week", EVENT_BOX, 1, day, null, EVENTPATH));
-  }
-
-  viewForward(controller, 1);
-
-  for (let day = 1; day <= 7; day++) {
-    controller.waitForElement(lookupEventBox("week", EVENT_BOX, 2, day, null, EVENTPATH));
-  }
-
-  // Check multiweek view for 4 weeks.
-  switchToView(controller, "multiweek");
-  goToDate(controller, 2009, 1, 1);
-
-  for (let day = 5; day <= 7; day++) {
-    controller.waitForElement(lookupEventBox("multiweek", CANVAS_BOX, 1, day, null, EVENTPATH));
-  }
-
-  for (let week = 2; week <= 4; week++) {
-    for (let day = 1; day <= 7; day++) {
-      controller.waitForElement(
-        lookupEventBox("multiweek", CANVAS_BOX, week, day, null, EVENTPATH)
-      );
-    }
-  }
-  // Check month view for all 5 weeks.
-  switchToView(controller, "month");
-  goToDate(controller, 2009, 1, 1);
-
-  for (let day = 5; day <= 7; day++) {
-    controller.waitForElement(lookupEventBox("month", CANVAS_BOX, 1, day, null, EVENTPATH));
-  }
-
-  for (let week = 2; week <= 5; week++) {
-    for (let day = 1; day <= 7; day++) {
-      controller.assertNode(lookupEventBox("month", CANVAS_BOX, week, day, null, EVENTPATH));
-    }
-  }
-
-  // Delete 3rd January occurrence.
-  let saturday = lookupEventBox("month", CANVAS_BOX, 1, 7, null, EVENTPATH);
-  controller.click(saturday);
-  handleOccurrencePrompt(controller, saturday, "delete", false);
-
-  // Verify in all views.
-  controller.waitForElementNotPresent(saturday);
-
-  switchToView(controller, "multiweek");
-  controller.assertNodeNotExist(lookupEventBox("multiweek", CANVAS_BOX, 1, 7, null, EVENTPATH));
-
-  switchToView(controller, "week");
-  controller.assertNodeNotExist(lookupEventBox("week", EVENT_BOX, null, 7, null, EVENTPATH));
-
-  switchToView(controller, "day");
-  controller.assertNodeNotExist(lookupEventBox("day", EVENT_BOX, null, 1, null, EVENTPATH));
-
-  // Go to previous day to edit event to occur only on weekdays.
-  viewBack(controller, 1);
-
-  eventBox = lookupEventBox("day", EVENT_BOX, null, 1, null, EVENTPATH);
-  handleOccurrencePrompt(controller, eventBox, "modify", true);
-  await invokeEventDialog(controller, null, (event, iframe) => {
-    let { eid: eventid, sleep: eventsleep } = helpersForController(event);
-
-    menulistSelect(eventid("item-repeat"), "every.weekday", event);
-    eventsleep();
-    event.click(eventid("button-saveandclose"));
-  });
-
-  // Check day view for 7 days.
-  let day = lookupEventBox("day", EVENT_BOX, null, 1, null, EVENTPATH);
-  let dates = [
-    [2009, 1, 3],
-    [2009, 1, 4],
-  ];
-  for (let [y, m, d] of dates) {
-    goToDate(controller, y, m, d);
-    controller.assertNodeNotExist(day);
-  }
-
-  // Check week view for 2 weeks.
-  switchToView(controller, "week");
-  goToDate(controller, 2009, 1, 1);
-
-  for (let i = 0; i <= 1; i++) {
-    controller.waitForElementNotPresent(
-      lookupEventBox("week", EVENT_BOX, null, 1, null, EVENTPATH)
-    );
-    controller.assertNodeNotExist(lookupEventBox("week", EVENT_BOX, null, 7, null, EVENTPATH));
-    viewForward(controller, 1);
-  }
-
-  // Check multiweek view for 4 weeks.
-  switchToView(controller, "multiweek");
-  goToDate(controller, 2009, 1, 1);
-
-  for (let i = 1; i <= 4; i++) {
-    controller.waitForElementNotPresent(
-      lookupEventBox("multiweek", CANVAS_BOX, i, 1, null, EVENTPATH)
-    );
-    controller.assertNodeNotExist(lookupEventBox("multiweek", CANVAS_BOX, i, 7, null, EVENTPATH));
-  }
-
-  // Check month view for all 5 weeks.
-  switchToView(controller, "month");
-  goToDate(controller, 2009, 1, 1);
-
-  for (let i = 1; i <= 5; i++) {
-    controller.waitForElementNotPresent(lookupEventBox("month", CANVAS_BOX, i, 1, null, EVENTPATH));
-    controller.assertNodeNotExist(lookupEventBox("month", CANVAS_BOX, i, 7, null, EVENTPATH));
-  }
-
-  // Delete event.
-  day = lookupEventBox("month", CANVAS_BOX, 1, 5, null, EVENTPATH);
-  controller.click(day);
-  handleOccurrencePrompt(controller, day, "delete", true);
-  controller.waitForElementNotPresent(day);
-
-  Assert.ok(true, "Test ran to completion");
-});
-
-registerCleanupFunction(function teardownModule(module) {
-  deleteCalendars(controller, CALENDARNAME);
-  // Reset view.
-  switchToView(controller, "day");
-  if (
-    eid("day-view")
-      .getNode()
-      .getAttribute("orient") == "horizontal"
-  ) {
-    controller.mainMenu.click("#ltnViewRotated");
-  }
-  controller.waitFor(
-    () =>
-      eid("day-view")
-        .getNode()
-        .getAttribute("orient") == "vertical"
-  );
-  closeAllEventDialogs();
-});
deleted file mode 100755
--- a/calendar/test/browser/recurrenceRotated/browser_lastDayOfMonth.js
+++ /dev/null
@@ -1,152 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-var mozmill = ChromeUtils.import("resource://testing-common/mozmill/mozmill.jsm");
-
-var {
-  CALENDARNAME,
-  CANVAS_BOX,
-  EVENTPATH,
-  EVENT_BOX,
-  TIMEOUT_MODAL_DIALOG,
-  closeAllEventDialogs,
-  createCalendar,
-  deleteCalendars,
-  goToDate,
-  handleOccurrencePrompt,
-  helpersForController,
-  invokeEventDialog,
-  menulistSelect,
-  switchToView,
-} = ChromeUtils.import("resource://testing-common/mozmill/CalendarUtils.jsm");
-var { REC_DLG_ACCEPT } = ChromeUtils.import(
-  "resource://testing-common/mozmill/ItemEditingHelpers.jsm"
-);
-var { plan_for_modal_dialog, wait_for_modal_dialog } = ChromeUtils.import(
-  "resource://testing-common/mozmill/WindowHelpers.jsm"
-);
-
-var controller = mozmill.getMail3PaneController();
-var { eid, lookupEventBox } = helpersForController(controller);
-
-const HOUR = 8;
-
-add_task(async function testLastDayOfMonthRecurrence() {
-  createCalendar(controller, CALENDARNAME);
-  switchToView(controller, "day");
-  goToDate(controller, 2008, 1, 31); // Start with a leap year.
-
-  // Rotate view.
-  switchToView(controller, "day");
-  controller.mainMenu.click("#ltnViewRotated");
-  controller.waitFor(
-    () =>
-      eid("day-view")
-        .getNode()
-        .getAttribute("orient") == "horizontal"
-  );
-
-  // Create monthly recurring event.
-  let eventBox = lookupEventBox("day", CANVAS_BOX, null, 1, HOUR);
-  await invokeEventDialog(controller, eventBox, (event, iframe) => {
-    let { eid: eventid } = helpersForController(event);
-
-    plan_for_modal_dialog("Calendar:EventDialog:Recurrence", setRecurrence);
-    menulistSelect(eventid("item-repeat"), "custom", event);
-    wait_for_modal_dialog("Calendar:EventDialog:Recurrence", TIMEOUT_MODAL_DIALOG);
-
-    event.click(eventid("button-saveandclose"));
-  });
-
-  // data tuple: [year, month, day, row in month view]
-  // note: Month starts here with 1 for January.
-  let checkingData = [
-    [2008, 1, 31, 5],
-    [2008, 2, 29, 5],
-    [2008, 3, 31, 6],
-    [2008, 4, 30, 5],
-    [2008, 5, 31, 5],
-    [2008, 6, 30, 5],
-    [2008, 7, 31, 5],
-    [2008, 8, 31, 6],
-    [2008, 9, 30, 5],
-    [2008, 10, 31, 5],
-    [2008, 11, 30, 6],
-    [2008, 12, 31, 5],
-    [2009, 1, 31, 5],
-    [2009, 2, 28, 4],
-    [2009, 3, 31, 5],
-  ];
-  // Check all dates.
-  for (let [y, m, d, correctRow] of checkingData) {
-    let date = new Date(y, m - 1, d);
-    let column = date.getDay() + 1;
-
-    goToDate(controller, y, m, d);
-
-    // day view
-    switchToView(controller, "day");
-    controller.waitForElement(lookupEventBox("day", EVENT_BOX, null, 1, null, EVENTPATH));
-
-    // week view
-    switchToView(controller, "week");
-    controller.waitForElement(lookupEventBox("week", EVENT_BOX, null, column, null, EVENTPATH));
-
-    // multiweek view
-    switchToView(controller, "multiweek");
-    controller.waitForElement(lookupEventBox("multiweek", CANVAS_BOX, 1, column, null, EVENTPATH));
-
-    // month view
-    switchToView(controller, "month");
-    controller.waitForElement(
-      lookupEventBox("month", CANVAS_BOX, correctRow, column, null, EVENTPATH)
-    );
-  }
-
-  // Delete event.
-  goToDate(controller, checkingData[0][0], checkingData[0][1], checkingData[0][2]);
-  switchToView(controller, "day");
-  let box = lookupEventBox("day", EVENT_BOX, null, 1, null, EVENTPATH);
-  controller.waitThenClick(box);
-  handleOccurrencePrompt(controller, box, "delete", true);
-  controller.waitForElementNotPresent(box);
-
-  Assert.ok(true, "Test ran to completion");
-});
-
-function setRecurrence(recurrence) {
-  let { sleep: recsleep, lookup: reclookup, eid: recid } = helpersForController(recurrence);
-
-  // monthly
-  menulistSelect(recid("period-list"), "2", recurrence);
-
-  // last day of month
-  recurrence.radio(recid("montly-period-relative-date-radio"));
-  menulistSelect(recid("monthly-ordinal"), "-1", recurrence);
-  menulistSelect(recid("monthly-weekday"), "-1", recurrence);
-  recsleep();
-
-  // Close dialog.
-  recurrence.click(reclookup(REC_DLG_ACCEPT));
-}
-
-registerCleanupFunction(function teardownModule(module) {
-  deleteCalendars(controller, CALENDARNAME);
-  // Reset view.
-  switchToView(controller, "day");
-  if (
-    eid("day-view")
-      .getNode()
-      .getAttribute("orient") == "horizontal"
-  ) {
-    controller.mainMenu.click("#ltnViewRotated");
-  }
-  controller.waitFor(
-    () =>
-      eid("day-view")
-        .getNode()
-        .getAttribute("orient") == "vertical"
-  );
-  closeAllEventDialogs();
-});
deleted file mode 100755
--- a/calendar/test/browser/recurrenceRotated/browser_weeklyN.js
+++ /dev/null
@@ -1,173 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-var mozmill = ChromeUtils.import("resource://testing-common/mozmill/mozmill.jsm");
-
-var {
-  CALENDARNAME,
-  CANVAS_BOX,
-  EVENTPATH,
-  EVENT_BOX,
-  TIMEOUT_MODAL_DIALOG,
-  closeAllEventDialogs,
-  createCalendar,
-  deleteCalendars,
-  goToDate,
-  handleOccurrencePrompt,
-  helpersForController,
-  invokeEventDialog,
-  menulistSelect,
-  switchToView,
-  viewForward,
-} = ChromeUtils.import("resource://testing-common/mozmill/CalendarUtils.jsm");
-var { REC_DLG_ACCEPT, REC_DLG_DAYS } = ChromeUtils.import(
-  "resource://testing-common/mozmill/ItemEditingHelpers.jsm"
-);
-var { plan_for_modal_dialog, wait_for_modal_dialog } = ChromeUtils.import(
-  "resource://testing-common/mozmill/WindowHelpers.jsm"
-);
-
-var { cal } = ChromeUtils.import("resource:///modules/calendar/calUtils.jsm");
-
-var controller = mozmill.getMail3PaneController();
-var { eid, lookupEventBox } = helpersForController(controller);
-
-const HOUR = 8;
-
-add_task(async function testWeeklyNRecurrence() {
-  createCalendar(controller, CALENDARNAME);
-  switchToView(controller, "day");
-  goToDate(controller, 2009, 1, 5);
-
-  // Rotate view.
-  controller.mainMenu.click("#ltnViewRotated");
-  controller.waitFor(
-    () =>
-      eid("day-view")
-        .getNode()
-        .getAttribute("orient") == "horizontal"
-  );
-
-  // Create weekly recurring event.
-  let eventBox = lookupEventBox("day", CANVAS_BOX, null, 1, HOUR);
-  await invokeEventDialog(controller, eventBox, (event, iframe) => {
-    let { eid: eventid } = helpersForController(event);
-
-    plan_for_modal_dialog("Calendar:EventDialog:Recurrence", setRecurrence);
-    event.waitForElement(eventid("item-repeat"));
-    menulistSelect(eventid("item-repeat"), "custom", event);
-    wait_for_modal_dialog("Calendar:EventDialog:Recurrence", TIMEOUT_MODAL_DIALOG);
-
-    event.click(eventid("button-saveandclose"));
-  });
-
-  // Check day view.
-  let box = lookupEventBox("day", EVENT_BOX, null, 1, null, EVENTPATH);
-  // Monday, Tuesday, Wednesday, Thursday
-  for (let i = 0; i < 4; i++) {
-    controller.waitForElement(box);
-    viewForward(controller, 1);
-  }
-
-  // Not Friday
-  controller.waitForElementNotPresent(box);
-  viewForward(controller, 1);
-
-  // Not Saturday as only 4 occurrences are set.
-  controller.waitForElementNotPresent(box);
-
-  // Check week view.
-  switchToView(controller, "week");
-
-  // Monday, Tuesday, Wednesday, Thursday
-  for (let i = 2; i < 6; i++) {
-    controller.waitForElement(lookupEventBox("week", EVENT_BOX, null, i, null, EVENTPATH));
-  }
-
-  // Saturday
-  controller.assertNodeNotExist(lookupEventBox("week", EVENT_BOX, null, 7, null, EVENTPATH));
-
-  // check multiweek view
-  switchToView(controller, "multiweek");
-  checkMultiWeekView("multiweek");
-
-  // Check month view.
-  switchToView(controller, "month");
-  checkMultiWeekView("month");
-
-  // Delete event.
-  box = lookupEventBox("month", CANVAS_BOX, 2, 2, null, EVENTPATH);
-  controller.click(box);
-  handleOccurrencePrompt(controller, box, "delete", true);
-  controller.waitForElementNotPresent(box);
-
-  Assert.ok(true, "Test ran to completion");
-});
-
-function setRecurrence(recurrence) {
-  let { sleep: recsleep, lookup: reclookup, eid: recid } = helpersForController(recurrence);
-
-  // weekly
-  recurrence.waitForElement(recid("period-list"));
-  menulistSelect(recid("period-list"), "1", recurrence);
-  recsleep();
-
-  let mon = cal.l10n.getDateFmtString("day.2.Mmm");
-  let tue = cal.l10n.getDateFmtString("day.3.Mmm");
-  let wed = cal.l10n.getDateFmtString("day.4.Mmm");
-  let thu = cal.l10n.getDateFmtString("day.5.Mmm");
-  let sat = cal.l10n.getDateFmtString("day.7.Mmm");
-
-  // Starting from Monday so it should be checked. We have to wait a little,
-  // because the checkedstate is set in background by JS.
-  recurrence.waitFor(() => {
-    return recurrence.assertChecked(reclookup(`${REC_DLG_DAYS}/{"label":"${mon}"}`));
-  }, 30000);
-  // Check Tuesday, Wednesday, Thursday and Saturday too.
-  recurrence.click(reclookup(`${REC_DLG_DAYS}/{"label":"${tue}"}`));
-  recurrence.click(reclookup(`${REC_DLG_DAYS}/{"label":"${wed}"}`));
-  recurrence.click(reclookup(`${REC_DLG_DAYS}/{"label":"${thu}"}`));
-  recurrence.click(reclookup(`${REC_DLG_DAYS}/{"label":"${sat}"}`));
-
-  // Set number of recurrences.
-  recurrence.click(recid("recurrence-range-for"));
-  let ntimesField = recid("repeat-ntimes-count");
-  ntimesField.getNode().value = "4";
-
-  // close dialog
-  recurrence.click(reclookup(REC_DLG_ACCEPT));
-}
-
-function checkMultiWeekView(view) {
-  // In month view event starts from 2nd row.
-  let week = view == "month" ? 2 : 1;
-
-  // Monday, Tuesday, Wednesday, Thursday
-  for (let i = 2; i < 6; i++) {
-    controller.assertNode(lookupEventBox(view, CANVAS_BOX, week, i, null, EVENTPATH));
-  }
-
-  // Saturday
-  controller.assertNodeNotExist(lookupEventBox(view, CANVAS_BOX, week, 7, null, EVENTPATH));
-}
-
-registerCleanupFunction(function teardownModule(module) {
-  deleteCalendars(controller, CALENDARNAME);
-  // Reset view.
-  switchToView(controller, "day");
-  if (
-    eid("day-view")
-      .getNode()
-      .getAttribute("orient") == "horizontal"
-  ) {
-    controller.mainMenu.click("#ltnViewRotated");
-  }
-  controller.waitFor(
-    () =>
-      eid("day-view")
-        .getNode()
-        .getAttribute("orient") == "vertical"
-  );
-  closeAllEventDialogs();
-});
deleted file mode 100755
--- a/calendar/test/browser/recurrenceRotated/browser_weeklyUntil.js
+++ /dev/null
@@ -1,230 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-var mozmill = ChromeUtils.import("resource://testing-common/mozmill/mozmill.jsm");
-
-var { plan_for_modal_dialog, wait_for_modal_dialog } = ChromeUtils.import(
-  "resource://testing-common/mozmill/WindowHelpers.jsm"
-);
-
-var { cal } = ChromeUtils.import("resource:///modules/calendar/calUtils.jsm");
-
-var SHORT_SLEEP, TIMEOUT_MODAL_DIALOG, CALENDARNAME, EVENTPATH, EVENT_BOX, CANVAS_BOX;
-var helpersForController, handleOccurrencePrompt, switchToView, goToDate;
-var invokeEventDialog,
-  viewForward,
-  closeAllEventDialogs,
-  deleteCalendars,
-  createCalendar,
-  menulistSelect;
-var REC_DLG_DAYS, REC_DLG_ACCEPT, REC_DLG_UNTIL_INPUT;
-var controller, eid, lookupEventBox;
-
-const ENDDATE = new Date(2009, 0, 26); // last Monday in month
-const HOUR = 8;
-
-add_task(function setupModule(module) {
-  controller = mozmill.getMail3PaneController();
-  ({
-    SHORT_SLEEP,
-    TIMEOUT_MODAL_DIALOG,
-    CALENDARNAME,
-    EVENTPATH,
-    EVENT_BOX,
-    CANVAS_BOX,
-    helpersForController,
-    handleOccurrencePrompt,
-    switchToView,
-    goToDate,
-    invokeEventDialog,
-    viewForward,
-    closeAllEventDialogs,
-    deleteCalendars,
-    createCalendar,
-    menulistSelect,
-  } = ChromeUtils.import("resource://testing-common/mozmill/CalendarUtils.jsm"));
-  ({ eid, lookupEventBox } = helpersForController(controller));
-
-  ({ REC_DLG_DAYS, REC_DLG_ACCEPT, REC_DLG_UNTIL_INPUT } = ChromeUtils.import(
-    "resource://testing-common/mozmill/ItemEditingHelpers.jsm"
-  ));
-
-  switchToView(controller, "day");
-  createCalendar(controller, CALENDARNAME);
-  // Rotate view.
-  controller.mainMenu.click("#ltnViewRotated");
-  controller.waitFor(
-    () =>
-      eid("day-view")
-        .getNode()
-        .getAttribute("orient") == "horizontal"
-  );
-});
-
-add_task(async function testWeeklyUntilRecurrence() {
-  goToDate(controller, 2009, 1, 5); // Monday
-
-  // Create weekly recurring event.
-  let eventBox = lookupEventBox("day", CANVAS_BOX, null, 1, HOUR);
-  await invokeEventDialog(controller, eventBox, (event, iframe) => {
-    let { eid: eventid } = helpersForController(event);
-
-    plan_for_modal_dialog("Calendar:EventDialog:Recurrence", setRecurrence);
-    event.waitForElement(eventid("item-repeat"));
-    menulistSelect(eventid("item-repeat"), "custom", event);
-    wait_for_modal_dialog("Calendar:EventDialog:Recurrence", TIMEOUT_MODAL_DIALOG);
-
-    event.click(eventid("button-saveandclose"));
-  });
-
-  let box = lookupEventBox("day", EVENT_BOX, null, 1, null, EVENTPATH);
-
-  // Check day view.
-  for (let week = 0; week < 3; week++) {
-    // Monday
-    controller.waitForElement(box);
-    viewForward(controller, 2);
-
-    // Wednesday
-    controller.waitForElement(box);
-    viewForward(controller, 2);
-
-    // Friday
-    controller.waitForElement(box);
-    viewForward(controller, 3);
-  }
-
-  // Monday, last occurrence
-  controller.waitForElement(box);
-  viewForward(controller, 2);
-
-  // Wednesday
-  controller.waitForElementNotPresent(box);
-
-  // Check week view.
-  switchToView(controller, "week");
-  goToDate(controller, 2009, 1, 5);
-  for (let week = 0; week < 3; week++) {
-    // Monday
-    controller.waitForElement(lookupEventBox("week", EVENT_BOX, null, 2, null, EVENTPATH));
-
-    // Wednesday
-    controller.waitForElement(lookupEventBox("week", EVENT_BOX, null, 4, null, EVENTPATH));
-
-    // Friday
-    controller.waitForElement(lookupEventBox("week", EVENT_BOX, null, 6, null, EVENTPATH));
-
-    viewForward(controller, 1);
-  }
-
-  // Monday, last occurrence
-  controller.waitForElement(lookupEventBox("week", EVENT_BOX, null, 2, null, EVENTPATH));
-  // Wednesday
-  controller.assertNodeNotExist(lookupEventBox("week", EVENT_BOX, null, 4, null, EVENTPATH));
-
-  // Check multiweek view.
-  switchToView(controller, "multiweek");
-  goToDate(controller, 2009, 1, 5);
-  checkMultiWeekView("multiweek");
-
-  // Check month view.
-  switchToView(controller, "month");
-  goToDate(controller, 2009, 1, 5);
-  checkMultiWeekView("month");
-
-  // Delete event.
-  box = lookupEventBox("month", CANVAS_BOX, 2, 2, null, EVENTPATH);
-  controller.click(box);
-  handleOccurrencePrompt(controller, box, "delete", true);
-  controller.waitForElementNotPresent(box);
-
-  Assert.ok(true, "Test ran to completion");
-});
-
-function setRecurrence(recurrence) {
-  let { sleep: recsleep, lookup: reclookup, eid: recid } = helpersForController(recurrence);
-
-  // weekly
-  recurrence.waitForElement(recid("period-list"));
-  menulistSelect(recid("period-list"), "1", recurrence);
-
-  let mon = cal.l10n.getDateFmtString("day.2.Mmm");
-  let wed = cal.l10n.getDateFmtString("day.4.Mmm");
-  let fri = cal.l10n.getDateFmtString("day.6.Mmm");
-
-  // Starting from Monday so it should be checked. We have to wait a little,
-  // because the checkedstate is set in background by JS.
-  recurrence.waitFor(() => {
-    return recurrence.assertChecked(reclookup(`${REC_DLG_DAYS}/{"label":"${mon}"}`));
-  }, 30000);
-  // Starting from Monday so it should be checked.
-  recurrence.assertChecked(reclookup(`${REC_DLG_DAYS}/{"label":"${mon}"}`));
-  // Check Wednesday and Friday too.
-  recurrence.click(reclookup(`${REC_DLG_DAYS}/{"label":"${wed}"}`));
-  recurrence.click(reclookup(`${REC_DLG_DAYS}/{"label":"${fri}"}`));
-
-  // Set until date.
-  recurrence.radio(recid("recurrence-range-until"));
-
-  // Delete previous date.
-  let untilInput = reclookup(REC_DLG_UNTIL_INPUT);
-  recurrence.keypress(untilInput, "a", { accelKey: true });
-  recurrence.keypress(untilInput, "VK_DELETE", {});
-
-  let dateFormatter = cal.getDateFormatter();
-
-  let endDateString = dateFormatter.formatDateShort(
-    cal.dtz.jsDateToDateTime(ENDDATE, cal.dtz.floating)
-  );
-  recsleep(SHORT_SLEEP);
-  recurrence.type(untilInput, endDateString);
-
-  recsleep(SHORT_SLEEP);
-  // Move focus to ensure the date is selected.
-  recurrence.keypress(untilInput, "VK_TAB", {});
-
-  // Close dialog.
-  recurrence.click(reclookup(REC_DLG_ACCEPT));
-}
-
-function checkMultiWeekView(view) {
-  let startWeek = view == "month" ? 2 : 1;
-
-  for (let week = startWeek; week < startWeek + 3; week++) {
-    // Monday
-    controller.waitForElement(lookupEventBox(view, CANVAS_BOX, week, 2, null, EVENTPATH));
-    // Wednesday
-    controller.assertNode(lookupEventBox(view, CANVAS_BOX, week, 4, null, EVENTPATH));
-    // Friday
-    controller.assertNode(lookupEventBox(view, CANVAS_BOX, week, 6, null, EVENTPATH));
-  }
-
-  // Monday, last occurrence
-  controller.assertNode(lookupEventBox(view, CANVAS_BOX, startWeek + 3, 2, null, EVENTPATH));
-
-  // Wednesday
-  controller.assertNodeNotExist(
-    lookupEventBox(view, CANVAS_BOX, startWeek + 3, 4, null, EVENTPATH)
-  );
-}
-
-registerCleanupFunction(function teardownModule(module) {
-  deleteCalendars(controller, CALENDARNAME);
-  // Reset view.
-  switchToView(controller, "day");
-  if (
-    eid("day-view")
-      .getNode()
-      .getAttribute("orient") == "horizontal"
-  ) {
-    controller.mainMenu.click("#ltnViewRotated");
-  }
-  controller.waitFor(
-    () =>
-      eid("day-view")
-        .getNode()
-        .getAttribute("orient") == "vertical"
-  );
-  closeAllEventDialogs();
-});
deleted file mode 100755
--- a/calendar/test/browser/recurrenceRotated/browser_weeklyWithException.js
+++ /dev/null
@@ -1,298 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-var mozmill = ChromeUtils.import("resource://testing-common/mozmill/mozmill.jsm");
-
-var {
-  CALENDARNAME,
-  CANVAS_BOX,
-  DAY_VIEW,
-  EVENTPATH,
-  EVENT_BOX,
-  TIMEOUT_MODAL_DIALOG,
-  WEEK_VIEW,
-  closeAllEventDialogs,
-  createCalendar,
-  deleteCalendars,
-  goToDate,
-  handleOccurrencePrompt,
-  helpersForController,
-  invokeEventDialog,
-  menulistSelect,
-  switchToView,
-  viewForward,
-} = ChromeUtils.import("resource://testing-common/mozmill/CalendarUtils.jsm");
-var {
-  REC_DLG_ACCEPT,
-  REC_DLG_DAYS,
-  REPEAT_DETAILS,
-  helpersForEditUI,
-  setData,
-} = ChromeUtils.import("resource://testing-common/mozmill/ItemEditingHelpers.jsm");
-var { plan_for_modal_dialog, wait_for_modal_dialog } = ChromeUtils.import(
-  "resource://testing-common/mozmill/WindowHelpers.jsm"
-);
-
-var { cal } = ChromeUtils.import("resource:///modules/calendar/calUtils.jsm");
-
-var controller = mozmill.getMail3PaneController();
-var { eid, lookup, lookupEventBox } = helpersForController(controller);
-
-const HOUR = 8;
-const STARTDATE = new Date(2009, 0, 6);
-
-add_task(async function testWeeklyWithExceptionRecurrence() {
-  createCalendar(controller, CALENDARNAME);
-  switchToView(controller, "day");
-  goToDate(controller, 2009, 1, 5);
-
-  // Rotate view.
-  controller.mainMenu.click("#ltnViewRotated");
-  controller.waitFor(
-    () =>
-      eid("day-view")
-        .getNode()
-        .getAttribute("orient") == "horizontal"
-  );
-
-  // Create weekly recurring event.
-  let eventBox = lookupEventBox("day", CANVAS_BOX, null, 1, HOUR);
-  await invokeEventDialog(controller, eventBox, (event, iframe) => {
-    let { eid: eventid } = helpersForController(event);
-
-    event.waitForElement(eventid("item-repeat"));
-    plan_for_modal_dialog("Calendar:EventDialog:Recurrence", setRecurrence);
-    menulistSelect(eventid("item-repeat"), "custom", event);
-    wait_for_modal_dialog("Calendar:EventDialog:Recurrence", TIMEOUT_MODAL_DIALOG);
-
-    event.click(eventid("button-saveandclose"));
-  });
-
-  // Move 5th January occurrence to 6th January.
-  eventBox = lookupEventBox("day", EVENT_BOX, null, 1, null, EVENTPATH);
-  handleOccurrencePrompt(controller, eventBox, "modify", false);
-  await invokeEventDialog(controller, null, async (event, iframe) => {
-    let { eid: eventid } = helpersForController(event);
-
-    await setData(event, iframe, { startdate: STARTDATE, enddate: STARTDATE });
-    event.click(eventid("button-saveandclose"));
-  });
-
-  // Change recurrence rule.
-  goToDate(controller, 2009, 1, 7);
-  eventBox = lookupEventBox("day", EVENT_BOX, null, 1, null, EVENTPATH);
-  handleOccurrencePrompt(controller, eventBox, "modify", true);
-  await invokeEventDialog(controller, null, (event, iframe) => {
-    let { eid: eventid } = helpersForController(event);
-    let { iframeLookup } = helpersForEditUI(iframe);
-
-    event.waitForElement(eventid("item-repeat"));
-    plan_for_modal_dialog("Calendar:EventDialog:Recurrence", changeRecurrence);
-    event.click(iframeLookup(REPEAT_DETAILS));
-    wait_for_modal_dialog("Calendar:EventDialog:Recurrence", TIMEOUT_MODAL_DIALOG);
-
-    event.click(eventid("button-saveandclose"));
-  });
-
-  // Check two weeks.
-  // day view
-  switchToView(controller, "day");
-  let path = lookupEventBox("day", EVENT_BOX, null, 1, null, EVENTPATH);
-
-  goToDate(controller, 2009, 1, 5);
-  controller.waitForElementNotPresent(path);
-
-  viewForward(controller, 1);
-  let tuesPath = `
-        ${DAY_VIEW}/{"class":"mainbox"}/{"class":"scrollbox"}/
-        {"class":"daybox"}/[0]/{"class":"multiday-column-box-stack"}/
-        {"class":"multiday-column-top-box"}/{"flex":"1"}/{"flex":"1"}/[eventIndex]
-    `;
-
-  // Assert exactly two.
-  controller.waitForElement(lookup(tuesPath.replace("eventIndex", "0") + EVENTPATH));
-  controller.assertNode(lookup(tuesPath.replace("eventIndex", "1") + EVENTPATH));
-  controller.assertNodeNotExist(lookup(tuesPath.replace("eventIndex", "2") + EVENTPATH));
-
-  viewForward(controller, 1);
-  controller.waitForElement(path);
-  viewForward(controller, 1);
-  controller.waitForElementNotPresent(path);
-  viewForward(controller, 1);
-  controller.waitForElement(path);
-  viewForward(controller, 1);
-  controller.waitForElementNotPresent(path);
-  viewForward(controller, 1);
-  controller.waitForElementNotPresent(path);
-
-  // next week
-  viewForward(controller, 1);
-  controller.waitForElement(path);
-  viewForward(controller, 1);
-  controller.waitForElement(path);
-  viewForward(controller, 1);
-  controller.waitForElement(path);
-  viewForward(controller, 1);
-  controller.waitForElementNotPresent(path);
-  viewForward(controller, 1);
-  controller.waitForElement(path);
-  viewForward(controller, 1);
-  controller.waitForElementNotPresent(path);
-
-  // week view
-  switchToView(controller, "week");
-  goToDate(controller, 2009, 1, 5);
-
-  tuesPath = `
-        ${WEEK_VIEW}/{"class":"mainbox"}/{"class":"scrollbox"}/
-        {"class":"daybox"}/[2]/{"class":"multiday-column-box-stack"}/
-        {"class":"multiday-column-top-box"}/{"flex":"1"}/{"flex":"1"}/[eventIndex]
-    `;
-
-  // Assert exactly two.
-  controller.waitForElement(lookup(tuesPath.replace("eventIndex", "0") + EVENTPATH));
-  controller.assertNode(lookup(tuesPath.replace("eventIndex", "1") + EVENTPATH));
-  controller.assertNodeNotExist(lookup(tuesPath.replace("eventIndex", "2") + EVENTPATH));
-
-  // Wait for the last occurrence because this appears last.
-  controller.waitForElement(lookupEventBox("week", EVENT_BOX, null, 6, null));
-  controller.assertNodeNotExist(lookupEventBox("week", EVENT_BOX, null, 1, null));
-  controller.assertNodeNotExist(lookupEventBox("week", EVENT_BOX, null, 2, null));
-  controller.assertNode(lookupEventBox("week", EVENT_BOX, null, 4, null));
-  controller.assertNodeNotExist(lookupEventBox("week", EVENT_BOX, null, 5, null));
-  controller.assertNodeNotExist(lookupEventBox("week", EVENT_BOX, null, 7, null));
-
-  viewForward(controller, 1);
-  controller.waitForElement(lookupEventBox("week", EVENT_BOX, null, 6, null));
-  controller.assertNodeNotExist(lookupEventBox("week", EVENT_BOX, null, 1, null));
-  controller.assertNode(lookupEventBox("week", EVENT_BOX, null, 2, null));
-  controller.assertNode(lookupEventBox("week", EVENT_BOX, null, 3, null));
-  controller.assertNode(lookupEventBox("week", EVENT_BOX, null, 4, null));
-  controller.assertNodeNotExist(lookupEventBox("week", EVENT_BOX, null, 5, null));
-  controller.assertNodeNotExist(lookupEventBox("week", EVENT_BOX, null, 7, null));
-
-  // multiweek view
-  switchToView(controller, "multiweek");
-  goToDate(controller, 2009, 1, 5);
-  checkMultiWeekView("multiweek");
-
-  // month view
-  switchToView(controller, "month");
-  checkMultiWeekView("month");
-
-  // Delete event.
-  switchToView(controller, "day");
-  goToDate(controller, 2009, 1, 12);
-  path = lookupEventBox("day", EVENT_BOX, null, 1, null, EVENTPATH);
-  controller.click(path);
-  handleOccurrencePrompt(controller, path, "delete", true);
-  controller.waitForElementNotPresent(path);
-
-  Assert.ok(true, "Test ran to completion");
-});
-
-function setRecurrence(recurrence) {
-  let { lookup: reclookup, eid: recid } = helpersForController(recurrence);
-
-  // weekly
-  menulistSelect(recid("period-list"), "1", recurrence);
-
-  let mon = cal.l10n.getDateFmtString("day.2.Mmm");
-  let wed = cal.l10n.getDateFmtString("day.4.Mmm");
-  let fri = cal.l10n.getDateFmtString("day.6.Mmm");
-
-  // Starting from Monday so it should be checked. We have to wait a little,
-  // because the checkedstate is set in background by JS.
-  recurrence.waitFor(() => {
-    return recurrence.assertChecked(reclookup(`${REC_DLG_DAYS}/{"label":"${mon}"}`));
-  }, 10000);
-  // Check Wednesday and Friday too.
-  recurrence.click(reclookup(`${REC_DLG_DAYS}/{"label":"${wed}"}`));
-  recurrence.assertChecked(reclookup(`${REC_DLG_DAYS}/{"label":"${wed}"}`));
-  recurrence.click(reclookup(`${REC_DLG_DAYS}/{"label":"${fri}"}`));
-  recurrence.assertChecked(reclookup(`${REC_DLG_DAYS}/{"label":"${fri}"}`));
-
-  // Close dialog.
-  recurrence.click(reclookup(REC_DLG_ACCEPT));
-}
-
-function changeRecurrence(recurrence) {
-  let { lookup: reclookup, eid: recid } = helpersForController(recurrence);
-
-  // weekly
-  menulistSelect(recid("period-list"), "1", recurrence);
-
-  let mon = cal.l10n.getDateFmtString("day.2.Mmm");
-  let tue = cal.l10n.getDateFmtString("day.3.Mmm");
-  let wed = cal.l10n.getDateFmtString("day.4.Mmm");
-  let fri = cal.l10n.getDateFmtString("day.6.Mmm");
-
-  // Check old rule.
-  // Starting from Monday so it should be checked. We have to wait a little,
-  // because the checkedstate is set in background by JS.
-  recurrence.waitFor(() => {
-    return recurrence.assertChecked(reclookup(`${REC_DLG_DAYS}/{"label":"${mon}"}`));
-  }, 10000);
-  recurrence.assertChecked(reclookup(`${REC_DLG_DAYS}/{"label":"${wed}"}`));
-  recurrence.assertChecked(reclookup(`${REC_DLG_DAYS}/{"label":"${fri}"}`));
-
-  // Check Tuesday.
-  recurrence.click(reclookup(`${REC_DLG_DAYS}/{"label":"${tue}"}`));
-  recurrence.assertChecked(reclookup(`${REC_DLG_DAYS}/{"label":"${tue}"}`));
-
-  // Close dialog.
-  recurrence.click(reclookup(REC_DLG_ACCEPT));
-}
-
-function checkMultiWeekView(view) {
-  let startWeek = view == "multiweek" ? 1 : 2;
-  let assertNodeLookup = (...args) => {
-    return controller.assertNode(lookupEventBox(...args));
-  };
-  let assertNodeNotExistLookup = (...args) => {
-    return controller.assertNodeNotExist(lookupEventBox(...args));
-  };
-
-  // Wait for the first items, then check the ones not to be present.
-  // Assert exactly two.
-  controller.waitForElement(lookupEventBox(view, EVENT_BOX, startWeek, 3, null, "/[0]"));
-  assertNodeLookup(view, CANVAS_BOX, startWeek, 3, null, "/[1]");
-  assertNodeNotExistLookup(view, EVENT_BOX, startWeek, 3, null, "/[2]");
-  // Then check no item on the 5th.
-  assertNodeNotExistLookup(view, EVENT_BOX, startWeek, 2, null, EVENTPATH);
-  assertNodeNotExistLookup(view, EVENT_BOX, startWeek, 3, null, "/[2]");
-  assertNodeLookup(view, CANVAS_BOX, startWeek, 4, null, EVENTPATH);
-  assertNodeNotExistLookup(view, EVENT_BOX, startWeek, 5, null, EVENTPATH);
-  assertNodeLookup(view, CANVAS_BOX, startWeek, 6, null, EVENTPATH);
-  assertNodeNotExistLookup(view, EVENT_BOX, startWeek, 7, null, EVENTPATH);
-
-  assertNodeNotExistLookup(view, EVENT_BOX, startWeek + 1, 1, null, EVENTPATH);
-  assertNodeLookup(view, CANVAS_BOX, startWeek + 1, 2, null, EVENTPATH);
-  assertNodeLookup(view, CANVAS_BOX, startWeek + 1, 3, null, EVENTPATH);
-  assertNodeLookup(view, CANVAS_BOX, startWeek + 1, 4, null, EVENTPATH);
-  assertNodeNotExistLookup(view, EVENT_BOX, startWeek + 1, 5, null, EVENTPATH);
-  assertNodeLookup(view, CANVAS_BOX, startWeek + 1, 6, null, EVENTPATH);
-  assertNodeNotExistLookup(view, EVENT_BOX, startWeek + 1, 7, null, EVENTPATH);
-}
-
-registerCleanupFunction(function teardownModule(module) {
-  deleteCalendars(controller, CALENDARNAME);
-
-  // Reset view.
-  switchToView(controller, "day");
-  if (
-    eid("day-view")
-      .getNode()
-      .getAttribute("orient") == "horizontal"
-  ) {
-    controller.mainMenu.click("#ltnViewRotated");
-  }
-  controller.waitFor(
-    () =>
-      eid("day-view")
-        .getNode()
-        .getAttribute("orient") == "vertical"
-  );
-  closeAllEventDialogs();
-});
--- a/calendar/test/moz.build
+++ b/calendar/test/moz.build
@@ -4,17 +4,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 BROWSER_CHROME_MANIFESTS += [
     'browser/browser.ini',
     'browser/eventDialog/browser.ini',
     'browser/invitations/browser.ini',
     'browser/preferences/browser.ini',
     'browser/recurrence/browser.ini',
-    'browser/recurrenceRotated/browser.ini',
+    'browser/recurrence/browser_rotated.ini',
     'browser/views/browser.ini',
 ]
 
 TESTING_JS_MODULES.mozmill += [
     'modules/CalendarUtils.jsm',
     'modules/ItemEditingHelpers.jsm',
 ]