1
=== modified file 'EventDetails.qml'
2
--- EventDetails.qml	2014-08-14 21:04:56 +0000
3
+++ EventDetails.qml	2014-08-18 18:55:58 +0000
4
@@ -208,6 +208,7 @@
5
208
        ToolbarButton {
208
        ToolbarButton {
6
209
            action:Action {
209
            action:Action {
7
210
                text: i18n.tr("Edit");
210
                text: i18n.tr("Edit");
8
211
		objectName: "edit"
9
211
                iconName: "edit";
212
                iconName: "edit";
10
212
                onTriggered: {
213
                onTriggered: {
11
213
                    if( event.itemType === Type.EventOccurrence ) {
214
                    if( event.itemType === Type.EventOccurrence ) {
12
214
215
13
=== modified file 'TimeLineBaseComponent.qml'
14
--- TimeLineBaseComponent.qml	2014-07-29 21:18:36 +0000
15
+++ TimeLineBaseComponent.qml	2014-08-18 18:55:58 +0000
16
@@ -65,6 +65,7 @@
17
65
65
18
66
    ActivityIndicator {
66
    ActivityIndicator {
19
67
        visible: running
67
        visible: running
20
68
        objectName : "activityIndicator"
21
68
        running: mainModel.isLoading
69
        running: mainModel.isLoading
22
69
        anchors.centerIn: parent
70
        anchors.centerIn: parent
23
70
        z:2
71
        z:2
24
71
72
25
=== modified file 'tests/autopilot/calendar_app/emulators.py'
26
--- tests/autopilot/calendar_app/emulators.py	2014-08-02 19:21:55 +0000
27
+++ tests/autopilot/calendar_app/emulators.py	2014-08-18 18:55:58 +0000
28
@@ -128,6 +128,12 @@
29
128
            parent_object = self
128
            parent_object = self
30
129
        return parent_object.select_single("EventView")
129
        return parent_object.select_single("EventView")
31
130
130
32
131
    def get_event_details(self, parent_object=None):
33
132
        if parent_object is None:
34
133
            parent_object = self
35
134
        return parent_object.select_single(EventDetails,
36
135
                                           objectName='eventDetails')
37
136
38
131
    def get_month_view(self, parent_object=None):
137
    def get_month_view(self, parent_object=None):
39
132
        if parent_object is None:
138
        if parent_object is None:
40
133
            parent_object = self
139
            parent_object = self
41
@@ -295,6 +301,11 @@
42
295
        return self._get_event_bubbles(selected_day)
301
        return self._get_event_bubbles(selected_day)
43
296
302
44
297
    def _get_event_bubbles(self, selected_day):
303
    def _get_event_bubbles(self, selected_day):
45
304
        try:
46
305
            loading_spinner = selected_day.select_single("ActivityIndicator")
47
306
            loading_spinner.running.wait_for(False)
48
307
        except:
49
308
            pass
50
298
        event_bubbles = selected_day.select_many(EventBubble)
309
        event_bubbles = selected_day.select_many(EventBubble)
51
299
        return event_bubbles
310
        return event_bubbles
52
300
311
53
@@ -314,13 +325,7 @@
54
314
        :return: The Event Details page.
325
        :return: The Event Details page.
55
315
326
56
316
        """
327
        """
64
317
        event_bubbles = self._get_selected_day_event_bubbles()
328
        return self.get_event(name).open_event()
58
318
        for bubble in event_bubbles:
59
319
            if bubble.get_name() == name:
60
320
                return bubble.open_event()
61
321
        else:
62
322
            raise CalendarException(
63
323
                'Could not find event with name {}.'.format(name))
65
324
329
66
325
    @autopilot.logging.log_action(logger.info)
330
    @autopilot.logging.log_action(logger.info)
67
326
    def delete_event(self, name):
331
    def delete_event(self, name):
68
@@ -334,6 +339,14 @@
69
334
        return event_details_page.delete()
339
        return event_details_page.delete()
70
335
340
71
336
    @autopilot.logging.log_action(logger.info)
341
    @autopilot.logging.log_action(logger.info)
72
342
    def edit_event(self, name):
73
343
        """Edit an event.
74
344
        :param name:The name of event to edit
75
345
        :return : event details page. """
76
346
        event_details_page = self.open_event(name)
77
347
        return event_details_page.edit()
78
348
79
349
    @autopilot.logging.log_action(logger.info)
80
337
    def get_day_header(self, day=None):
350
    def get_day_header(self, day=None):
81
338
        """Return the dayheader for a given day. If no day is given,
351
        """Return the dayheader for a given day. If no day is given,
82
339
        return the current day.
352
        return the current day.
83
@@ -547,6 +560,18 @@
84
547
560
85
548
        return root.select_single(DayView, objectName='dayViewPage')
561
        return root.select_single(DayView, objectName='dayViewPage')
86
549
562
87
563
    @autopilot.logging.log_action(logger.debug)
88
564
    def edit(self):
89
565
        """Click the Edit button.
90
566
91
567
        :return: The Edit page.
92
568
93
569
        """
94
570
        root = self.get_root_instance()
95
571
        header = root.select_single(MainView).get_header()
96
572
        header.click_action_button('edit')
97
573
        return root.select_single(NewEvent, objectName='newEventPage')
98
574
99
550
    def get_event_information(self):
575
    def get_event_information(self):
100
551
        """Return the information of the event."""
576
        """Return the information of the event."""
101
552
        calendar = self._get_calendar()
577
        calendar = self._get_calendar()
102
553
578
103
=== modified file 'tests/autopilot/calendar_app/tests/test_new_event.py'
104
--- tests/autopilot/calendar_app/tests/test_new_event.py	2014-07-31 19:39:04 +0000
105
+++ tests/autopilot/calendar_app/tests/test_new_event.py	2014-08-18 18:55:58 +0000
106
@@ -67,6 +67,15 @@
107
67
67
108
68
        return day_view, test_event
68
        return day_view, test_event
109
69
69
110
70
    def _edit_event(self, event_name):
111
71
        test_event = data.Event.make_unique()
112
72
        day_view = self.main_view.go_to_day_view()
113
73
114
74
        new_event_page = day_view.edit_event(event_name)
115
75
116
76
        new_event_page.add_event(test_event)
117
77
        return day_view, test_event
118
78
119
70
    def _event_exists(self, event_name):
79
    def _event_exists(self, event_name):
120
71
        try:
80
        try:
121
72
            day_view = self.main_view.go_to_day_view()
81
            day_view = self.main_view.go_to_day_view()
122
@@ -90,9 +99,8 @@
123
90
        """Test adding a new event with the default values.
99
        """Test adding a new event with the default values.
124
91
100
125
92
        The event must be created on the currently selected date,
101
        The event must be created on the currently selected date,
127
93
        with an end time, without recurrence and without reminders.
102
        with an end time, without recurrence and without reminders."""
128
94
103
129
95
        """
130
96
        day_view, test_event = self._add_event()
104
        day_view, test_event = self._add_event()
131
97
105
132
98
        self.addCleanup(self._try_delete_event, test_event.name)
106
        self.addCleanup(self._try_delete_event, test_event.name)
133
@@ -113,5 +121,19 @@
134
113
121
135
114
        self._workaround_bug_1350605()
122
        self._workaround_bug_1350605()
136
115
123
139
116
        self.assertThat(lambda: self._event_exists(test_event.name),
124
        self.assertThat(
140
117
                        Eventually(Equals(False)))
125
            lambda: self._event_exists(
141
126
                test_event.name), Eventually(
142
127
                Equals(False)))
143
128
144
129
    def test_edit_event_with_default_values(self):
145
130
        """Test editing an event change unique values of an event."""
146
131
147
132
        day_view, original_event = self._add_event()
148
133
        day_view, edited_event = self._edit_event(original_event.name)
149
134
        self.addCleanup(self._try_delete_event, edited_event.name)
150
135
151
136
        event_details_page = self.main_view.get_event_details()
152
137
153
138
        self.assertEqual(edited_event,
154
139
                         event_details_page.get_event_information())
Reviewer	Review Type	Date Requested	Status
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2014-08-18
Nicholas Skaggs (community)		2014-08-12	Needs Fixing on 2014-08-13
Review via email: mp+230554@code.launchpad.net