Merge lp:~diegosarmentero/ubuntuone-windows-installer/setup-buttons into lp:ubuntuone-windows-installer

[Diego Sarmentero]

Modified setup account page to reduce the height size.

Modified setup account page to reduce the height size.

[lp:~diegosarmentero/ubuntuone-windows-installer/setup-buttons]

41. By Diego Sarmentero on 2011-08-30

merge

[Roberto Alsina (ralsina)]

Looks good to me.

review: Approve

[Natalia Bidart (nataliabidart)]

* Please call super() instead of QtGui.QCheckBox.__init__(self).

* Why re you removing the overlay shown when the setup button is clicked?

        self.setup_account.ui.set_up_button.clicked.connect(
            self.overlay.show)

* Since we're building strings with the hope they get translated, we always try to use formatting with keywords. So, instead of this

"By signing up to Ubuntu One you agree to our {0} and {1}"

we should use:

"By signing up to Ubuntu One you agree to our {terms_and_conditions} and {privacy_policy}"

and then call format like this:

terms = TERMS.format(terms_and_conditions=TERMS_LINK,
                     privacy_policy=PRIVACY_POLICY_LINK)
self.terms_checkbox = enhanced_check_box.EnhancedCheckBox(terms)

* Why are you calling

         self.terms_checkbox.setText(
            TERMS.format(TERMS_LINK, PRIVACY_POLICY_LINK)

again in initializePage? The terms legend was set on __init__, is there any specific issue that requires setting the text again?

* In the test_overlay_connection_setup_account, can you call self.ui.set_up_button.clicked.emit(False) instead of self.ui.button(QtGui.QWizard.CustomButton3).clicked.emit(False)?

* If you're patching self.patch(self.ui, 'wizard', FakeWizard) in every test method in SetupAccountTestCase, please add that to the setUp method to avoid duplication.

Great work on the tests for the new widget!

review: Needs Fixing

[lp:~diegosarmentero/ubuntuone-windows-installer/setup-buttons]

42. By Diego Sarmentero on 2011-08-30

Changes from review applied.

[Diego Sarmentero (diegosarmentero)]

> self.setup_account.ui.set_up_button.clicked.connect(
> self.overlay.show)

Because this button doesn't exists anymore, and that signal is being connected on initializePage on SetupAccountPage

> * If you're patching self.patch(self.ui, 'wizard', FakeWizard) in every test
> method in SetupAccountTestCase, please add that to the setUp method to avoid
> duplication.

I don't need that in every tests, just in the ones i added, otherwise if i patch the wizard in the setup cause the other tests to fail.

[Natalia Bidart (nataliabidart)]

> > * If you're patching self.patch(self.ui, 'wizard', FakeWizard) in every test
> > method in SetupAccountTestCase, please add that to the setUp method to avoid
> > duplication.
>
> I don't need that in every tests, just in the ones i added, otherwise if i
> patch the wizard in the setup cause the other tests to fail.

If you need a subset of tests to have a specific setup, then you should unify them in another testcase.

Thanks!

[lp:~diegosarmentero/ubuntuone-windows-installer/setup-buttons]

43. By Diego Sarmentero on 2011-08-30

Added new TestCase.

44. By Diego Sarmentero on 2011-08-30

Removed commented code.

[Natalia Bidart (nataliabidart)]

looks good!

review: Approve

=== modified file 'data/qt/setup_account.ui'
--- data/qt/setup_account.ui	2011-08-25 11:32:23 +0000
+++ data/qt/setup_account.ui	2011-08-30 17:19:25 +0000
@@ -6,14 +6,29 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>575</width>
-    <height>573</height>
+    <width>583</width>
+    <height>538</height>
    </rect>
   </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>16777215</width>
+    <height>16777215</height>
+   </size>
+  </property>
   <property name="windowTitle">
    <string>WizardPage</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>0</number>
+   </property>
    <property name="rightMargin">
     <number>6</number>
    </property>
@@ -309,7 +324,7 @@
        </item>
       </layout>
      </item>
-     <item row="8" column="0">
+     <item row="9" column="0">
       <layout class="QVBoxLayout" name="verticalLayout">
        <property name="spacing">
         <number>3</number>
@@ -389,7 +404,7 @@
        </item>
       </layout>
      </item>
-     <item row="8" column="1">
+     <item row="9" column="1">
       <widget class="QLabel" name="refresh_label">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
@@ -558,56 +573,29 @@
        </property>
       </spacer>
      </item>
+     <item row="8" column="1">
+      <spacer name="verticalSpacer_3">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
     </layout>
    </item>
    <item>
-    <widget class="QCheckBox" name="terms_checkbox">
-     <property name="text">
-      <string>By signing up you agree blah blah</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_4">
+    <layout class="QHBoxLayout" name="hlayout_check">
      <property name="spacing">
       <number>0</number>
      </property>
-     <item>
-      <widget class="QPushButton" name="terms_button">
-       <property name="text">
-        <string>Show terms</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_3">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="set_up_button">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="styleSheet">
-        <string notr="true"/>
-       </property>
-       <property name="text">
-        <string>Set Up Account</string>
-       </property>
-       <property name="DisabledState" stdset="0">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
     </layout>
    </item>
   </layout>

=== added file 'ubuntuone_installer/gui/qt/enhanced_check_box.py'
--- ubuntuone_installer/gui/qt/enhanced_check_box.py	1970-01-01 00:00:00 +0000
+++ ubuntuone_installer/gui/qt/enhanced_check_box.py	2011-08-30 17:19:25 +0000
@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+
+# Authors: Diego Sarmentero <[e-mail]>
+#
+# Copyright 2011 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 warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
+
+"""Customized Check Box to support links."""
+
+from PyQt4 import QtGui
+
+
+class EnhancedCheckBox(QtGui.QCheckBox):
+    """Enhanced QCheckBox to support links in the message displayed."""
+
+    def __init__(self, text=""):
+        QtGui.QCheckBox.__init__(self)
+        hbox = QtGui.QHBoxLayout()
+        self.text_label = QtGui.QLabel(text)
+        self.text_label.setOpenExternalLinks(True)
+        padding = self.iconSize().width()
+        self.text_label.setStyleSheet("padding-left: {0}px;".format(padding))
+        hbox.addWidget(self.text_label)
+        self.setLayout(hbox)
+
+        self.stateChanged.connect(self.text_label.setFocus)
+
+    def text(self):
+        """Return the text of this widget."""
+        return self.text_label.text()
+
+    # Invalid name "setText"
+    # pylint: disable=C0103
+
+    def setText(self, text):
+        """Set a new text to this widget."""
+        self.text_label.setText(text)
+
+    # pylint: enable=C0103

=== modified file 'ubuntuone_installer/gui/qt/gui.py'
--- ubuntuone_installer/gui/qt/gui.py	2011-08-29 12:41:02 +0000
+++ ubuntuone_installer/gui/qt/gui.py	2011-08-30 17:19:25 +0000
@@ -40,7 +40,6 @@
 from ubuntu_sso.qt.email_verification_ui import \
     Ui_EmailVerificationPage
 from ubuntu_sso.qt.error_message_ui import Ui_ErrorPage
-from ubuntu_sso.qt.terms_and_conditions_ui import Ui_TosPage
 from ubuntu_sso.qt.success_message_ui import Ui_SuccessPage
 from ubuntu_sso.qt.forgotten_password_ui import \
     Ui_ForgottenPasswordPage
@@ -52,7 +51,6 @@
     ResetPasswordController,
     SetUpAccountController,
     SuccessController,
-    TosController,
 )
 
 from ubuntuone.controlpanel.gui.qt.loadingoverlay import LoadingOverlay
@@ -80,7 +78,6 @@
 from ubuntuone_installer.gui.qt.sync_now_or_later import SyncNowOrLaterPage
 from ubuntuone_installer.gui.qt.setup_account import SetupAccountPage
 from ubuntuone_installer.gui.qt.side_widget import SideWidget
-from ubuntuone_installer.gui.qt.tos import TosPage
 
 _ = gettext.gettext
 SIGN_IN = _("Sign in to Ubuntu One")
@@ -279,7 +276,7 @@
         super(MainWindow, self).__init__()
 
         self.setWindowTitle(APP_NAME)
-        self.setMinimumHeight(630)
+        self.setMinimumHeight(590)
         self.setMinimumWidth(800)
         self.setWizardStyle(self.ModernStyle)
         self.close_callback = close_callback
@@ -316,14 +313,6 @@
             setup_account_ui.Ui_SetUpAccountPage(),
             self.setup_controller,
             parent=self)
-        self.setup_account.ui.set_up_button.clicked.connect(
-            self.overlay.show)
-
-        title_page = TITLE_STYLE % _("Ubuntu One Terms of Service")
-        self.tos = TosPage(Ui_TosPage(),
-            TosController(tos_url=TC_URL,
-                title=title_page),
-            parent=self)
 
         self.email_verification = EmailVerificationPage(
                                                 Ui_EmailVerificationPage(),
@@ -363,7 +352,6 @@
 
         self.SIGNIN_PAGE = self.addPage(self.sign_in_page)
         self.setup_account_page_id = self.addPage(self.setup_account)
-        self.tos_page_id = self.addPage(self.tos)
         self.email_verification_page_id = self.addPage(self.email_verification)
         self.current_user_page_id = self.addPage(self.current_user)
         self.SUCCESS_PAGE = self.addPage(self.success)

=== modified file 'ubuntuone_installer/gui/qt/setup_account.py'
--- ubuntuone_installer/gui/qt/setup_account.py	2011-08-25 17:07:42 +0000
+++ ubuntuone_installer/gui/qt/setup_account.py	2011-08-30 17:19:25 +0000
@@ -25,6 +25,8 @@
 
 from ubuntu_sso.qt import gui as sso_gui
 
+from ubuntuone_installer.gui.qt import enhanced_check_box
+
 _ = gettext.gettext
 
 # pylint: disable=C0103
@@ -47,11 +49,15 @@
 PASSWORD_MUST_CONTAIN = _("Your password must contain")
 RETYPE_EMAIL = _("Retype email")
 RETYPE_PASSWORD = _("Retype password")
-SHOW_TERMS = _("Show Terms of Service")
-SUBTITLE = _("You only need to set up your account " \
+SUBTITLE = _("You only need to set up your account "
              "once to get access to Ubuntu One across your devices.")
-TERMS = _("By signing up to Ubuntu One you agree to our Terms "
-          "of Service and Privacy Policy")
+TERMS = _("By signing up to Ubuntu One you agree to our "
+          "{terms_and_conditions} and {privacy_policy}")
+TERMS_LINK = _("<a href='https://one.ubuntu.com/terms/'>"
+               "<span style='color:#df2d1f;'>Terms of Service</span></a>")
+PRIVACY_POLICY_LINK = _("<a href='https://one.ubuntu.com/privacy/'>"
+                        "<span style='color:#df2d1f;'>Privacy Policy"
+                        "</span></a></font>")
 TITLE = _("Sign Up to Ubuntu One")
 
 
@@ -62,6 +68,10 @@
         super(SetupAccountPage, self).__init__(*args, **kwargs)
         self.ui.password_edit.textEdited.connect(
             lambda: self.password_assistance(NORMAL))
+        terms = TERMS.format(terms_and_conditions=TERMS_LINK,
+                         privacy_policy=PRIVACY_POLICY_LINK)
+        self.terms_checkbox = enhanced_check_box.EnhancedCheckBox(terms)
+        self.ui.hlayout_check.addWidget(self.terms_checkbox)
 
         # The functions are placed based on the focus order of the widgets.
         self.validation_functions = [
@@ -80,20 +90,28 @@
         title_page = TITLE_STYLE % TITLE
         self.setTitle(title_page)
         self.setSubTitle(SUBTITLE)
+        # Set Setup Account button
+        self.wizard().setOption(QtGui.QWizard.HaveCustomButton3, True)
+        try:
+            self.wizard().customButtonClicked.disconnect()
+        except TypeError:
+            pass
+        self.setButtonText(QtGui.QWizard.CustomButton3, _('Set Up Account'))
+        self.set_up_button = self.wizard().button(QtGui.QWizard.CustomButton3)
+        self.set_up_button.clicked.connect(self.wizard().overlay.show)
 
         self.ui.name_label.setText(NAME)
         self.ui.email_label.setText(EMAIL)
         self.ui.confirm_email_label.setText(RETYPE_EMAIL)
         self.ui.password_label.setText(PASSWORD)
         self.ui.confirm_password_label.setText(RETYPE_PASSWORD)
-        self.ui.terms_checkbox.setText(TERMS)
-        self.ui.terms_button.setText(SHOW_TERMS)
         self.ui.password_info_label.hide()
 
         # Button setup
         self.wizard().setButtonLayout([
             QtGui.QWizard.BackButton,
-            QtGui.QWizard.Stretch])
+            QtGui.QWizard.Stretch,
+            QtGui.QWizard.CustomButton3])
 
         self.password_default_assistance()
         # Hide assistance labels by default
@@ -215,10 +233,10 @@
         """Set set_up_button as default button when the page is shown."""
         # This method should stays here because if we move it to initializePage
         # set_up_button won't take the proper style for hover and press
-        self.ui.set_up_button.setDefault(True)
-        self.ui.set_up_button.setProperty("DisabledState", True)
-        self.ui.set_up_button.style().unpolish(self.ui.set_up_button)
-        self.ui.set_up_button.style().polish(self.ui.set_up_button)
+        self.set_up_button.setDefault(True)
+        self.set_up_button.setProperty("DisabledState", True)
+        self.set_up_button.style().unpolish(self.set_up_button)
+        self.set_up_button.style().polish(self.set_up_button)
         self.connect(QtGui.QApplication.instance(),
             QtCore.SIGNAL("focusChanged(QWidget*, QWidget*)"),
             self.focus_changed)

=== added file 'ubuntuone_installer/gui/qt/tests/test_enhanced_check_box.py'
--- ubuntuone_installer/gui/qt/tests/test_enhanced_check_box.py	1970-01-01 00:00:00 +0000
+++ ubuntuone_installer/gui/qt/tests/test_enhanced_check_box.py	2011-08-30 17:19:25 +0000
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+
+# Authors: Diego Sarmentero <[e-mail]>
+#
+# Copyright 2011 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 warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
+
+"""Tests for the EnhancedCheckBox widget."""
+
+import re
+
+from PyQt4 import QtCore
+
+from ubuntuone_installer.gui.qt import enhanced_check_box
+from ubuntuone_installer.gui.qt.tests import BaseTestCase
+
+
+class EnhancedCheckBoxTestCase(BaseTestCase):
+    """Test the EnhancedCheckBox code."""
+
+    def test_init(self):
+        """Check the initial state of EnhancedCheckBox."""
+        check = enhanced_check_box.EnhancedCheckBox("text")
+        self.assertEqual(check.text(), "text")
+        self.assertTrue(check.text_label.openExternalLinks())
+        style_sheet = unicode(check.text_label.styleSheet())
+        size = re.sub("\D", "", style_sheet)
+        self.assertEqual(check.iconSize().width(), int(size))
+        self.assertEqual(check.receivers(
+            QtCore.SIGNAL('stateChanged(int)')), 1)
+
+    def test_set_text(self):
+        """Check if override setText and text methods works properly."""
+        check = enhanced_check_box.EnhancedCheckBox()
+        self.assertEqual(check.text_label.text(), "")
+        check.setText("text")
+        self.assertEqual(check.text(), "text")
+        self.assertEqual(check.text(), check.text_label.text())

=== modified file 'ubuntuone_installer/gui/qt/tests/test_gui.py'
--- ubuntuone_installer/gui/qt/tests/test_gui.py	2011-08-26 17:25:18 +0000
+++ ubuntuone_installer/gui/qt/tests/test_gui.py	2011-08-30 17:19:25 +0000
@@ -21,7 +21,6 @@
 
 import os
 
-from twisted.internet import defer
 from PyQt4 import QtGui, QtCore
 from ubuntuone.devtools.testcase import skipIfOS
 from ubuntuone.platform.credentials import APP_NAME
@@ -138,7 +137,6 @@
         # Faking each SSO object instead of doing it lower
         # so we don't rely on any SSO behaviour
         self.patch(gui, "SetUpAccountController", FakeController)
-        self.patch(gui, "TosController", FakeController)
         self.patch(gui, "EmailVerificationController", FakeController)
         self.patch(gui, "CurrentUserController", FakeController)
         self.patch(gui, "SuccessController", FakeController)
@@ -151,6 +149,18 @@
         self.patch(qt.folders, "FoldersPanel", FakeFoldersPanel)
         super(MainWindowTestCase, self).setUp()
 
+    def test_initialize_page(self):
+        """Check the initializePage to ensure proper widgets visibility."""
+        setup_page = self.ui.page(self.ui.setup_account_page_id)
+        self.ui.setStartId(self.ui.setup_account_page_id)
+        self.ui.restart()
+        self.ui.show()
+        self.addCleanup(self.ui.hide)
+        self.assertFalse(setup_page.ui.name_assistance.isVisible())
+        self.assertFalse(setup_page.ui.email_assistance.isVisible())
+        self.assertFalse(setup_page.ui.confirm_email_assistance.isVisible())
+        self.assertFalse(setup_page.ui.password_assistance.isVisible())
+
     def test_execute_uninstall_on_licence_cancel(self):
         """Pressing Disagree button from license page the uninstall is exec."""
         self.ui.setStartId(self.ui.LICENSE_PAGE_ID)
@@ -280,11 +290,17 @@
 
     def test_overlay_connection_setup_account(self):
         """Make sure we don't lose connections to the overlay."""
+        # Show the setup account page
+        setup_page = self.ui.page(self.ui.setup_account_page_id)
+        self.ui.setStartId(self.ui.setup_account_page_id)
+        self.ui.restart()
+        self.ui.show()
+        self.addCleanup(self.ui.hide)
         self.assertEqual(self.ui.overlay.show_counter, 0)
         # This test is different from the ones below.
         # For some reason, click() doesn't trigger the connected
         # slot, but clicked.emit() does. The reason is unknown.
-        self.ui.setup_account.ui.set_up_button.clicked.emit(False)
+        setup_page.set_up_button.clicked.emit(False)
         self.assertEqual(self.ui.overlay.show_counter, 1)
 
     def test_overlay_connection_email_verification(self):
@@ -494,51 +510,46 @@
 
     def test_stage_progression_4(self):
         """Check that each page in the wizard sets the correct stage."""
-        self.ui.on_currentIdChanged(self.ui.tos_page_id)
+        self.ui.on_currentIdChanged(self.ui.email_verification_page_id)
         self.assertEqual(self.ui.sideWidget().stage, 1)
 
     def test_stage_progression_5(self):
         """Check that each page in the wizard sets the correct stage."""
-        self.ui.on_currentIdChanged(self.ui.email_verification_page_id)
+        self.ui.on_currentIdChanged(self.ui.current_user_page_id)
         self.assertEqual(self.ui.sideWidget().stage, 1)
 
     def test_stage_progression_6(self):
         """Check that each page in the wizard sets the correct stage."""
-        self.ui.on_currentIdChanged(self.ui.current_user_page_id)
+        self.ui.on_currentIdChanged(self.ui.SUCCESS_PAGE)
         self.assertEqual(self.ui.sideWidget().stage, 1)
 
     def test_stage_progression_7(self):
         """Check that each page in the wizard sets the correct stage."""
-        self.ui.on_currentIdChanged(self.ui.SUCCESS_PAGE)
+        self.ui.on_currentIdChanged(self.ui.ERROR_PAGE)
         self.assertEqual(self.ui.sideWidget().stage, 1)
 
     def test_stage_progression_8(self):
         """Check that each page in the wizard sets the correct stage."""
-        self.ui.on_currentIdChanged(self.ui.ERROR_PAGE)
+        self.ui.on_currentIdChanged(self.ui.forgotten_password_page_id)
         self.assertEqual(self.ui.sideWidget().stage, 1)
 
     def test_stage_progression_9(self):
         """Check that each page in the wizard sets the correct stage."""
-        self.ui.on_currentIdChanged(self.ui.forgotten_password_page_id)
+        self.ui.on_currentIdChanged(self.ui.reset_password_page_id)
         self.assertEqual(self.ui.sideWidget().stage, 1)
 
     def test_stage_progression_10(self):
         """Check that each page in the wizard sets the correct stage."""
-        self.ui.on_currentIdChanged(self.ui.reset_password_page_id)
-        self.assertEqual(self.ui.sideWidget().stage, 1)
+        self.ui.on_currentIdChanged(self.ui.local_folders_page_id)
+        self.assertEqual(self.ui.sideWidget().stage, 3)
 
     def test_stage_progression_11(self):
         """Check that each page in the wizard sets the correct stage."""
-        self.ui.on_currentIdChanged(self.ui.local_folders_page_id)
+        self.ui.on_currentIdChanged(self.ui.SYNC_NOW_OR_LATER_PAGE)
         self.assertEqual(self.ui.sideWidget().stage, 3)
 
     def test_stage_progression_12(self):
         """Check that each page in the wizard sets the correct stage."""
-        self.ui.on_currentIdChanged(self.ui.SYNC_NOW_OR_LATER_PAGE)
-        self.assertEqual(self.ui.sideWidget().stage, 3)
-
-    def test_stage_progression_13(self):
-        """Check that each page in the wizard sets the correct stage."""
         self.ui.on_currentIdChanged(self.ui.CONGRATULATIONS_PAGE)
         self.assertEqual(self.ui.sideWidget().stage, 4)
 

=== modified file 'ubuntuone_installer/gui/qt/tests/test_setup_account.py'
--- ubuntuone_installer/gui/qt/tests/test_setup_account.py	2011-08-25 19:44:35 +0000
+++ ubuntuone_installer/gui/qt/tests/test_setup_account.py	2011-08-30 17:19:25 +0000
@@ -45,6 +45,8 @@
 class FakeWizard(object):
     """Replace wizard() function on wizard pages."""
 
+    customButtonClicked = QtCore.QObject()
+    overlay = None
     params = None
 
     # Invalid name "setButtonLayout"
@@ -56,6 +58,19 @@
 
     # pylint: enable=C0103
 
+    # Invalid name "setOption"
+    # pylint: disable=C0103
+
+    def setOption(self, *args, **kwargs):
+        """Fake the functionality of setOption on QWizard class."""
+        FakeWizard.params = (args, kwargs)
+
+    # pylint: enable=C0103
+
+    def button(self, *args, **kwargs):
+        """Fake the functionality of button on QWizard class."""
+        return QtGui.QPushButton()
+
 
 class FakeValidationDict(object):
     """A Fake dictionary to replace validation_functions on Setup Account."""
@@ -104,20 +119,6 @@
             QtCore.SIGNAL('textEdited(QString)')), 1)
         self.assertTrue(self.ui.validation_functions)
 
-    def test_initialize_page(self):
-        """Check the initializePage to ensure proper widgets visibility."""
-        self.ui.show()
-        self.addCleanup(self.ui.hide)
-        self.patch(self.ui, 'wizard', FakeWizard)
-        self.ui.initializePage()
-        self.assertEqual(FakeWizard.params, (([
-            QtGui.QWizard.BackButton,
-            QtGui.QWizard.Stretch],), {}))
-        self.assertFalse(self.ui.ui.name_assistance.isVisible())
-        self.assertFalse(self.ui.ui.email_assistance.isVisible())
-        self.assertFalse(self.ui.ui.confirm_email_assistance.isVisible())
-        self.assertFalse(self.ui.ui.password_assistance.isVisible())
-
     def test_empty_name(self):
         """Status when the name field is empty.
 
@@ -134,92 +135,6 @@
             setup_account.ERROR % setup_account.EMPTY_NAME)
         self.ui.hide()
 
-    def test_blank_name(self):
-        """Status when the name field is blank (spaces).
-
-        * Name Assistance label visible.
-        * Correct error message in it.
-        """
-        self.ui.ui.name_edit.setText("  ")
-        self.ui.name_assistance()
-        self.ui.show()
-        self.addCleanup(self.ui.hide)
-        self.assertTrue(self.ui.ui.name_assistance.isVisible())
-        self.assertEqual(
-            unicode(self.ui.ui.name_assistance.text()),
-            setup_account.ERROR % setup_account.EMPTY_NAME)
-        self.ui.hide()
-
-    def test_valid_name(self):
-        """Status when the name field is valid.
-
-        * Name Assistance label invisible.
-        """
-        self.ui.ui.name_edit.setText("John Doe")
-        self.ui.name_assistance()
-        self.ui.show()
-        self.addCleanup(self.ui.hide)
-        self.assertFalse(self.ui.ui.name_assistance.isVisible())
-        self.ui.hide()
-
-    def test_invalid_email(self):
-        """Status when the email field has no @.
-
-        * Email Assistance label visible.
-        * Correct error message in it.
-        """
-        self.ui.ui.email_edit.setText("foobar")
-        self.ui.email_assistance()
-        self.ui.show()
-        self.addCleanup(self.ui.hide)
-        self.assertTrue(self.ui.ui.email_assistance.isVisible())
-        self.assertEqual(
-            unicode(self.ui.ui.email_assistance.text()),
-            setup_account.ERROR % setup_account.INVALID_EMAIL)
-        self.ui.hide()
-
-    def test_valid_email(self):
-        """Status when the email field has a @.
-
-        * Email Assistance label invisible.
-        """
-        self.ui.ui.email_edit.setText("foo@bar")
-        self.ui.email_assistance()
-        self.ui.show()
-        self.addCleanup(self.ui.hide)
-        self.assertFalse(self.ui.ui.email_assistance.isVisible())
-        self.ui.hide()
-
-    def test_matching_emails(self):
-        """Status when the email fields match.
-
-        * Email Assistance label invisible.
-        """
-        self.ui.ui.email_edit.setText("foo@bar")
-        self.ui.ui.confirm_email_edit.setText("foo@bar")
-        self.ui.confirm_email_assistance()
-        self.ui.show()
-        self.addCleanup(self.ui.hide)
-        self.assertFalse(self.ui.ui.confirm_email_assistance.isVisible())
-        self.ui.hide()
-
-    def test_not_matching_emails(self):
-        """Status when the email fields don't match.
-
-        * Email Assistance label visible.
-        * Correct error message.
-        """
-        self.ui.ui.email_edit.setText("foo@bar")
-        self.ui.ui.confirm_email_edit.setText("foo@baz")
-        self.ui.confirm_email_assistance()
-        self.ui.show()
-        self.addCleanup(self.ui.hide)
-        self.assertTrue(self.ui.ui.confirm_email_assistance.isVisible())
-        self.assertEqual(
-            unicode(self.ui.ui.confirm_email_assistance.text()),
-            setup_account.ERROR % setup_account.EMAIL_MATCH)
-        self.ui.hide()
-
     def test_short_password(self):
         """Status with short password.
 
@@ -474,6 +389,109 @@
         self.assertTrue(getattr(FakeValidationDict, "valid2"))
         self.assertTrue(getattr(FakeValidationDict, "valid3"))
 
+
+class SetupAccountFakeWizardTestCase(BaseTestCase):
+    """Test the SetupAccountPage code."""
+
+    class_ui = setup_account.SetupAccountPage
+    kwargs = dict(
+        ui=setup_account_ui.Ui_SetUpAccountPage(),
+        controller=FakeController(),
+        parent=None,
+    )
+
+    def setUp(self):
+        """Initialize this test instance."""
+        # Faking each SSO object instead of doing it lower
+        # so we don't rely on any SSO behaviour
+        super(SetupAccountFakeWizardTestCase, self).setUp()
+        self.patch(self.ui, 'wizard', FakeWizard)
+
+    def test_blank_name(self):
+        """Status when the name field is blank (spaces).
+
+        * Name Assistance label visible.
+        * Correct error message in it.
+        """
+        self.ui.ui.name_edit.setText("  ")
+        self.ui.name_assistance()
+        self.ui.show()
+        self.addCleanup(self.ui.hide)
+        self.assertTrue(self.ui.ui.name_assistance.isVisible())
+        self.assertEqual(
+            unicode(self.ui.ui.name_assistance.text()),
+            setup_account.ERROR % setup_account.EMPTY_NAME)
+        self.ui.hide()
+
+    def test_valid_name(self):
+        """Status when the name field is valid.
+
+        * Name Assistance label invisible.
+        """
+        self.ui.ui.name_edit.setText("John Doe")
+        self.ui.name_assistance()
+        self.ui.show()
+        self.addCleanup(self.ui.hide)
+        self.assertFalse(self.ui.ui.name_assistance.isVisible())
+        self.ui.hide()
+
+    def test_invalid_email(self):
+        """Status when the email field has no @.
+
+        * Email Assistance label visible.
+        * Correct error message in it.
+        """
+        self.ui.ui.email_edit.setText("foobar")
+        self.ui.email_assistance()
+        self.ui.show()
+        self.addCleanup(self.ui.hide)
+        self.assertTrue(self.ui.ui.email_assistance.isVisible())
+        self.assertEqual(
+            unicode(self.ui.ui.email_assistance.text()),
+            setup_account.ERROR % setup_account.INVALID_EMAIL)
+
+    def test_valid_email(self):
+        """Status when the email field has a @.
+
+        * Email Assistance label invisible.
+        """
+        self.ui.ui.email_edit.setText("foo@bar")
+        self.ui.email_assistance()
+        self.ui.show()
+        self.addCleanup(self.ui.hide)
+        self.assertFalse(self.ui.ui.email_assistance.isVisible())
+        self.ui.hide()
+
+    def test_matching_emails(self):
+        """Status when the email fields match.
+
+        * Email Assistance label invisible.
+        """
+        self.ui.ui.email_edit.setText("foo@bar")
+        self.ui.ui.confirm_email_edit.setText("foo@bar")
+        self.ui.confirm_email_assistance()
+        self.ui.show()
+        self.addCleanup(self.ui.hide)
+        self.assertFalse(self.ui.ui.confirm_email_assistance.isVisible())
+        self.ui.hide()
+
+    def test_not_matching_emails(self):
+        """Status when the email fields don't match.
+
+        * Email Assistance label visible.
+        * Correct error message.
+        """
+        self.ui.ui.email_edit.setText("foo@bar")
+        self.ui.ui.confirm_email_edit.setText("foo@baz")
+        self.ui.confirm_email_assistance()
+        self.ui.show()
+        self.addCleanup(self.ui.hide)
+        self.assertTrue(self.ui.ui.confirm_email_assistance.isVisible())
+        self.assertEqual(
+            unicode(self.ui.ui.confirm_email_assistance.text()),
+            setup_account.ERROR % setup_account.EMAIL_MATCH)
+        self.ui.hide()
+
     def test_focus_changed_password_visibility(self):
         """Check visibility changes when focus_changed() is executed."""
         self.ui.show()

=== removed file 'ubuntuone_installer/gui/qt/tos.py'
--- ubuntuone_installer/gui/qt/tos.py	2011-07-28 18:24:58 +0000
+++ ubuntuone_installer/gui/qt/tos.py	1970-01-01 00:00:00 +0000
@@ -1,64 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Authors: Roberto Alsina <[e-mail]>
-#
-# Copyright 2011 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 warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
-
-"""Widget to view the Terms Of Service."""
-
-import gettext
-
-from PyQt4 import QtGui
-
-import ubuntu_sso.qt.gui as sso_gui
-
-_ = gettext.gettext
-
-
-class TosPage(sso_gui.TosPage):
-
-    """Page to display the Terms of Service."""
-
-    # initializePage is inherited
-    # pylint: disable=C0103
-    def initializePage(self):
-        """Setup UI details."""
-        # Set the right texts and connections for buttons
-        self.setButtonText(QtGui.QWizard.NextButton, _("Agree && Install"))
-        self.setButtonText(QtGui.QWizard.CancelButton,
-            _("Disagree && Cancel"))
-        self.setButtonText(QtGui.QWizard.CustomButton1, _("&Print"))
-
-        # This is just to catch an exception thrown when nothing
-        # is connected to the signal. It's not an exceptional
-        # condition at all.
-        try:
-            self.wizard().customButtonClicked.disconnect()
-        except TypeError:
-            pass
-
-        self.wizard().customButtonClicked.connect(self.print_document)
-
-        self.wizard().setButtonLayout([
-            QtGui.QWizard.CustomButton1,
-            QtGui.QWizard.BackButton,
-            QtGui.QWizard.Stretch])
-
-    def print_document(self, button_id):
-        """Print the document displayed in textBrowser."""
-        if button_id == QtGui.QWizard.CustomButton1:
-            previewer = QtGui.QPrintPreviewDialog(
-                paintRequested=self.ui.terms_webkit.print_)
-            previewer.exec_()