Merge lp:~canonical-platform-qa/camera-app/fix-1514408-swipe-to-gallery into lp:camera-app

[Richard Huddie]

Fix for https://bugs.launchpad.net/camera-app/+bug/1514408

Use the x, y, width and height properties of main_window, rather than globalRect property which does not exist.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:593
http://jenkins.qa.ubuntu.com/job/camera-app-ci/449/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/145/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/145/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/145/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/299
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/956
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/788
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25037

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/449/rebuild

review: Needs Fixing (continuous-integration)

[Florian Boucault (fboucault)]

Additional tests are failing for similar reasons. I will be providing more fixes ASAP.

[lp:~canonical-platform-qa/camera-app/fix-1514408-swipe-to-gallery]

595. By Richard Huddie on 2015-11-20

Merge additional fixes from lp:~fboucault/camera-app/fix-1514408-swipe-to-gallery

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:594
http://jenkins.qa.ubuntu.com/job/camera-app-ci/467/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/163
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/163
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/163/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/163
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/321
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/982
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/823
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25332

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/467/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'camera-app.qml'
--- camera-app.qml	2015-11-03 14:23:10 +0000
+++ camera-app.qml	2015-11-20 15:11:10 +0000
@@ -73,6 +73,7 @@
 
     Flickable {
         id: viewSwitcher
+        objectName: "viewSwitcher"
         anchors.fill: parent
         flickableDirection: state == "PORTRAIT" ? Flickable.HorizontalFlick : Flickable.VerticalFlick
         boundsBehavior: Flickable.StopAtBounds

=== modified file 'tests/autopilot/camera_app/emulators/main_window.py'
--- tests/autopilot/camera_app/emulators/main_window.py	2015-10-26 15:02:19 +0000
+++ tests/autopilot/camera_app/emulators/main_window.py	2015-11-20 15:11:10 +0000
@@ -24,6 +24,10 @@
         """Returns the root QML Item"""
         return self.app.wait_select_single(objectName="main")
 
+    def get_view_switcher(self):
+        """Returns the switcher Flickable"""
+        return self.app.wait_select_single(objectName="viewSwitcher")
+
     def get_viewfinder(self):
         """Returns the viewfinder view"""
         return self.app.wait_select_single("ViewFinderView")
@@ -136,8 +140,9 @@
             return None
 
     def swipe_to_gallery(self, testCase):
-        main_view = self.get_root()
-        x, y, w, h = main_view.globalRect
+        view_switcher = self.get_view_switcher()
+        x, y = view_switcher.x, view_switcher.y
+        w, h = view_switcher.width, view_switcher.height
 
         tx = x + (w // 2)
         ty = y + (h // 2)
@@ -147,13 +152,14 @@
         testCase.assertThat(viewfinder.inView, Eventually(Equals(False)))
 
     def swipe_to_viewfinder(self, testCase):
-        main_view = self.get_root()
-        x, y, w, h = main_view.globalRect
+        view_switcher = self.get_view_switcher()
+        x, y = view_switcher.x, view_switcher.y
+        w, h = view_switcher.width, view_switcher.height
 
         tx = x + (w // 2)
         ty = y + (h // 2)
 
         self.app.pointing_device.drag(
-            tx, ty, (tx + main_view.width // 2), ty, rate=1)
+            tx, ty, (tx + view_switcher.width // 2), ty, rate=1)
         viewfinder = self.get_viewfinder()
         testCase.assertThat(viewfinder.inView, Eventually(Equals(True)))

=== modified file 'tests/autopilot/camera_app/tests/test_options.py'
--- tests/autopilot/camera_app/tests/test_options.py	2015-04-29 15:56:44 +0000
+++ tests/autopilot/camera_app/tests/test_options.py	2015-11-20 15:11:10 +0000
@@ -33,9 +33,9 @@
         self.assertThat(bottom_edge.opened, Eventually(Equals(True)))
 
         # tap to close overlay
-        root = self.main_window.get_root()
-        x = root.globalRect.x + root.width / 2.0
-        y = root.globalRect.y + root.height / 4.0
+        viewfinder = self.main_window.get_viewfinder()
+        x = viewfinder.globalRect.x + viewfinder.width / 2.0
+        y = viewfinder.globalRect.y + viewfinder.height / 4.0
         self.pointing_device.move(x, y)
         self.pointing_device.click()