Merge lp:~elopio/ubuntuone-credentials/fix1237112-autopilot_base_test_case into lp:ubuntuone-credentials

[Leo Arias]

Cleaned the autopilot tests.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:73
http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-ci/50/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-saucy-amd64-manual/48

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntuone-credentials-ci/50/rebuild

review: Approve (continuous-integration)

[lp:~elopio/ubuntuone-credentials/fix1237112-autopilot_base_test_case]

74. By Leo Arias on 2013-10-09

Removed the clear parameter.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:74
http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-ci/52/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-saucy-amd64-manual/50

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntuone-credentials-ci/52/rebuild

review: Approve (continuous-integration)

[Mike McCracken (mikemc)]

Just about everything makes sense, nice cleanup.
Tests still pass for me, still test the same things.

Just a couple minor linty issues:

__init__.py:
- line 64 has extraneous whitespace
- line 70: "self.keyboard_" is a strange use of underscore. Is that
intended? also, this seems unused.
-lines 83 & 84: pyflakes complains about the indent here, wants four
more spaces

emulators.py:
- lines 30 and 31 have weird indentation (7 spaces)
- line 37 has trailing whitespace.

test_new_account.py:
- line 107 has extraneous whitespace

I think we need to add ubuntu-ui-toolkit-autopilot to the
build-depends for this project in this branch, too...

review: Needs Fixing

[lp:~elopio/ubuntuone-credentials/fix1237112-autopilot_base_test_case]

75. By Leo Arias on 2013-10-10

Fixed all errors pointed out by mmcc.

[Leo Arias (elopio)]

> - line 70: "self.keyboard_" is a strange use of underscore. Is that
> intended? also, this seems unused.

Right, nice catch :)
I added the _ to check that it was not used anywhere and then forgot to delete it.

> Just a couple minor linty issues:

Sorry about that. We need to add pep8 and pyflakes checks to the jenkins tests. That's an easy thing to do, I'll tell fginther.

> I think we need to add ubuntu-ui-toolkit-autopilot to the
> build-depends for this project in this branch, too...

Yes. Where do I do that? I found no debian folder on this project.

Thanks for the detailed review. It should pass all the lint checks now.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:75
http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-ci/53/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-saucy-amd64-manual/51

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntuone-credentials-ci/53/rebuild

review: Approve (continuous-integration)

[Mike McCracken (mikemc)]

+1, thanks for all the effort in cleaning this up & sharing best practices!

review: Approve

=== renamed file 'online-accounts-provider/tests/autopilot/TestWrapperExisting.qml' => 'online-accounts-provider/tests/autopilot/UbuntuOneCredentialsProviderAutopilotTests/TestWrapperExisting.qml'
--- online-accounts-provider/tests/autopilot/TestWrapperExisting.qml	2013-09-24 20:26:26 +0000
+++ online-accounts-provider/tests/autopilot/UbuntuOneCredentialsProviderAutopilotTests/TestWrapperExisting.qml	2013-10-10 02:40:10 +0000
@@ -34,7 +34,7 @@
 
             anchors.fill: parent
 
-            source: "../../Main.qml"
+            source: "../../../Main.qml"
 
         }
 

=== renamed file 'online-accounts-provider/tests/autopilot/TestWrapperNew.qml' => 'online-accounts-provider/tests/autopilot/UbuntuOneCredentialsProviderAutopilotTests/TestWrapperNew.qml'
--- online-accounts-provider/tests/autopilot/TestWrapperNew.qml	2013-09-24 20:26:26 +0000
+++ online-accounts-provider/tests/autopilot/UbuntuOneCredentialsProviderAutopilotTests/TestWrapperNew.qml	2013-10-10 02:40:10 +0000
@@ -40,7 +40,7 @@
 
             anchors.fill: parent
 
-            source: "../../Main.qml"
+            source: "../../../Main.qml"
 
         }
 

=== modified file 'online-accounts-provider/tests/autopilot/UbuntuOneCredentialsProviderAutopilotTests/__init__.py'
--- online-accounts-provider/tests/autopilot/UbuntuOneCredentialsProviderAutopilotTests/__init__.py	2013-09-24 20:26:26 +0000
+++ online-accounts-provider/tests/autopilot/UbuntuOneCredentialsProviderAutopilotTests/__init__.py	2013-10-10 02:40:10 +0000
@@ -1,124 +1,100 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2013 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
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 """UbuntuOne Credentials Online-Accounts provider plugin autopilot tests."""
 
-from os import remove
-import os.path
-from tempfile import mktemp
+import os
 import subprocess
+import tempfile
 
-from autopilot.input import Mouse, Touch, Pointer
+from autopilot import input
 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():
+from testtools.matchers import Equals
+from ubuntuuitoolkit import (
+    base,
+    emulators as toolkit_emulators,
+)
+
+
+def _get_module_include_path():
+    return _get_path_to_source_root()
+
+
+def _get_path_to_source_root():
     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))
-        ]
+            os.path.dirname(__file__), '..', '..', '..'))
+
+
+def _get_local_desktop_file_directory():
+    return os.path.join(os.environ['HOME'], '.local', 'share', 'applications')
+
+
+def _get_qmlscene_launch_command():
+    """Return the command to launch qmlscene for autopilot tests."""
+    # TODO replace this with the one from the ubuntu-ui-toolkit, that has just
+    # been merged to trunk. --elopio - 2013-10-08
+    arch = subprocess.check_output(
+        ["dpkg-architecture", "-qDEB_HOST_MULTIARCH"]).strip()
+    return '/usr/lib/' + arch + '/qt5/bin/qmlscene'
+
+
+class TestCaseWithQMLWrapper(base.UbuntuUIToolkitAppTestCase):
+
+    _DESKTOP_FILE_CONTENTS = ("""[Desktop Entry]
+Type=Application
+Exec=Not important
+Path=Not important
+Name=Test app
+Icon=Not important
+""")
+
+    test_qml_wrapper_file_name = None
+
+    def setUp(self):
+        super(TestCaseWithQMLWrapper, self).setUp()
+        self.pointing_device = input.Pointer(self.input_device_class.create())
+        self.launch_application()
+
+    def launch_application(self):
+        qml_file_path = os.path.join(
+            os.path.dirname(__file__), self.test_qml_wrapper_file_name)
+        desktop_file_path = self._write_test_desktop_file()
+        self.addCleanup(os.remove, desktop_file_path)
+        self.app = self.launch_test_application(
+            _get_qmlscene_launch_command(),
+            '-I' + _get_module_include_path(),
+            qml_file_path,
+            '--desktop_file_hint={0}'.format(desktop_file_path),
+            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase,
+            app_type='qt')
+
+        self.assertThat(
+            self.main_view.visible, Eventually(Equals(True)))
+
+    def _write_test_desktop_file(self):
+        desktop_file_dir = _get_local_desktop_file_directory()
+        if not os.path.exists(desktop_file_dir):
+            os.makedirs(desktop_file_dir)
+        desktop_file = tempfile.NamedTemporaryFile(
+            suffix='.desktop', dir=desktop_file_dir, delete=False)
+        desktop_file.write(self._DESKTOP_FILE_CONTENTS)
+        desktop_file.close()
+        return desktop_file.name
 
     @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)
+    def main_view(self):
+        return self.app.select_single(toolkit_emulators.MainView)

=== added file 'online-accounts-provider/tests/autopilot/UbuntuOneCredentialsProviderAutopilotTests/emulators.py'
--- online-accounts-provider/tests/autopilot/UbuntuOneCredentialsProviderAutopilotTests/emulators.py	1970-01-01 00:00:00 +0000
+++ online-accounts-provider/tests/autopilot/UbuntuOneCredentialsProviderAutopilotTests/emulators.py	2013-10-10 02:40:10 +0000
@@ -0,0 +1,108 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2013 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
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+from autopilot import input
+
+from ubuntuuitoolkit import emulators as toolkit_emulators
+
+
+class NewAccount(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
+    """New Account Autopilot emulator."""
+
+    def is_error_label_visible(self):
+        error_label = self.select_single(objectName='errorLabel')
+        return error_label.visible
+
+    def log_in(self, email, password):
+        self._fill_log_in(email, password)
+        self._click_continue()
+
+    def _fill_log_in(self, email, password):
+        self._enter_email(email)
+        self._enter_login_password(password)
+
+    def _enter_email(self, email):
+        email_text_field = self.select_single(
+            TextField, objectName='emailTextField')
+        email_text_field.write(email)
+
+    def _enter_login_password(self, password):
+        password_text_field = self.select_single(
+            TextField, objectName='loginFormPasswordTextField')
+        password_text_field.write(password)
+
+    def _click_continue(self):
+        continue_button = self.select_single(
+            objectName='continueButton', visible=True)
+        self.pointing_device.click_object(continue_button)
+
+    def register_new_account(self, email, name, password,
+                             password_confirmation, agree_to_terms):
+        self._switch_to_new_account()
+        self._enter_email(email)
+        self._enter_name(name)
+        self._enter_password_new_user(password)
+        self._enter_password_confirmation(password_confirmation)
+        self._agree_to_terms(agree_to_terms)
+        self._click_continue()
+
+    def _switch_to_new_account(self):
+        new_user_switch = self.select_single(
+            toolkit_emulators.CheckBox, objectName='newUserToggleSwitch')
+        new_user_switch.check()
+
+    def _enter_name(self, name):
+        name_text_field = self.select_single(
+            TextField, objectName='nameTextField')
+        name_text_field.write(name)
+
+    def _enter_password_new_user(self, password):
+        password_text_field = self.select_single(
+            TextField, objectName='passwordTextField')
+        password_text_field.write(password)
+
+    def _enter_password_confirmation(self, password_confirmation):
+        confirm_password_text_field = self.select_single(
+            TextField, objectName='confirmPasswordTextField')
+        confirm_password_text_field.write(password_confirmation)
+
+    def _agree_to_terms(self, agree):
+        terms_and_conditions_check_box = self.select_single(
+            toolkit_emulators.CheckBox,
+            objectName='termsAndConditionsCheckBox')
+        if agree:
+            terms_and_conditions_check_box.check()
+        else:
+            terms_and_conditions_check_box.uncheck()
+
+
+class TextField(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
+    """TextField Autopilot emulator."""
+    # TODO change this to use the text field emulator, once it lands on
+    # ubuntu-ui-toolkit. --elopio - 2013-10-08
+
+    def __init__(self, *args):
+        super(TextField, self).__init__(*args)
+        self.keyboard = input.Keyboard.create()
+
+    def write(self, text):
+        """Write into the text field.
+
+        :parameter text: The text to write.
+
+        """
+        self.pointing_device.click_object(self)
+        self.keyboard.type(text)

=== removed directory 'online-accounts-provider/tests/autopilot/UbuntuOneCredentialsProviderAutopilotTests/main'
=== removed file 'online-accounts-provider/tests/autopilot/UbuntuOneCredentialsProviderAutopilotTests/main/__init__.py'
--- online-accounts-provider/tests/autopilot/UbuntuOneCredentialsProviderAutopilotTests/main/__init__.py	2013-09-24 20:26:26 +0000
+++ online-accounts-provider/tests/autopilot/UbuntuOneCredentialsProviderAutopilotTests/main/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-""" A Generic test suite """

=== added file 'online-accounts-provider/tests/autopilot/UbuntuOneCredentialsProviderAutopilotTests/test_existing_account.py'
--- online-accounts-provider/tests/autopilot/UbuntuOneCredentialsProviderAutopilotTests/test_existing_account.py	1970-01-01 00:00:00 +0000
+++ online-accounts-provider/tests/autopilot/UbuntuOneCredentialsProviderAutopilotTests/test_existing_account.py	2013-10-10 02:40:10 +0000
@@ -0,0 +1,47 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2013 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
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+from autopilot.matchers import Eventually
+from testtools.matchers import Equals
+
+import UbuntuOneCredentialsProviderAutopilotTests
+
+
+class ExistingUOAAccountTests(
+        UbuntuOneCredentialsProviderAutopilotTests.TestCaseWithQMLWrapper):
+
+    test_qml_wrapper_file_name = 'TestWrapperExisting.qml'
+
+    def test_show_remove_account_dialog(self):
+        remove_account_button = self.main_view.select_single(
+            objectName='removeAccountButton')
+        self.pointing_device.click_object(remove_account_button)
+
+        confirm_button = self.main_view.select_single(
+            objectName='confirmRemoveAccountButton')
+
+        self.assertThat(
+            confirm_button.visible, Eventually(Equals(True)))
+
+        cancel_button = self.main_view.select_single(
+            objectName='cancelRemoveAccountButton')
+        self.pointing_device.click_object(cancel_button)
+
+    def test_shows_expected_email(self):
+        email_list_item = self.main_view.select_single(
+            objectName='emailListItem')
+        self.assertThat(
+            email_list_item.value, Eventually(Equals("[e-mail]")))

=== renamed file 'online-accounts-provider/tests/autopilot/UbuntuOneCredentialsProviderAutopilotTests/main/test_main.py' => 'online-accounts-provider/tests/autopilot/UbuntuOneCredentialsProviderAutopilotTests/test_new_account.py'
--- online-accounts-provider/tests/autopilot/UbuntuOneCredentialsProviderAutopilotTests/main/test_main.py	2013-09-24 20:26:26 +0000
+++ online-accounts-provider/tests/autopilot/UbuntuOneCredentialsProviderAutopilotTests/test_new_account.py	2013-10-10 02:40:10 +0000
@@ -1,144 +1,117 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-
-"""Tests for launching the plugin"""
+#
+# Copyright (C) 2013 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
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 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)
+from ubuntuuitoolkit import emulators as toolkit_emulators
+
+import UbuntuOneCredentialsProviderAutopilotTests
+from UbuntuOneCredentialsProviderAutopilotTests import emulators
+
+
+_VALID_NEW_USER = dict(
+    email='[e-mail]', name='Name', password='password',
+    password_confirmation='password', agree_to_terms=True)
+
+
+class NewUbuntuOneOnlineAccountTestCase(
+        UbuntuOneCredentialsProviderAutopilotTests.TestCaseWithQMLWrapper):
+
+    test_qml_wrapper_file_name = 'TestWrapperNew.qml'
 
     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")
+        super(NewUbuntuOneOnlineAccountTestCase, self).setUp()
+        self.new_account = self.main_view.select_single(emulators.NewAccount)
+
+    def test_loading_overlay_starts_invisible(self):
+        overlay = self.main_view.select_single(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)))
+        email_text_field = self.main_view.select_single(
+            objectName='emailTextField')
+        self.assertThat(email_text_field.visible, Eventually(Equals(True)))
+        self.assertThat(email_text_field.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]")))
+        password_text_field = self.main_view.select_single(
+            objectName='loginFormPasswordTextField')
+        self.assertThat(password_text_field.visible, Eventually(Equals(True)))
+        two_factor_text_field = self.main_view.select_single(
+            objectName='twoFactorTextField')
+        self.assertThat(
+            two_factor_text_field.visible, Eventually(Equals(False)))
+
+    def test_switch_to_new_user(self):
+        new_user_switch = self.main_view.select_single(
+            toolkit_emulators.CheckBox, objectName='newUserToggleSwitch')
+        new_user_switch.check()
+
+        password_text_field = self.main_view.select_single(
+            objectName='loginFormPasswordTextField')
+        self.assertThat(password_text_field.visible, Eventually(Equals(False)))
+
+        name_text_field = self.main_view.select_single(
+            objectName='nameTextField')
+        self.assertThat(name_text_field.visible, Eventually(Equals(True)))
+
+    def test_error_label_starts_invisible(self):
+        self.assertThat(
+            self.new_account.is_error_label_visible(),
+            Eventually(Equals(False)))
+
+
+class LogInUbuntuOneOnlineAccountErrorsTestCase(
+        UbuntuOneCredentialsProviderAutopilotTests.TestCaseWithQMLWrapper):
+
+    scenarios = [
+        ('no input', dict(email='', password='')),
+        ('invalid email', dict(email='invalid', password='password'))
+    ]
+
+    test_qml_wrapper_file_name = 'TestWrapperNew.qml'
+
+    def test_log_in_error(self):
+        new_account = self.main_view.select_single(emulators.NewAccount)
+        new_account.log_in(self.email, self.password)
+
+        self.assertThat(
+            new_account.is_error_label_visible(),
+            Eventually(Equals(True)))
+
+
+class NewUbuntuOneOnlineAccountErrorsTestCase(
+        UbuntuOneCredentialsProviderAutopilotTests.TestCaseWithQMLWrapper):
+
+    scenarios = [
+        ('no name', dict(_VALID_NEW_USER, name='')),
+        ('no password', dict(_VALID_NEW_USER, password='')),
+        ('password mismatch', dict(
+            _VALID_NEW_USER, password_confirmation='different password')),
+        ('short password', dict(
+            _VALID_NEW_USER, password='short', password_confirmation='short'))
+    ]
+
+    test_qml_wrapper_file_name = 'TestWrapperNew.qml'
+
+    def test_new_user_error(self):
+        new_account = self.main_view.select_single(emulators.NewAccount)
+        new_account.register_new_account(
+            self.email, self.name, self.password, self.password_confirmation,
+            self.agree_to_terms)
+
+        self.assertThat(
+            new_account.is_error_label_visible(), Eventually(Equals(True)))