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

[Kunal Parmar]

Bug #1206048 resolved,

Seems line ListItem.SingleControl is changed some how that was affecting layout of button. Now I changed it to ListItem.EmptyItem

Bug #1206048 resolved,

Seems line ListItem.SingleControl is changed some how that was affecting layout of button. Now I changed it to ListItem.EmptyItem

[Olivier Tilloy (osomon)]

Works well.
Note that there is one autopilot test that was commented out because of this broken functionality, so now it ought to be enabled again. You might want to ensure that https://code.launchpad.net/~osomon/ubuntu-calendar-app/refactor-autopilot-tests/+merge/178524 is merged first, as then it will only be a matter of removing the unittest.skip(…) decorator.

review: Needs Fixing

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:81
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/204/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/303
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-ci/153
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-ci/204
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/204
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/153

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/204/rebuild

review: Needs Fixing (continuous-integration)

[Kunal Parmar (pkunal-parmar)]

> Executed test runs:
> UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/303
>
> Click here to trigger a rebuild:
> http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/204/rebuild

Is this related to x server issue,

QXcbConnection: XCB error: 148 (Unknown), sequence: 148, resource id: 0, major code: 140 (Unknown), minor code: 20
}}}
,

it seems test case are not running at all

Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/calendar_app/tests/test_monthview.py", line 26, in setUp
    self.ubuntusdk.get_qml_view().visible, Eventually(Equals(True)))
MismatchError: After 10.0 seconds test on QQuickView.visible failed: True != dbus.Boolean(False, variant_level=1)

[Olivier Tilloy (osomon)]

Yes, it looks like there are issues with this jenkins instance, I’ve pinged Francis about it, hopefully this will be resolved today.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:81
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/208/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/307
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-ci/157
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-ci/208
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/208
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/157

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/208/rebuild

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

> Works well.
> Note that there is one autopilot test that was commented out because of this
> broken functionality, so now it ought to be enabled again. You might want to
> ensure that https://code.launchpad.net/~osomon/ubuntu-calendar-app/refactor-
> autopilot-tests/+merge/178524 is merged first, as then it will only be a
> matter of removing the unittest.skip(…) decorator.

The MR I was mentioning has been merged now, so you can re-enable the skipped autopilot test by simply removing the skip decorator.

[Kunal Parmar (pkunal-parmar)]

>
> The MR I was mentioning has been merged now, so you can re-enable the skipped
> autopilot test by simply removing the skip decorator.

Unfortunately that test case is broken now, Now in EventView instead of text field we are using time picker for entering time.
So to enable that test case we need some changes to handle time picker properly.

[Olivier Tilloy (osomon)]

> >
> > The MR I was mentioning has been merged now, so you can re-enable the
> skipped
> > autopilot test by simply removing the skip decorator.
>
> Unfortunately that test case is broken now, Now in EventView instead of text
> field we are using time picker for entering time.
> So to enable that test case we need some changes to handle time picker
> properly.

Ok, so let’s keep it skipped for the moment, and let’s fix it in a separate branch.

review: Approve

=== modified file 'NewEvent.qml'
--- NewEvent.qml	2013-07-19 16:15:27 +0000
+++ NewEvent.qml	2013-08-03 05:38:25 +0000
@@ -160,7 +160,7 @@
             }
         }
 
-        ListItem.SingleControl {
+        ListItem.Empty {
             highlightWhenPressed: false
             Dialog {
                 id: errorPopupDialog
@@ -171,7 +171,7 @@
                     onClicked: PopupUtils.close(errorPopupDialog)
                 }
             }
-            control: Button {
+            Button {
                 objectName: "eventSaveButton"
                 text: i18n.tr("Save")
                 anchors {