Merge lp:~brendan-donegan/ubuntu-ui-toolkit/swipe_into_view_keyboard into lp:ubuntu-ui-toolkit/staging

[Brendan Donegan]

Account for presence of OSK in Flickable helpers and add a test for the same

When swiping a component into view, the helpers should account for the fact that the keyboard might be on screen - if it is then we should consider the top of the keyboard to be the bottom of the visible screen.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1237
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2237/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/61/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/61/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2237/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1238
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2238/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/62
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/62
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/62/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2238/rebuild

review: Approve (continuous-integration)

[Cris Dywan (kalikiana)]

This must be re-targeted against staging.

[Brendan Donegan (brendan-donegan)]

Apologies, did that now

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1238
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2369/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1097
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1099
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1099/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1096

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2369/rebuild

review: Approve (continuous-integration)

[Zoltan Balogh (bzoltan)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py	2015-02-07 00:32:47 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py	2015-10-08 10:18:25 +0000
@@ -37,6 +37,9 @@
     containers_bottom = [
         container.globalRect.y + container.globalRect.height
         for container in containers if container.globalRect.height > 0]
+    keyboard = _common.get_keyboard()
+    if keyboard._keyboard.is_available():
+        containers_bottom.append(keyboard._keyboard.keyboard.globalRect.y)
     return min(containers_bottom)
 
 

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py	2015-09-22 15:56:35 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py	2015-10-08 10:18:25 +0000
@@ -16,13 +16,19 @@
 
 from unittest import mock
 
+from autopilot.matchers import Eventually
+from autopilot._fixtures import OSKAlwaysEnabled
+from testtools.matchers import Equals
 import testtools
 import ubuntuuitoolkit
 from ubuntuuitoolkit import (
     tests,
     units,
 )
-from ubuntuuitoolkit._custom_proxy_objects import _flickable
+from ubuntuuitoolkit._custom_proxy_objects import (
+    _flickable,
+    _common,
+)
 
 
 class FlickableTestCase(testtools.TestCase):
@@ -127,17 +133,34 @@
             text: 'Top button'
             onClicked: clickedLabel.text = objectName
         }
-        Rectangle {
-            id: emptyRectangle
-            height: units.gu(80)
+        TextField {
+            id: topTextField
+            objectName: 'topTextField'
             anchors.top: topButton.bottom
         }
+        Rectangle {
+            id: emptyRectangle1
+            height: units.gu(40)
+            anchors.top: topTextField.bottom
+        }
+        Button {
+            id: middleButton
+            objectName: 'middleButton'
+            text: 'Middle button'
+            onClicked: clickedLabel.text = objectName
+            anchors.top: emptyRectangle1.bottom
+        }
+        Rectangle {
+            id: emptyRectangle2
+            height: units.gu(40)
+            anchors.top: middleButton.bottom
+        }
         Button {
             id: bottomButton
             objectName: 'bottomButton'
             text: 'Bottom button'
             onClicked: clickedLabel.text = objectName
-            anchors.top: emptyRectangle.bottom
+            anchors.top: emptyRectangle2.bottom
         }
     }
 }
@@ -160,6 +183,19 @@
         self.pointing_device.click_object(button)
         self.assertEqual(self.label.text, 'bottomButton')
 
+    def test_swipe_into_view_behind_keyboard(self):
+        self.main_view.close_toolbar()
+        self.useFixture(OSKAlwaysEnabled())
+        keyboard = _common.get_keyboard()
+        topTextField = self.main_view.select_single(objectName='topTextField')
+        self.pointing_device.click_object(topTextField)
+        self.assertTrue(keyboard._keyboard.wait_for_keyboard_ready(),
+                        'Keyboard not displayed when requested.')
+        button = self.main_view.select_single(objectName='middleButton')
+        button.swipe_into_view()
+        self.pointing_device.click_object(button)
+        self.assertThat(self.label.text, Eventually(Equals('middleButton')))
+
     def test_swipe_into_view_top_element(self):
         self.main_view.close_toolbar()
         bottomButton = self.main_view.select_single(objectName='bottomButton')