Merge lp:~canonical-platform-qa/ubuntuone-credentials/workaround1442733-dismiss_osk into lp:ubuntuone-credentials

[Leo Arias]

On autopilot helpers, dismiss the on-screen keyboard when filling the new account form. Workaround for bug #1442733.

[dobey (dobey)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:191
http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-ci/123/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-vivid-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-vivid-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-vivid-armhf-ci/11/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-vivid-i386-ci/11

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntuone-credentials-ci/123/rebuild

review: Approve (continuous-integration)

[Leo Arias (elopio)]

how do we land this dobey? Doesn't it need to be top-approved?

[dobey (dobey)]

As Vivid is in Final Freeze now, it will have to wait until next week to land, after we get branches sorted out for dealing with landing things in W and whatever stable branches we'll have. Since much of CI are at the physical UE sprint this week, we're waiting until Monday to deal with getting our branch arrangement settled for moving forward. It is on my radar though, so as soon as we get that worked out and everything set up, I'll land this in the appropriate place. Thanks.

=== modified file 'debian/control'
--- debian/control	2015-04-01 17:53:54 +0000
+++ debian/control	2015-04-10 17:31:34 +0000
@@ -54,6 +54,7 @@
  qtdeclarative5-ubuntu-ui-toolkit-plugin | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
  qtdeclarative5-ubuntuone1.0,
  qttestability-autopilot | libautopilot-qt,
+ ubuntu-keyboard-autopilot,
  ubuntu-ui-toolkit-autopilot,
  ${misc:Depends},
  ${python:Depends},

=== modified file 'online-accounts-provider/tests/autopilot/ubuntuone_credentials/__init__.py'
--- online-accounts-provider/tests/autopilot/ubuntuone_credentials/__init__.py	2014-07-28 22:31:24 +0000
+++ online-accounts-provider/tests/autopilot/ubuntuone_credentials/__init__.py	2015-04-10 17:31:34 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2013-2014 Canonical Ltd.
+# Copyright (C) 2013-2015 Canonical Ltd.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3, as published
@@ -15,6 +15,8 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 import ubuntuuitoolkit
+from autopilot import platform
+from ubuntu_keyboard.emulators import keyboard
 
 
 class NewAccount(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
@@ -75,16 +77,26 @@
         name_text_field.write(name)
 
     def _enter_password_new_user(self, password):
+        self._dismiss_on_screen_keyboard()
         password_text_field = self.select_single(
             ubuntuuitoolkit.TextField, objectName='newPasswordTextField')
         password_text_field.write(password)
 
+    def _dismiss_on_screen_keyboard(self):
+        # XXX instead of dismissing the keyboard, the toolkit should take it
+        # into account when swiping things into view. See bug #1442733.
+        # -- elopio - 2015-02-24
+        if platform.model() != 'Desktop':
+            keyboard.Keyboard().dismiss()
+
     def _enter_password_confirmation(self, password_confirmation):
+        self._dismiss_on_screen_keyboard()
         confirm_password_text_field = self.select_single(
             ubuntuuitoolkit.TextField, objectName='confirmPasswordTextField')
         confirm_password_text_field.write(password_confirmation)
 
     def _agree_to_terms(self, agree):
+        self._dismiss_on_screen_keyboard()
         terms_and_conditions_check_box = self.select_single(
             ubuntuuitoolkit.CheckBox,
             objectName='termsAndConditionsCheckBox')