975738 - Fix broken agenda sidebar tests in testTodayPane.js

Status: RESOLVED FIXED

(Calendar :: Calendar Frontend, defect)

Description

[Sebastian Hengst [:aryx] (needinfo me if it's about an intermittent or backout)]

Attachment: patch, v1

Bug 781424 / http://hg.mozilla.org/comm-central/rev/331134c6846e broke the tests for the labels of the upcoming events of the today pane / agenda sidebar.

Comment 1

[Merike Sell (:merike)]

Comment on attachment 8380205 [details] [diff] [review]
patch, v1

Review of attachment 8380205 [details] [diff] [review]:
-----------------------------------------------------------------

I found some things that could be improved. Therefore r- for this version.

::: calendar/test/mozmill/testTodayPane.js
@@ +130,5 @@
> +  probeDate.year = now.getFullYear();
> +  probeDate.month = now.getMonth();
> +  probeDate.day = now.getDate();
> +  probeDate.hour = startHour;
> +  probeDate.minute = 0;

This could be shortened a bit here and afterwards if you used something like:
let dtz = cal.calendarDefaultTimezone();
let probeDate = cal.jsDateToDateTime(now, dtz);

cal would be available after
Components.utils.import("resource://calendar/modules/calUtils.jsm"); as usual.

@@ +145,5 @@
> +  probeDate.hour = startHour;
> +  probeDate.year = tomorrow.getFullYear();
> +  probeDate.month = tomorrow.getMonth();
> +  probeDate.day = tomorrow.getDate();
> +  probeDate.hour = 9;

First assignment to hour seems unnecessary?

@@ +146,5 @@
> +  probeDate.year = tomorrow.getFullYear();
> +  probeDate.month = tomorrow.getMonth();
> +  probeDate.day = tomorrow.getDate();
> +  probeDate.hour = 9;
> +  let startTime = dateFormatter.formatTime(probeDate);

let isn't really needed any more as it's already declared above.

@@ +158,4 @@
>      '/id("messengerWindow")/id("tabmail-container")/id("today-pane-panel")/[1]/id("agenda-panel")/'
>      + '{"flex":"1"}/id("agenda-listbox")/[6]/anon({"anonid":"agenda-container-box"})/'
>      + 'anon({"anonid":"agenda-description"})/[1]'),
>      "Future's Event");

As you're already checking other times I'd check date and time of the future event too. This way you'll have both title and datetime information display verified for all events. Shouldn't be more difficult than a formatDateTime call.

Comment 2

[Sebastian Hengst [:aryx] (needinfo me if it's about an intermittent or backout)]

Attachment: patch, v2

Comment 3

[Merike Sell (:merike)]

Comment on attachment 8384353 [details] [diff] [review]
patch, v2

Review of attachment 8384353 [details] [diff] [review]:
-----------------------------------------------------------------

Looks good and works well. r=merike

Comment 4

[Sebastian Hengst [:aryx] (needinfo me if it's about an intermittent or backout)]

Attachment: patch, v3, r=merike

Comment 5

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/comm-central/rev/7f53db3e4322