Merge lp:~pkunal-parmar/ubuntu-calendar-app/CalendarIcon into lp:ubuntu-calendar-app

Proposed by Kunal Parmar
Status: Merged
Approved by: Kunal Parmar
Approved revision: 617
Merged at revision: 623
Proposed branch: lp:~pkunal-parmar/ubuntu-calendar-app/CalendarIcon
Merge into: lp:ubuntu-calendar-app
Diff against target: 24 lines (+2/-2)
2 files modified
EventActions.qml (+1/-1)
tests/autopilot/calendar_app/tests/test_weekview.py (+1/-1)
To merge this branch: bzr merge lp:~pkunal-parmar/ubuntu-calendar-app/CalendarIcon
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Alan Pope 🍺🐧🐱 πŸ¦„ (community) Approve
Review via email: mp+254178@code.launchpad.net

Commit message

Resolves Bug #1432616,
[Calendar] Calendars icon should be different

Description of the change

Resolves Bug #1432616,
[Calendar] Calendars icon should be different

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Alan Pope 🍺🐧🐱 πŸ¦„ (popey) wrote :

LGTM

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
617. By Kunal Parmar

ap fix

Revision history for this message
Kunal Parmar (pkunal-parmar) wrote :

> FAILED: Autolanding.
> More details in the following jenkins job:
> http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/481/
> Executed test runs:
> UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2482
> deb: http://91.189.93.70:8080/job/generic-mediumtests-
> utopic/2482/artifact/work/output/*zip*/output.zip
> SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-
> amd64-autolanding/266
> SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-
> amd64-autolanding/53

There was issue with AP, instead of fistday of week, AP was using dayStart with mean currentDay or today.

So result was wrong.

Now it should work as expected.

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Kunal Parmar (pkunal-parmar) wrote :

Now that Jenkins is passing, I am top approving it.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'EventActions.qml'
2--- EventActions.qml 2015-02-18 19:27:20 +0000
3+++ EventActions.qml 2015-04-05 03:54:05 +0000
4@@ -55,7 +55,7 @@
5
6 Action{
7 id: _showCalendarAction
8- iconName: "new-event"
9+ iconName: "calendar"
10 text: i18n.tr("Calendars")
11 onTriggered: {
12 pageStack.push(Qt.resolvedUrl("CalendarChoicePopup.qml"),{"model":eventModel});
13
14=== modified file 'tests/autopilot/calendar_app/tests/test_weekview.py'
15--- tests/autopilot/calendar_app/tests/test_weekview.py 2015-02-26 16:29:18 +0000
16+++ tests/autopilot/calendar_app/tests/test_weekview.py 2015-04-05 03:54:05 +0000
17@@ -101,7 +101,7 @@
18 days = self.week_view.get_days_of_week()
19 day_to_select = self.app.main_view.get_label_with_text(days[0])
20 expected_day = days[0]
21- dayStart = self.week_view.dayStart
22+ dayStart = self.week_view.firstDay
23 expected_month = dayStart.month
24 expected_year = dayStart.year
25

Subscribers

People subscribed via source and target branches

to status/vote changes: