Merge lp:~dobey/ubuntuone-credentials/update-13-10 into lp:ubuntuone-credentials/stable-13-10

[dobey]

[Michael McCracken]

    - Hide keyboard when user submits form, making error message visible. (LP: #1231580)
    - Use email-specific keyboard layout and avoid storing passwords in predictive input dictionary. (LP: #1235282)
    - Provide general user-friendly error message for network errors. (LP: #1233951)
    - Delete incomplete account when user uses back button to cancel account creation. (LP: #1234285)
    - Add GUI-level autopilot functional test suite to online-accounts-provider.

[Mike McCracken (mikemc)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-09-16 17:44:17 +0000
+++ CMakeLists.txt	2013-10-04 19:17:45 +0000
@@ -10,7 +10,7 @@
 SET (AUTH_LIB_API_VERSION 2.0)
 SET (AUTH_LIB_NAME ubuntuoneauth-${AUTH_LIB_API_VERSION})
 
-# these names are also used in qml-credentials-service/qmldir, be sure to change them in both places
+# these names are used in qml-credentials-service/qmldir.template
 SET (QML_MODULE_NAME UbuntuOne)
 SET (QML_PLUGIN_API_VERSION 1.0)
 SET (QML_PLUGIN_NAME UbuntuOneCredentialsPlugin-${QML_PLUGIN_API_VERSION})

=== modified file 'libubuntuoneauth/errormessages.h'
--- libubuntuoneauth/errormessages.h	2013-06-14 22:30:19 +0000
+++ libubuntuoneauth/errormessages.h	2013-10-04 19:17:45 +0000
@@ -1,6 +1,9 @@
 #ifndef ERROR_MESSAGES_H
 #define ERROR_MESSAGES_H
 
+
+#define NO_HTTP_REASON "No HTTP error reason"
+
 #define LOGIN_FAILED "LOGIN_FAILED"
 #define CAPTCHA_REQUIRED "CAPTCHA_REQUIRED"
 #define INVALID_CREDENTIALS "INVALID_CREDENTIALS"
@@ -11,7 +14,6 @@
 #define CAN_NOT_RESET_PASSWORD "CAN_NOT_RESET_PASSWORD"
 #define ALREADY_REGISTERED "ALREADY_REGISTERED"
 
-
 enum ErrorCodes
 {
   CODE_LOGIN_FAILED = 0,

=== modified file 'libubuntuoneauth/network.cpp'
--- libubuntuoneauth/network.cpp	2013-07-23 15:47:07 +0000
+++ libubuntuoneauth/network.cpp	2013-10-04 19:17:45 +0000
@@ -28,8 +28,6 @@
 #include "responses.h"
 #include "requests.h"
 
-#define NO_HTTP_REASON QString("No HTTP error reason")
-
 namespace UbuntuOne {
 
 Network::Network(QObject *parent)

=== modified file 'libubuntuoneauth/responses.h'
--- libubuntuoneauth/responses.h	2013-06-14 22:39:59 +0000
+++ libubuntuoneauth/responses.h	2013-10-04 19:17:45 +0000
@@ -131,4 +131,4 @@
 
 } /* end UbuntuOne namespace */
 
-#endif /* _REQUESTS_H_ */
+#endif /* _RESPONSES_H_ */

=== modified file 'online-accounts-provider/ButtonRow.qml'
--- online-accounts-provider/ButtonRow.qml	2013-09-13 18:49:09 +0000
+++ online-accounts-provider/ButtonRow.qml	2013-10-04 19:17:45 +0000
@@ -7,6 +7,7 @@
     spacing: units.gu(1)
     Button {
         id: btnCancel
+        objectName: "cancelButton"
         text: "Cancel"
         color: "#1c091a"
         height: parent.height
@@ -17,6 +18,7 @@
     }
     Button {
         id: btnContinue
+        objectName: "continueButton"
         text: "Continue"
         color: "#cc3300"
         height: parent.height

=== modified file 'online-accounts-provider/CMakeLists.txt'
--- online-accounts-provider/CMakeLists.txt	2013-08-26 19:51:56 +0000
+++ online-accounts-provider/CMakeLists.txt	2013-10-04 19:17:45 +0000
@@ -4,3 +4,5 @@
 set (QML_PLUGIN_INSTALL_DIR share/accounts/qml-plugins/ubuntuone/)
 
 install (FILES ${QML_PLUGIN_FILES} DESTINATION ${QML_PLUGIN_INSTALL_DIR})
+
+add_subdirectory(tests)
\ No newline at end of file

=== modified file 'online-accounts-provider/ExistingAccount.qml'
--- online-accounts-provider/ExistingAccount.qml	2013-09-12 14:59:06 +0000
+++ online-accounts-provider/ExistingAccount.qml	2013-10-04 19:17:45 +0000
@@ -33,6 +33,7 @@
     anchors.right: parent.right
 
     ListItem.SingleValue {
+        objectName: "emailListItem"
         text: "Email"
         value: account.displayName
     }
@@ -45,6 +46,7 @@
 
     ListItem.SingleControl {
         control: Button {
+            objectName: "removeAccountButton"
             text: "Remove account…"
             width: parent.width - units.gu(4)
             onClicked: PopupUtils.open(removalConfirmationComponent);
@@ -64,6 +66,7 @@
 
             Button {
                 text: "Remove"
+                objectName: "confirmRemoveAccountButton"
                 onClicked: {
                     PopupUtils.close(dialog);
                     console.debug("Removing account ID: " + account.accountId);
@@ -76,6 +79,7 @@
 
             Button {
                 text: "Cancel"
+                objectName: "cancelRemoveAccountButton"
                 onClicked: {
                     console.log("User cancelled account removal");
                     PopupUtils.close(dialog);

=== modified file 'online-accounts-provider/LoginForm.qml'
--- online-accounts-provider/LoginForm.qml	2013-09-13 18:31:34 +0000
+++ online-accounts-provider/LoginForm.qml	2013-10-04 19:17:45 +0000
@@ -19,7 +19,7 @@
 
     TextField {
         id: passwordTextField
-
+        objectName: "loginFormPasswordTextField"
         placeholderText: "Your password"
         echoMode: TextInput.Password
         width: main.width - (2 * main.anchors.margins)
@@ -27,6 +27,7 @@
         Keys.onReturnPressed: main.processForm();
         KeyNavigation.tab: twoFactorUI.visible ? twoFactorTextField : emailTextField /* from main */
         KeyNavigation.backtab: emailTextField /* from main */
+        inputMethodHints: Qt.ImhSensitiveData
     }
 
     Label {
@@ -36,6 +37,7 @@
     }
 
     ButtonRow {
+        objectName: "buttonRow-LoginForm-noTwoFactor"
         anchors.left: parent.left
         anchors.right: parent.right
 
@@ -54,6 +56,7 @@
 
         TextField {
             id: twoFactorTextField
+            objectName: "twoFactorTextField"
             placeholderText: "2-factor device code"
             echoMode: TextInput.Password
             width: main.width - (2 * main.anchors.margins)

=== modified file 'online-accounts-provider/Main.qml'
--- online-accounts-provider/Main.qml	2013-09-13 18:31:34 +0000
+++ online-accounts-provider/Main.qml	2013-10-04 19:17:45 +0000
@@ -53,6 +53,17 @@
         }
 
         Connections {
+            target: rootFlickable.parent.parent.tools.back;
+            onTriggered: {
+                console.debug("page back button clicked, deleting incomplete account.");
+                if(account.accountId != 0) {
+                    account.remove(Account.RemoveCredentials);
+                    editPageLoader.item.resetUI();
+                }
+            }
+        }
+
+        Connections {
             target: account
             onSynced: {
                 console.debug("Account id " + account.accountId + " synced. account.displayName: " + account.displayName)
@@ -67,6 +78,7 @@
 
     Rectangle {
         id: loadingOverlay
+        objectName: "loadingOverlay"
         opacity: 0.7
         color: "white"
         visible: false

=== modified file 'online-accounts-provider/NewAccount.qml'
--- online-accounts-provider/NewAccount.qml	2013-09-13 19:28:05 +0000
+++ online-accounts-provider/NewAccount.qml	2013-10-04 19:17:45 +0000
@@ -55,6 +55,7 @@
 
     Label {
         id: errorLabel
+        objectName: "errorLabel"
         text: ""
         font.bold: true
         color: "red"
@@ -75,6 +76,7 @@
 
     TextField {
         id: emailTextField
+        objectName: "emailTextField"
         placeholderText: "Your email"
         width: main.width - (2 * main.anchors.margins)
         anchors.left: parent.left
@@ -83,6 +85,7 @@
         focus: true
         KeyNavigation.tab: loginForm.visible ? loginForm.passwordTextField : registerForm.nameTextField
         KeyNavigation.backtab: loginForm.visible ? ( loginForm.twoFactorVisible ? loginForm.twoFactorTextField : loginForm.passwordTextField) : registerForm.confirmPasswordTextField
+        inputMethodHints: Qt.ImhEmailCharactersOnly
     }
 
     Row {
@@ -93,6 +96,7 @@
 
         Switch {
             id: newUserToggleSwitch
+            objectName: "newUserToggleSwitch"
             checked: false
 
             onCheckedChanged: {
@@ -196,6 +200,7 @@
        immediately.
        */
     function processForm() {
+        Qt.inputMethod.hide();
         loadingOverlay.visible = true;
         formSubmitTimer.running = true;
     }
@@ -249,6 +254,7 @@
     }
 
     function validateInput() {
+        console.debug("in validateInput, emailTextField.text = " + emailTextField.text); 
         formValid = emailTextField.acceptableInput;
         if(!formValid) {
             showError("Please enter a valid email address.");

=== modified file 'online-accounts-provider/RegisterForm.qml'
--- online-accounts-provider/RegisterForm.qml	2013-09-13 18:31:34 +0000
+++ online-accounts-provider/RegisterForm.qml	2013-10-04 19:17:45 +0000
@@ -19,6 +19,7 @@
     
     TextField {
         id: nameTextField
+        objectName: "nameTextField"
         placeholderText: "Your name"
         width: main.width - (2 * main.anchors.margins)
         KeyNavigation.tab: passwordTextField
@@ -27,26 +28,31 @@
 
     TextField {
         id: passwordTextField
+        objectName: "passwordTextField"
         placeholderText: "Password with at least 8 characters"
         echoMode: TextInput.Password
         width: main.width - (2 * main.anchors.margins)
         KeyNavigation.tab: confirmPasswordTextField
         KeyNavigation.backtab: nameTextField
+        inputMethodHints: Qt.ImhSensitiveData
     }
 
     TextField {
         id: confirmPasswordTextField
+        objectName: "confirmPasswordTextField"
         placeholderText: "Re-type password"
         echoMode: TextInput.Password
         width: main.width - (2 * main.anchors.margins)
         KeyNavigation.tab: emailTextField /* from main */
         KeyNavigation.backtab: passwordTextField
+        inputMethodHints: Qt.ImhSensitiveData
     }
 
     Row {
         spacing: units.gu(2)
         CheckBox {
             id: termsAndConditionsCheckBox
+            objectName: "termsAndConditionsCheckBox"
             checked: false
         }
 
@@ -58,6 +64,7 @@
     }
 
     ButtonRow {
+        objectName: "buttonRow-RegisterForm"
         anchors.left: parent.left
         anchors.right: parent.right
     }

=== added directory 'online-accounts-provider/tests'
=== added file 'online-accounts-provider/tests/CMakeLists.txt'
--- online-accounts-provider/tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ online-accounts-provider/tests/CMakeLists.txt	2013-10-04 19:17:45 +0000
@@ -0,0 +1,10 @@
+SET (TESTS_TARGET test-online-accounts-provider)
+
+add_custom_target(online-accounts-provider-autopilot-tests
+    COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/autopilot/run ${CMAKE_CURRENT_BINARY_DIR}
+    DEPENDS ${QML_PLUGIN_NAME}
+)
+
+add_custom_target(online-accounts-provider-qmlunit-tests
+    COMMAND qmltestrunner -input ${CMAKE_CURRENT_SOURCE_DIR}/unit
+)

=== added directory 'online-accounts-provider/tests/autopilot'
=== added file 'online-accounts-provider/tests/autopilot/TestWrapperExisting.qml'
--- online-accounts-provider/tests/autopilot/TestWrapperExisting.qml	1970-01-01 00:00:00 +0000
+++ online-accounts-provider/tests/autopilot/TestWrapperExisting.qml	2013-10-04 19:17:45 +0000
@@ -0,0 +1,42 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.OnlineAccounts 0.1
+import UbuntuOne 1.0
+
+
+MainView {
+
+    objectName: "mainView"
+
+    applicationName: "Ubuntu One UOA Provider Plugin Tester"
+
+    width: units.gu(100)    
+    height: units.gu(100)
+
+    Page {
+        title: "testing"
+        objectName: "testingPage"
+
+        Rectangle {
+            id: fakeAccount
+            objectName: "FakeExistingUOAAccount"
+            property var accountId: 47
+            signal synced
+            
+            property string displayName: "[e-mail]"
+            function remove(){
+            }
+        }
+
+        Loader {
+            id: loader
+            property var account: fakeAccount
+
+            anchors.fill: parent
+
+            source: "../../Main.qml"
+
+        }
+
+    }
+}
\ No newline at end of file

=== added file 'online-accounts-provider/tests/autopilot/TestWrapperNew.qml'
--- online-accounts-provider/tests/autopilot/TestWrapperNew.qml	1970-01-01 00:00:00 +0000
+++ online-accounts-provider/tests/autopilot/TestWrapperNew.qml	2013-10-04 19:17:45 +0000
@@ -0,0 +1,48 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.OnlineAccounts 0.1
+import UbuntuOne 1.0
+
+
+MainView {
+
+    objectName: "mainView"
+
+    applicationName: "Ubuntu One UOA Provider Plugin Tester"
+
+    width: units.gu(100)    
+    height: units.gu(100)
+
+    Page {
+        title: "testing"
+        id: testingPage
+        objectName: "testingPage"
+
+        Rectangle {
+            id: fakeAccount
+            objectName: "FakeNewUOAAccount"
+            property var accountId: 0
+            signal synced
+
+            property string displayName: "" 
+            function sync() {
+            }
+
+            /* fake to avoid creating a UOA account */
+            property var objectHandle: Qt.createQmlObject('import QtQuick 2.0; Rectangle {}',
+                                                         testingPage, 
+                                                         "dynamically-created-fakerect");
+        }
+
+        Loader {
+            id: loader
+            property var account: fakeAccount
+
+            anchors.fill: parent
+
+            source: "../../Main.qml"
+
+        }
+
+    }
+}
\ No newline at end of file

=== added directory 'online-accounts-provider/tests/autopilot/UbuntuOneCredentialsProviderAutopilotTests'
=== added file 'online-accounts-provider/tests/autopilot/UbuntuOneCredentialsProviderAutopilotTests/__init__.py'
--- online-accounts-provider/tests/autopilot/UbuntuOneCredentialsProviderAutopilotTests/__init__.py	1970-01-01 00:00:00 +0000
+++ online-accounts-provider/tests/autopilot/UbuntuOneCredentialsProviderAutopilotTests/__init__.py	2013-10-04 19:17:45 +0000
@@ -0,0 +1,124 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+"""UbuntuOne Credentials Online-Accounts provider plugin autopilot tests."""
+
+from os import remove
+import os.path
+from tempfile import mktemp
+import subprocess
+
+from autopilot.input import Mouse, Touch, Pointer
+from autopilot.matchers import Eventually
+from autopilot.platform import model
+from testtools.matchers import Is, Not, Equals
+from autopilot.testcase import AutopilotTestCase
+
+
+def get_module_include_path():
+    return os.path.abspath(
+        os.path.join(
+            os.path.dirname(__file__),
+            '..',
+            '..',
+            '..',
+            '..',
+            'modules')
+        )
+
+
+class UbuntuTouchAppTestCase(AutopilotTestCase):
+    """Provides several useful methods for the tests."""
+
+    if model() == 'Desktop':
+        scenarios = [
+            ('with mouse', dict(input_device_class=Mouse))
+        ]
+    else:
+        scenarios = [
+            ('with touch', dict(input_device_class=Touch))
+        ]
+
+    @property
+    def main_window(self):
+        return MainWindow(self.app)
+
+    def setUp(self):
+        self.pointing_device = Pointer(self.input_device_class.create())
+        super(UbuntuTouchAppTestCase, self).setUp()
+        self.launch_test_qml()
+
+    def launch_test_qml(self):
+        # If the test class has defined a 'test_qml' class attribute then we
+        # write it to disk and launch it inside the QML Scene. If not, then we
+        # silently do nothing (presumably the test has something else planned).
+        arch = subprocess.check_output(["dpkg-architecture",
+                                        "-qDEB_HOST_MULTIARCH"]).strip()
+
+        if hasattr(self, 'test_qml') and isinstance(self.test_qml, basestring):
+            qml_path = mktemp(suffix='.qml')
+            open(qml_path, 'w').write(self.test_qml)
+            self.addCleanup(remove, qml_path)
+
+            self.app = self.launch_test_application(
+                "/usr/lib/" + arch + "/qt5/bin/qmlscene",
+                "-I", get_module_include_path(),
+                qml_path,
+                app_type='qt')
+
+        if hasattr(self, 'test_qml_file') and isinstance(self.test_qml_file, basestring):
+            qml_path = self.test_qml_file
+            self.app = self.launch_test_application(
+                "/usr/lib/" + arch + "/qt5/bin/qmlscene",
+                "-I", get_module_include_path(),
+                qml_path,
+                app_type='qt')
+
+        self.assertThat(self.get_qml_view().visible, Eventually(Equals(True)))
+
+    def get_qml_view(self):
+        """Get the main QML view"""
+
+        return self.app.select_single("QQuickView")
+
+    def get_mainview(self):
+        """Get the QML MainView"""
+
+        mainView = self.app.select_single("MainView")
+        self.assertThat(mainView, Not(Is(None)))
+        return mainView
+
+    def get_object(self, objectName):
+        """Get a object based on the objectName"""
+
+        obj = self.app.select_single(objectName=objectName)
+        self.assertThat(obj, Not(Is(None)))
+        return obj
+
+    def mouse_click(self, objectName):
+        """Move mouse on top of the object and click on it"""
+
+        obj = self.get_object(objectName)
+        self.pointing_device.move_to_object(obj)
+        self.pointing_device.click()
+
+    def mouse_press(self, objectName):
+        """Move mouse on top of the object and press and hold mouse button"""
+
+        obj = self.get_object(objectName)
+        self.pointing_device.move_to_object(obj)
+        self.pointing_device.press()
+
+    def mouse_release(self):
+        """Release mouse button"""
+
+        self.pointing_device.release()
+
+    def type_string(self, string):
+        """Type a string with keyboard"""
+
+        self.keyboard.type(string)
+
+    def type_key(self, key):
+        """Type a single key with keyboard"""
+
+        self.keyboard.key(key)

=== added directory 'online-accounts-provider/tests/autopilot/UbuntuOneCredentialsProviderAutopilotTests/main'
=== added file 'online-accounts-provider/tests/autopilot/UbuntuOneCredentialsProviderAutopilotTests/main/__init__.py'
--- online-accounts-provider/tests/autopilot/UbuntuOneCredentialsProviderAutopilotTests/main/__init__.py	1970-01-01 00:00:00 +0000
+++ online-accounts-provider/tests/autopilot/UbuntuOneCredentialsProviderAutopilotTests/main/__init__.py	2013-10-04 19:17:45 +0000
@@ -0,0 +1,1 @@
+""" A Generic test suite """

=== added file 'online-accounts-provider/tests/autopilot/UbuntuOneCredentialsProviderAutopilotTests/main/test_main.py'
--- online-accounts-provider/tests/autopilot/UbuntuOneCredentialsProviderAutopilotTests/main/test_main.py	1970-01-01 00:00:00 +0000
+++ online-accounts-provider/tests/autopilot/UbuntuOneCredentialsProviderAutopilotTests/main/test_main.py	2013-10-04 19:17:45 +0000
@@ -0,0 +1,144 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+"""Tests for launching the plugin"""
+
+from autopilot.matchers import Eventually
+from testtools.matchers import Equals
+import os
+from UbuntuOneCredentialsProviderAutopilotTests import UbuntuTouchAppTestCase
+
+
+class NewUOAAccountTests(UbuntuTouchAppTestCase):
+
+    test_qml_path = os.path.join(os.path.dirname(os.path.realpath(__file__)),
+                                 "../../")
+    test_qml_filename = "TestWrapperNew.qml"
+    test_qml_file = os.path.join(test_qml_path, test_qml_filename)
+
+    def setUp(self):
+        super(NewUOAAccountTests, self).setUp()
+        self.uoa_account = self.get_object(objectName="FakeNewUOAAccount")
+
+    def test_select_mainView(self):
+        mainView = self.get_mainview()
+        self.assertThat(mainView.visible, Eventually(Equals(True)))
+
+    def test_loadingOverlay_starts_invisible(self):
+        overlay = self.get_object(objectName="loadingOverlay")
+        self.assertThat(overlay.visible, Eventually(Equals(False)))
+
+    def test_email_field_visible_focused(self):
+        emailTextField = self.get_object(objectName="emailTextField")
+        self.assertThat(emailTextField.visible, Eventually(Equals(True)))
+        self.assertThat(emailTextField.focus, Eventually(Equals(True)))
+
+    def test_login_initial_state(self):
+        passwordTextField = self.get_object("loginFormPasswordTextField")
+        self.assertThat(passwordTextField.visible, Eventually(Equals(True)))
+        twoFactorTextField = self.get_object(objectName="twoFactorTextField")
+        self.assertThat(twoFactorTextField.visible, Eventually(Equals(False)))
+
+    def test_switch_to_newuser(self):
+
+        self.mouse_click(objectName="newUserToggleSwitch")
+
+        passwordField = self.get_object("loginFormPasswordTextField")
+        self.assertThat(passwordField.visible, Eventually(Equals(False)))
+
+        nameTextField = self.get_object("nameTextField")
+        self.assertThat(nameTextField.visible, Eventually(Equals(True)))
+
+    def click_continuebutton_from(self, parentObjectName):
+        parent = self.get_object(parentObjectName)
+        continueButton = parent.select_single(objectName="continueButton")
+        self.pointing_device.move_to_object(continueButton)
+        self.pointing_device.click()
+
+    def test_login_error_on_no_input(self):
+        errorTextField = self.get_object("errorLabel")
+        self.assertThat(errorTextField.visible, Eventually(Equals(False)))
+        self.click_continuebutton_from("buttonRow-LoginForm-noTwoFactor")
+        self.assertThat(errorTextField.visible, Eventually(Equals(True)))
+
+    def test_login_error_on_bad_email(self):
+        errorTextField = self.get_object("errorLabel")
+        self.assertThat(errorTextField.visible, Eventually(Equals(False)))
+        self.mouse_click("emailTextField")
+        self.type_string("this isn't a valid email")
+
+        self.click_continuebutton_from("buttonRow-LoginForm-noTwoFactor")
+        self.assertThat(errorTextField.visible, Eventually(Equals(True)))
+
+    def _setup_newuser_errors(self):
+        self.emailTextField = self.get_object("emailTextField")
+        self.mouse_click("emailTextField")
+        self.type_string("[e-mail]")
+        self.assertThat(self.emailTextField.acceptableInput,
+                        Eventually(Equals(True)))
+        self.errorTextField = self.get_object("errorLabel")
+        self.mouse_click(objectName="newUserToggleSwitch")
+
+    def test_newuser_error_on_no_name(self):
+        self._setup_newuser_errors()
+        self.click_continuebutton_from("buttonRow-RegisterForm")
+        self.assertThat(self.errorTextField.visible, Eventually(Equals(True)))
+
+    def test_newuser_error_on_no_password(self):
+        self._setup_newuser_errors()
+        self.mouse_click("nameTextField")
+        self.type_string("A Name")
+        self.click_continuebutton_from("buttonRow-RegisterForm")
+        self.assertThat(self.errorTextField.visible, Eventually(Equals(True)))
+
+    def test_newuser_error_on_no_password_match(self):
+        self._setup_newuser_errors()
+        self.mouse_click("nameTextField")
+        self.type_string("A Name")
+
+        self.mouse_click("passwordTextField")
+        self.type_string("12345678910111213141516")
+        self.mouse_click("confirmPasswordTextField")
+        self.type_string("123456789ABCDEF")
+        self.mouse_click(objectName="termsAndConditionsCheckBox")
+        self.click_continuebutton_from("buttonRow-RegisterForm")
+        self.assertThat(self.errorTextField.visible, Eventually(Equals(True)))
+
+    def test_newuser_error_on_short_password(self):
+        self._setup_newuser_errors()
+        self.mouse_click("nameTextField")
+        self.type_string("A Name")
+        self.mouse_click("passwordTextField")
+        self.type_string("123")
+        self.mouse_click("confirmPasswordTextField")
+        self.type_string("123")
+        self.mouse_click(objectName="termsAndConditionsCheckBox")
+        self.click_continuebutton_from("buttonRow-RegisterForm")
+        self.assertThat(self.errorTextField.visible, Eventually(Equals(True)))
+
+
+class ExistingUOAAccountTests(UbuntuTouchAppTestCase):
+
+    test_qml_path = os.path.join(os.path.dirname(os.path.realpath(__file__)),
+                                 "../../")
+    test_qml_filename = "TestWrapperExisting.qml"
+    test_qml_file = os.path.join(test_qml_path, test_qml_filename)
+
+    def setUp(self):
+        super(ExistingUOAAccountTests, self).setUp()
+        self.uoa_account = self.get_object(objectName="FakeExistingUOAAccount")
+
+    def test_show_remove_account_dialog(self):
+
+        self.mouse_click(objectName="removeAccountButton")
+
+        confirmRemoveButton = self.get_object("confirmRemoveAccountButton")
+
+        self.assertThat(confirmRemoveButton.visible,
+                        Eventually(Equals(True)))
+
+        self.mouse_click(objectName="cancelRemoveAccountButton")
+
+    def test_shows_expected_email(self):
+        emailListItem = self.get_object("emailListItem")
+        self.assertThat(emailListItem.value,
+                        Eventually(Equals("[e-mail]")))

=== added file 'online-accounts-provider/tests/autopilot/run'
--- online-accounts-provider/tests/autopilot/run	1970-01-01 00:00:00 +0000
+++ online-accounts-provider/tests/autopilot/run	2013-10-04 19:17:45 +0000
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+if [[ -z `which autopilot` ]]; then
+  echo "Autopilot is not installed. Skip"
+  exit
+fi
+
+SCRIPTPATH=`dirname $0`
+pushd ${SCRIPTPATH}
+export QML2_IMPORT_PATH=/usr/lib/i386-linux-gnu/ubuntu-system-settings/private:$1/../../qml-credentials-service
+autopilot run UbuntuOneCredentialsProviderAutopilotTests
+popd

=== modified file 'qml-credentials-service/CMakeLists.txt'
--- qml-credentials-service/CMakeLists.txt	2013-08-21 20:49:46 +0000
+++ qml-credentials-service/CMakeLists.txt	2013-10-04 19:17:45 +0000
@@ -23,3 +23,6 @@
 )
 
 install (CODE "execute_process(COMMAND qmlplugindump ${QML_MODULE_NAME} ${QML_PLUGIN_API_VERSION} ${CMAKE_INSTALL_PREFIX}/${QML_MODULE_INSTALL_DIR} OUTPUT_FILE ${CMAKE_INSTALL_PREFIX}/${QML_MODULE_INSTALL_DIR}/${QML_MODULE_NAME}/${QML_MODULE_NAME}.qmltypes)")
+
+add_custom_command(TARGET ${QML_PLUGIN_NAME} POST_BUILD
+  COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_BINARY_DIR} ${QML_MODULE_NAME})
\ No newline at end of file

=== modified file 'qml-credentials-service/ubuntuone_credentials_service.cpp'
--- qml-credentials-service/ubuntuone_credentials_service.cpp	2013-08-26 18:42:47 +0000
+++ qml-credentials-service/ubuntuone_credentials_service.cpp	2013-10-04 19:17:45 +0000
@@ -1,4 +1,5 @@
 #include "ubuntuone_credentials_service.h"
+#include "errormessages.h"
 #include <QDebug>
 
 UbuntuOneCredentialsService::UbuntuOneCredentialsService(QQuickItem *parent):
@@ -153,5 +154,9 @@
 void UbuntuOneCredentialsService::handleError(const ErrorResponse& error)
 {
     _state = IDLE;
-    emit loginOrRegisterError(error.message());
+    if (error.httpStatus() == 0 || error.httpReason() == NO_HTTP_REASON) {
+        emit loginOrRegisterError("Network error - please retry.");
+    } else {
+        emit loginOrRegisterError(error.message());
+    }
 }