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

Proposed by Leo Arias
Status: Merged
Approved by: dobey
Approved revision: 191
Merged at revision: 194
Proposed branch: lp:~canonical-platform-qa/ubuntuone-credentials/workaround1442733-dismiss_osk
Merge into: lp:ubuntuone-credentials
Diff against target: 59 lines (+14/-1)
2 files modified
debian/control (+1/-0)
online-accounts-provider/tests/autopilot/ubuntuone_credentials/__init__.py (+13/-1)
To merge this branch: bzr merge lp:~canonical-platform-qa/ubuntuone-credentials/workaround1442733-dismiss_osk
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
dobey (community) Approve
Review via email: mp+255867@code.launchpad.net

Commit message

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

To post a comment you must log in.
Revision history for this message
dobey (dobey) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Leo Arias (elopio) wrote :

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

Revision history for this message
dobey (dobey) wrote :

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
54 qtdeclarative5-ubuntu-ui-toolkit-plugin | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,54 qtdeclarative5-ubuntu-ui-toolkit-plugin | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
55 qtdeclarative5-ubuntuone1.0,55 qtdeclarative5-ubuntuone1.0,
56 qttestability-autopilot | libautopilot-qt,56 qttestability-autopilot | libautopilot-qt,
57 ubuntu-keyboard-autopilot,
57 ubuntu-ui-toolkit-autopilot,58 ubuntu-ui-toolkit-autopilot,
58 ${misc:Depends},59 ${misc:Depends},
59 ${python:Depends},60 ${python:Depends},
6061
=== 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 @@
1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
2#2#
3# Copyright (C) 2013-2014 Canonical Ltd.3# Copyright (C) 2013-2015 Canonical Ltd.
4#4#
5# This program is free software; you can redistribute it and/or modify5# This program is free software; you can redistribute it and/or modify
6# it under the terms of the GNU General Public License version 3, as published6# it under the terms of the GNU General Public License version 3, as published
@@ -15,6 +15,8 @@
15# along with this program. If not, see <http://www.gnu.org/licenses/>.15# along with this program. If not, see <http://www.gnu.org/licenses/>.
1616
17import ubuntuuitoolkit17import ubuntuuitoolkit
18from autopilot import platform
19from ubuntu_keyboard.emulators import keyboard
1820
1921
20class NewAccount(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):22class NewAccount(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
@@ -75,16 +77,26 @@
75 name_text_field.write(name)77 name_text_field.write(name)
7678
77 def _enter_password_new_user(self, password):79 def _enter_password_new_user(self, password):
80 self._dismiss_on_screen_keyboard()
78 password_text_field = self.select_single(81 password_text_field = self.select_single(
79 ubuntuuitoolkit.TextField, objectName='newPasswordTextField')82 ubuntuuitoolkit.TextField, objectName='newPasswordTextField')
80 password_text_field.write(password)83 password_text_field.write(password)
8184
85 def _dismiss_on_screen_keyboard(self):
86 # XXX instead of dismissing the keyboard, the toolkit should take it
87 # into account when swiping things into view. See bug #1442733.
88 # -- elopio - 2015-02-24
89 if platform.model() != 'Desktop':
90 keyboard.Keyboard().dismiss()
91
82 def _enter_password_confirmation(self, password_confirmation):92 def _enter_password_confirmation(self, password_confirmation):
93 self._dismiss_on_screen_keyboard()
83 confirm_password_text_field = self.select_single(94 confirm_password_text_field = self.select_single(
84 ubuntuuitoolkit.TextField, objectName='confirmPasswordTextField')95 ubuntuuitoolkit.TextField, objectName='confirmPasswordTextField')
85 confirm_password_text_field.write(password_confirmation)96 confirm_password_text_field.write(password_confirmation)
8697
87 def _agree_to_terms(self, agree):98 def _agree_to_terms(self, agree):
99 self._dismiss_on_screen_keyboard()
88 terms_and_conditions_check_box = self.select_single(100 terms_and_conditions_check_box = self.select_single(
89 ubuntuuitoolkit.CheckBox,101 ubuntuuitoolkit.CheckBox,
90 objectName='termsAndConditionsCheckBox')102 objectName='termsAndConditionsCheckBox')

Subscribers

People subscribed via source and target branches