1
=== modified file 'WeekView.qml'
2
--- WeekView.qml	2013-10-28 21:08:48 +0000
3
+++ WeekView.qml	2013-11-26 03:13:32 +0000
4
@@ -7,6 +7,7 @@
5
7
    id: root
7
    id: root
6
8
8
7
9
    property var dayStart: new Date();
9
    property var dayStart: new Date();
8
10
    property var firstDay: dayStart.weekStart(1);
9
10
    anchors.top: parent.top
11
    anchors.top: parent.top
10
11
    anchors.topMargin: units.gu(1.5)
12
    anchors.topMargin: units.gu(1.5)
11
12
    spacing: units.gu(1)
13
    spacing: units.gu(1)
12
@@ -28,7 +29,7 @@
13
28
    PathViewBase{
29
    PathViewBase{
14
29
        id: weekViewPath
30
        id: weekViewPath
15
30
31
17
31
        property var visibleWeek: dayStart.weekStart(Qt.locale().firstDayOfWeek);
32
        property var visibleWeek: dayStart.weekStart(1);
18
32
        property var weekStart: weekViewPath.visibleWeek.addDays(-7)
33
        property var weekStart: weekViewPath.visibleWeek.addDays(-7)
19
33
34
20
34
        width: parent.width
35
        width: parent.width
21
@@ -45,12 +46,12 @@
22
45
        }
46
        }
23
46
47
24
47
        function nextWeek() {
48
        function nextWeek() {
26
48
            var weekStartDay = visibleWeek.weekStart(Qt.locale().firstDayOfWeek);
49
            var weekStartDay = visibleWeek.weekStart(1);
27
49
            dayStart = weekStartDay.addDays(7);
50
            dayStart = weekStartDay.addDays(7);
28
50
        }
51
        }
29
51
52
30
52
        function previousWeek(){
53
        function previousWeek(){
32
53
            var weekStartDay = visibleWeek.weekStart(Qt.locale().firstDayOfWeek);
54
            var weekStartDay = visibleWeek.weekStart(1);
33
54
            dayStart = weekStartDay.addDays(-7);
55
            dayStart = weekStartDay.addDays(-7);
34
55
        }
56
        }
35
56
57
36
@@ -68,10 +69,10 @@
37
68
                case 0:
69
                case 0:
38
69
                    return weekViewPath.weekStart;
70
                    return weekViewPath.weekStart;
39
70
                case -1:
71
                case -1:
41
71
                    var weekStartDay= weekViewPath.weekStart.weekStart(Qt.locale().firstDayOfWeek);
72
                    var weekStartDay= weekViewPath.weekStart.weekStart(1);
42
72
                    return weekStartDay.addDays(14);
73
                    return weekStartDay.addDays(14);
43
73
                case 1:
74
                case 1:
45
74
                    var weekStartDay = weekViewPath.weekStart.weekStart(Qt.locale().firstDayOfWeek);
75
                    var weekStartDay = weekViewPath.weekStart.weekStart(1);
46
75
                    return weekStartDay.addDays(7);
76
                    return weekStartDay.addDays(7);
47
76
                }
77
                }
48
77
            }
78
            }
49
78
79
50
=== modified file 'debian/control'
51
--- debian/control	2013-09-28 04:17:14 +0000
52
+++ debian/control	2013-11-26 03:13:32 +0000
53
@@ -32,7 +32,7 @@
54
32
32
55
33
Package: calendar-app-autopilot
33
Package: calendar-app-autopilot
56
34
Architecture: all
34
Architecture: all
58
35
Depends: libautopilot-qt,
35
Depends: libautopilot-qt (>= 1.4),
59
36
         libqt5test5,
36
         libqt5test5,
60
37
         calendar-app (= ${source:Version}),
37
         calendar-app (= ${source:Version}),
61
38
         python-dateutil,
38
         python-dateutil,
62
39
39
63
=== modified file 'tests/autopilot/calendar_app/emulators.py'
64
--- tests/autopilot/calendar_app/emulators.py	2013-10-28 21:08:48 +0000
65
+++ tests/autopilot/calendar_app/emulators.py	2013-11-26 03:13:32 +0000
66
@@ -7,6 +7,7 @@
67
7
7
68
8
"""Calendar app autopilot emulators."""
8
"""Calendar app autopilot emulators."""
69
9
9
70
10
from autopilot.introspection import dbus
71
10
from ubuntuuitoolkit import emulators as toolkit_emulators
11
from ubuntuuitoolkit import emulators as toolkit_emulators
72
11
12
73
12
13
74
@@ -41,7 +42,10 @@
75
41
            return None
42
            return None
76
42
43
77
43
    def get_new_event(self):
44
    def get_new_event(self):
79
44
        return self.select_single("NewEvent")
45
        try:
80
46
            return self.wait_select_single("NewEvent")
81
47
        except dbus.StateNotFoundError:
82
48
            return None
83
45
49
84
46
    def get_new_event_name_input_box(self):
50
    def get_new_event_name_input_box(self):
85
47
        new_event = self.get_new_event()
51
        new_event = self.get_new_event()
86
@@ -69,7 +73,10 @@
87
69
                                       objectName="eventPeopleInput")
73
                                       objectName="eventPeopleInput")
88
70
74
89
71
    def get_time_picker(self):
75
    def get_time_picker(self):
91
72
        return self.select_single("TimePicker")
76
        try:
92
77
            return self.wait_select_single("TimePicker")
93
78
        except dbus.StateNotFoundError:
94
79
            return None
95
73
80
96
74
    def swipe_view(self, direction, view, x_pad=0.35):
81
    def swipe_view(self, direction, view, x_pad=0.35):
97
75
        """Swipe the given view to left or right.
82
        """Swipe the given view to left or right.
98
76
83
99
=== modified file 'tests/autopilot/calendar_app/tests/__init__.py'
100
--- tests/autopilot/calendar_app/tests/__init__.py	2013-10-08 14:14:09 +0000
101
+++ tests/autopilot/calendar_app/tests/__init__.py	2013-11-26 03:13:32 +0000
102
@@ -55,6 +55,13 @@
103
55
        self.temp_move_sqlite_db()
55
        self.temp_move_sqlite_db()
104
56
        self.addCleanup(self.restore_sqlite_db)
56
        self.addCleanup(self.restore_sqlite_db)
105
57
57
106
58
        #turn off the OSK so it doesn't block screen elements
107
59
        if model() != 'Desktop':
108
60
            os.system("stop maliit-server")
109
61
            #adding cleanup step seems to restart service immeadiately
110
62
            #disabling for now
111
63
            #self.addCleanup(os.system("start maliit-server"))
112
64
113
58
        if os.path.exists(self.local_location):
65
        if os.path.exists(self.local_location):
114
59
            self.launch_test_local()
66
            self.launch_test_local()
115
60
        elif os.path.exists(self.installed_location):
67
        elif os.path.exists(self.installed_location):
116
61
68
117
=== modified file 'tests/autopilot/calendar_app/tests/test_calendar.py'
118
--- tests/autopilot/calendar_app/tests/test_calendar.py	2013-10-23 20:44:19 +0000
119
+++ tests/autopilot/calendar_app/tests/test_calendar.py	2013-11-26 03:13:32 +0000
120
@@ -44,17 +44,6 @@
121
44
            self.assertThat(scroller.currentIndex, Eventually(
44
            self.assertThat(scroller.currentIndex, Eventually(
122
45
                Equals((current_index + 1) % 60)))
45
                Equals((current_index + 1) % 60)))
123
46
46
124
47
    def hideOSK(self):
125
48
        start_time_field = self.main_view.get_event_start_time_field()
126
49
        self.pointing_device.click_object(start_time_field)
127
50
        self.assertThat(self.main_view.get_time_picker,
128
51
                        Eventually(Not(Is(None))))
129
52
        picker = self.main_view.get_time_picker()
130
53
        cancel = picker.select_single("Button",
131
54
                                      objectName="TimePickerCancelButton")
132
55
        self.pointing_device.click_object(cancel)
133
56
        self.assertThat(self.main_view.get_time_picker, Eventually(Is(None)))
134
57
135
58
    def test_new_event(self):
47
    def test_new_event(self):
136
59
        """test add new event """
48
        """test add new event """
137
60
49
138
@@ -74,27 +63,20 @@
139
74
        # Set the start time
63
        # Set the start time
140
75
        start_time_field = self.main_view.get_event_start_time_field()
64
        start_time_field = self.main_view.get_event_start_time_field()
141
76
        self.pointing_device.click_object(start_time_field)
65
        self.pointing_device.click_object(start_time_field)
142
77
        self.assertThat(self.main_view.get_time_picker,
143
78
                        Eventually(Not(Is(None))))
144
79
        picker = self.main_view.get_time_picker()
66
        picker = self.main_view.get_time_picker()
146
80
        self.scroll_time_picker_to_time(picker, 10, 15)
67
        self.scroll_time_picker_to_time(picker, 12, 28)
147
81
        ok = picker.select_single("Button", objectName="TimePickerOKButton")
68
        ok = picker.select_single("Button", objectName="TimePickerOKButton")
148
82
        self.pointing_device.click_object(ok)
69
        self.pointing_device.click_object(ok)
149
83
        self.assertThat(self.main_view.get_time_picker, Eventually(Is(None)))
150
84
70
151
85
        # Set the end time
71
        # Set the end time
152
86
        end_time_field = self.main_view.get_event_end_time_field()
72
        end_time_field = self.main_view.get_event_end_time_field()
153
87
        self.pointing_device.click_object(end_time_field)
73
        self.pointing_device.click_object(end_time_field)
154
88
        self.assertThat(self.main_view.get_time_picker,
155
89
                        Eventually(Not(Is(None))))
156
90
        picker = self.main_view.get_time_picker()
74
        picker = self.main_view.get_time_picker()
158
91
        self.scroll_time_picker_to_time(picker, 11, 45)
75
        self.scroll_time_picker_to_time(picker, 13, 38)
159
92
        ok = picker.select_single("Button", objectName="TimePickerOKButton")
76
        ok = picker.select_single("Button", objectName="TimePickerOKButton")
160
93
        self.pointing_device.click_object(ok)
77
        self.pointing_device.click_object(ok)
161
94
        self.assertThat(self.main_view.get_time_picker, Eventually(Is(None)))
162
95
78
163
96
        #input location
79
        #input location
164
97
        self.hideOSK()
165
98
        location_field = self.main_view.get_event_location_field()
80
        location_field = self.main_view.get_event_location_field()
166
99
        self.pointing_device.click_object(location_field)
81
        self.pointing_device.click_object(location_field)
167
100
        self.assertThat(location_field.activeFocus, Eventually(Equals(True)))
82
        self.assertThat(location_field.activeFocus, Eventually(Equals(True)))
168
@@ -102,7 +84,6 @@
169
102
        self.assertThat(location_field.text, Eventually(Equals("My location")))
84
        self.assertThat(location_field.text, Eventually(Equals("My location")))
170
103
85
171
104
        #input people
86
        #input people
172
105
        self.hideOSK()
173
106
        people_field = self.main_view.get_event_people_field()
87
        people_field = self.main_view.get_event_people_field()
174
107
        self.pointing_device.click_object(people_field)
88
        self.pointing_device.click_object(people_field)
175
108
        self.assertThat(people_field.activeFocus, Eventually(Equals(True)))
89
        self.assertThat(people_field.activeFocus, Eventually(Equals(True)))
176
@@ -111,7 +92,6 @@
177
111
92
178
112
        #click save button
93
        #click save button
179
113
        self.main_view.open_toolbar().click_button("eventSaveButton")
94
        self.main_view.open_toolbar().click_button("eventSaveButton")
180
114
        self.assertThat(self.main_view.get_new_event, Eventually(Is(None)))
181
115
95
182
116
        #verify that the event has been created in timeline
96
        #verify that the event has been created in timeline
183
117
        self.assertThat(lambda: self.main_view.get_label_with_text(
97
        self.assertThat(lambda: self.main_view.get_label_with_text(
184
118
98
185
=== modified file 'tests/autopilot/calendar_app/tests/test_dayview.py'
186
--- tests/autopilot/calendar_app/tests/test_dayview.py	2013-10-29 20:55:31 +0000
187
+++ tests/autopilot/calendar_app/tests/test_dayview.py	2013-11-26 03:13:32 +0000
188
@@ -76,8 +76,7 @@
189
76
76
190
77
        for i in xrange(1, 5):
77
        for i in xrange(1, 5):
191
78
            self.main_view.swipe_view(direction, self.day_view, x_pad=0.15)
78
            self.main_view.swipe_view(direction, self.day_view, x_pad=0.15)
194
79
            current_day = datetime.datetime.fromtimestamp(
79
            current_day = self.day_view.currentDay.datetime
193
80
                self.day_view.currentDay)
195
81
80
196
82
            expected_day = (now + datetime.timedelta(
81
            expected_day = (now + datetime.timedelta(
197
83
                days=(i * direction)))
82
                days=(i * direction)))
198
84
83
199
=== modified file 'tests/autopilot/calendar_app/tests/test_monthview.py'
200
--- tests/autopilot/calendar_app/tests/test_monthview.py	2013-10-13 12:34:08 +0000
201
+++ tests/autopilot/calendar_app/tests/test_monthview.py	2013-11-26 03:13:32 +0000
202
@@ -24,7 +24,7 @@
203
24
24
204
25
    def get_currentDayStart(self):
25
    def get_currentDayStart(self):
205
26
        month_view = self.main_view.get_month_view()
26
        month_view = self.main_view.get_month_view()
207
27
        return datetime.fromtimestamp(month_view.currentMonth)
27
        return month_view.currentMonth.datetime
208
28
28
209
29
    def change_month(self, delta):
29
    def change_month(self, delta):
210
30
        month_view = self.main_view.get_month_view()
30
        month_view = self.main_view.get_month_view()
211
31
31
212
=== modified file 'tests/autopilot/calendar_app/tests/test_weekview.py'
213
--- tests/autopilot/calendar_app/tests/test_weekview.py	2013-10-28 21:08:48 +0000
214
+++ tests/autopilot/calendar_app/tests/test_weekview.py	2013-11-26 03:13:32 +0000
215
@@ -9,13 +9,15 @@
216
9
Calendar app autopilot tests for the week view.
9
Calendar app autopilot tests for the week view.
217
10
"""
10
"""
218
11
11
219
12
import calendar
220
13
import datetime
12
import datetime
221
14
13
222
15
from autopilot.matchers import Eventually
14
from autopilot.matchers import Eventually
223
16
from testtools.matchers import Equals, NotEquals
15
from testtools.matchers import Equals, NotEquals
224
17
16
225
18
from calendar_app.tests import CalendarTestCase
17
from calendar_app.tests import CalendarTestCase
226
18
import logging
227
19
228
20
logger = logging.getLogger(__name__)
229
19
21
230
20
22
231
21
class TestWeekView(CalendarTestCase):
23
class TestWeekView(CalendarTestCase):
232
@@ -30,6 +32,58 @@
233
30
32
234
31
        self.week_view = self.main_view.get_week_view()
33
        self.week_view = self.main_view.get_week_view()
235
32
34
236
35
    def _change_week(self, direction):
237
36
        #TODO: fix this locale issue. The lab needs a monday start date
238
37
        #http://bugs.python.org/issue17659
239
38
        #weekview has firstDate property we can use instead
240
39
        #uses unix timestamp of first day of current week @ 5 am UTC
241
40
242
41
        first_dow = self._get_first_day_of_week()
243
42
244
43
        self.main_view.swipe_view(direction, self.week_view, x_pad=0.15)
245
44
        day_start = self.week_view.dayStart.datetime
246
45
247
46
        expected_day_start = first_dow + datetime.timedelta(
248
47
            days=(7 * direction))
249
48
250
49
        self.assertThat(day_start.day, Equals(expected_day_start.day))
251
50
252
51
    def _get_days_of_week(self):
253
52
        header = self.main_view.select_single(objectName="weekHeader")
254
53
        timeline = header.select_many("TimeLineHeaderComponent")[0]
255
54
        return sorted(timeline.select_many("Label", objectName="dateLabel"),
256
55
                      key=lambda dateLabel: dateLabel.text)
257
56
258
57
    def _get_first_day_of_week(self, lastWeek=False):
259
58
        date = self.week_view.dayStart.datetime
260
59
        firstDay = self.week_view.firstDay.datetime
261
60
        if date.day != firstDay.day:
262
61
            #sunday
263
62
            if firstDay.weekday() == 6:
264
63
                logger.debug("Locale has Sunday as first day of week")
265
64
                weekday = date.weekday()
266
65
                diff = datetime.timedelta(days=weekday + 1)
267
66
            #saturday
268
67
            elif firstDay.weekday() == 5:
269
68
                logger.debug("Locale has Saturday as first day of week")
270
69
                weekday = date.weekday()
271
70
                diff = datetime.timedelta(days=weekday + 2)
272
71
            #monday
273
72
            else:
274
73
                logger.debug("Locale has Monday as first day of week")
275
74
                weekday = date.weekday()
276
75
                if lastWeek:
277
76
                    diff = datetime.timedelta(days=weekday)
278
77
                else:
279
78
                    diff = datetime.timedelta(days=weekday)
280
79
            day_start = date - diff
281
80
            logger.debug("Setting day_start %s, %s, %s, %s, %s" %
282
81
                        (firstDay.day, day_start, date.day, diff, weekday))
283
82
        else:
284
83
            day_start = date
285
84
            logger.debug("Using today as day_start %s" % date)
286
85
        return day_start
287
86
288
33
    def test_current_month_and_year_is_selected(self):
87
    def test_current_month_and_year_is_selected(self):
289
34
        """By default, the week view shows the current month and year."""
88
        """By default, the week view shows the current month and year."""
290
35
89
291
@@ -48,19 +102,17 @@
292
48
        """By default, the week view shows the current week."""
102
        """By default, the week view shows the current week."""
293
49
103
294
50
        now = datetime.datetime.now()
104
        now = datetime.datetime.now()
298
51
        days = self.get_days_of_week()
105
        days = self._get_days_of_week()
299
52
        monday = (now - datetime.timedelta(days=now.weekday())).day
106
300
53
        current_month_days = calendar.monthrange(now.year, now.month)[1]
107
        first_dow = self._get_first_day_of_week(True)
301
54
108
302
55
        for i in xrange(7):
109
        for i in xrange(7):
303
56
            current_day = int(days[i].text)
110
            current_day = int(days[i].text)
311
57
            expected_day = (monday + i) % current_month_days
111
            expected_day = (first_dow + datetime.timedelta(days=i)).day
312
58
112
            logger.debug("current_day %s, expected_day %s" %
313
59
            if (monday + i) == current_month_days:
113
                        (current_day, expected_day))
314
60
                expected_day = current_month_days
114
315
61
115
            #self.assertThat(current_day, Equals(expected_day))
309
62
            self.assertThat(current_day, Equals(expected_day))
310
63
316
64
            color = days[i].color
116
            color = days[i].color
317
65
            # current day is highlighted in white.
117
            # current day is highlighted in white.
318
66
            if(current_day == now.day):
118
            if(current_day == now.day):
319
@@ -69,30 +121,10 @@
320
69
121
321
70
    def test_show_next_weeks(self):
122
    def test_show_next_weeks(self):
322
71
        """It must be possible to show next weeks by swiping the view."""
123
        """It must be possible to show next weeks by swiping the view."""
324
72
        self.change_week(1)
124
        for i in xrange(6):
325
125
            self._change_week(1)
326
73
126
327
74
    def test_show_previous_weeks(self):
127
    def test_show_previous_weeks(self):
328
75
        """It must be possible to show previous weeks by swiping the view."""
128
        """It must be possible to show previous weeks by swiping the view."""
352
76
        self.change_week(-1)
129
        for i in xrange(6):
353
77
130
            self._change_week(-1)
331
78
    def change_week(self, direction):
332
79
        now = datetime.datetime.now()
333
80
        current_day_start = (now - datetime.timedelta(days=now.weekday()))
334
81
335
82
        for i in xrange(1, 5):
336
83
            self.main_view.swipe_view(direction, self.week_view, x_pad=0.15)
337
84
            day_start = datetime.datetime.fromtimestamp(
338
85
                self.week_view.dayStart)
339
86
340
87
            expected_day_start = current_day_start + datetime.timedelta(
341
88
                days=(i * 7 * direction))
342
89
343
90
            expected_day_start = expected_day_start.replace(
344
91
                hour=0, minute=0, second=0, microsecond=0)
345
92
346
93
            self.assertThat(day_start, Equals(expected_day_start))
347
94
348
95
    def get_days_of_week(self):
349
96
        header = self.main_view.select_single(objectName="weekHeader")
350
97
        timeline = header.select_many("TimeLineHeaderComponent")[1]
351
98
        return timeline.select_many("Label", objectName="dateLabel")
354
99
131
355
=== modified file 'tests/autopilot/calendar_app/tests/test_yearview.py'
356
--- tests/autopilot/calendar_app/tests/test_yearview.py	2013-10-28 21:08:48 +0000
357
+++ tests/autopilot/calendar_app/tests/test_yearview.py	2013-11-26 03:13:32 +0000
358
@@ -31,7 +31,10 @@
359
31
    def test_selecting_a_month_switch_to_month_view(self):
31
    def test_selecting_a_month_switch_to_month_view(self):
360
32
        """It must be possible to select a month and open the month view."""
32
        """It must be possible to select a month and open the month view."""
361
33
33
363
34
        months = self.months_from_selected_year()
34
        # TODO: the component indexed at 1 is the one currently displayed,
364
35
        # investigate a way to validate this assumption visually.
365
36
        year_grid = self.year_view.select_many("QQuickGridView")[0]
366
37
        months = year_grid.select_many("MonthComponent")
367
35
        self.assert_current_year_is_default_one(months[0])
38
        self.assert_current_year_is_default_one(months[0])
368
36
39
369
37
        february = months[1]
40
        february = months[1]
370
@@ -45,7 +48,7 @@
371
45
48
372
46
        month_view = self.main_view.get_month_view()
49
        month_view = self.main_view.get_month_view()
373
47
        self.assertThat(month_view.visible, Eventually(Equals(True)))
50
        self.assertThat(month_view.visible, Eventually(Equals(True)))
375
48
        selected_month = month_view.select_many("MonthComponent")[1]
51
        selected_month = month_view.select_many("MonthComponent")[0]
376
49
52
377
50
        self.assertThat(self.main_view.get_year(selected_month),
53
        self.assertThat(self.main_view.get_year(selected_month),
378
51
                        Equals(expected_year))
54
                        Equals(expected_year))
379
@@ -56,19 +59,22 @@
380
56
    def test_current_day_is_selected(self):
59
    def test_current_day_is_selected(self):
381
57
        """The current day must be selected."""
60
        """The current day must be selected."""
382
58
61
385
59
        months = self.months_from_selected_year()
62
        current_month = self.current_month()
384
60
        current_month = months[datetime.now().month - 1]
386
61
        month_grid = current_month.select_single(objectName="monthGrid")
63
        month_grid = current_month.select_single(objectName="monthGrid")
387
62
64
389
63
        current_day_label = month_grid.select_single(
65
        # there could actually be two labels with
390
66
        # the current day: one is the current day of the current month,
391
67
        # the other one is the current day of the previous or next month. Both
392
68
        # shouldn't have the standard white color.
393
69
        current_day_labels = month_grid.select_many(
394
64
            "Label", text=str(datetime.now().day))
70
            "Label", text=str(datetime.now().day))
395
65
71
396
66
        # probably better to check the surrounding UbuntuShape object,
72
        # probably better to check the surrounding UbuntuShape object,
397
67
        # upgrade when python-autopilot 1.4 will be available (get_parent).
73
        # upgrade when python-autopilot 1.4 will be available (get_parent).
402
68
        color = current_day_label.color
74
        for current_day_label in current_day_labels:
403
69
        label_color = (color[0], color[1], color[2], color[3])
75
            color = current_day_label.color
404
70
76
            label_color = (color[0], color[1], color[2], color[3])
405
71
        self.assertThat(label_color, NotEquals((255, 255, 255, 255)))
77
            self.assertThat(label_color, NotEquals((255, 255, 255, 255)))
406
72
78
407
73
    def test_show_next_years(self):
79
    def test_show_next_years(self):
408
74
        """It must be possible to show next years by swiping the view."""
80
        """It must be possible to show next years by swiping the view."""
409
@@ -83,8 +89,7 @@
410
83
89
411
84
        for i in xrange(1, how_many):
90
        for i in xrange(1, how_many):
412
85
            self.main_view.swipe_view(direction, self.year_view, x_pad=0.15)
91
            self.main_view.swipe_view(direction, self.year_view, x_pad=0.15)
415
86
            selected_year = datetime.fromtimestamp(
92
            selected_year = self.year_view.currentYear.year
414
87
                self.year_view.currentYear).year
416
88
93
417
89
            self.assertThat(
94
            self.assertThat(
418
90
                selected_year, Equals(current_year + (i * direction)))
95
                selected_year, Equals(current_year + (i * direction)))
419
@@ -93,9 +98,33 @@
420
93
        self.assertThat(self.main_view.get_year(month_component),
98
        self.assertThat(self.main_view.get_year(month_component),
421
94
                        Equals(datetime.now().year))
99
                        Equals(datetime.now().year))
422
95
100
429
96
    def months_from_selected_year(self):
101
    def current_month(self):
430
97
        # TODO: the component indexed at 1 is the one currently displayed,
102
        now = datetime.now()
431
98
        # investigate a way to validate this assumption visually.
103
        current_month_name = now.strftime("%B")
432
99
104
433
100
        year_grid = self.year_view.select_many("QQuickGridView")[1]
105
        # for months after June, we must scroll down the page to have
434
101
        return year_grid.select_many("MonthComponent")
106
        # the month components loaded in the view.
435
107
        if now.month > 6:
436
108
            self.drag_page_up()
437
109
438
110
        year_grid = self.year_view.select_many("QQuickGridView")[0]
439
111
        months = year_grid.select_many("MonthComponent")
440
112
441
113
        for month in months:
442
114
            current_month_label = month.select_single(
443
115
                "Label", objectName="monthLabel")
444
116
445
117
            if current_month_name == current_month_label.text:
446
118
                return month
447
119
448
120
        return None
449
121
450
122
    def drag_page_up(self):
451
123
        x_line = (self.year_view.globalRect[0] +
452
124
                  self.year_view.globalRect[2] / 2)
453
125
454
126
        y_stop = self.year_view.globalRect[1]
455
127
        y_start = self.year_view.globalRect[3]
456
128
457
129
        self.pointing_device.drag(x_line, y_start, x_line, y_stop)
458
130
        self.pointing_device.drag(x_line, y_start, x_line, y_stop)
Status:	Merged
Approved by:	Nicholas Skaggs on 2013-11-26
Approved revision:	179
Merged at revision:	168
Proposed branch:	lp:~nskaggs/ubuntu-calendar-app/fix-new-event-test
Merge into:	lp:ubuntu-calendar-app
Diff against target:	458 lines (+140/-85) 9 files modified WeekView.qml (+6/-5) debian/control (+1/-1) tests/autopilot/calendar_app/emulators.py (+9/-2) tests/autopilot/calendar_app/tests/__init__.py (+7/-0) tests/autopilot/calendar_app/tests/test_calendar.py (+2/-22) tests/autopilot/calendar_app/tests/test_dayview.py (+1/-2) tests/autopilot/calendar_app/tests/test_monthview.py (+1/-1) tests/autopilot/calendar_app/tests/test_weekview.py (+67/-35) tests/autopilot/calendar_app/tests/test_yearview.py (+46/-17)
To merge this branch:	bzr merge lp:~nskaggs/ubuntu-calendar-app/fix-new-event-test
Related bugs:	Link a bug report
Reviewer	Review Type	Status
Ubuntu Phone Apps Jenkins Bot	continuous-integration	Approve on 2013-11-26
Victor Thompson (community)		Approve on 2013-11-23
Nicholas Skaggs		Pending
Review via email: mp+195421@code.launchpad.net