Merge lp:~ralsina/ubuntu-sso-client/change-your-mind into lp:ubuntu-sso-client

[Roberto Alsina]

- Added cross-links from/to signing/signup tabs (Fixes LP:974637)

- Added cross-links from/to signing/signup tabs (Fixes LP:974637)

[dobey (dobey)]

+CREATE_ACCOUNT_LABEL = _('Register with Ubuntu One.')

This cannot say "Ubuntu One" here, as this is ubuntu-sso-client. And this is also similar enough to REGISTER_TITLE, that perhaps we should just use it as the label instead? Otherwise, this will need to use the app_name variable, as REGISTER_TITLE does.

review: Needs Fixing

[lp:~ralsina/ubuntu-sso-client/change-your-mind]

999. By Roberto Alsina on 2012-09-05

use app_name

[Roberto Alsina (ralsina)]

> +CREATE_ACCOUNT_LABEL = _('Register with Ubuntu One.')
>
> This cannot say "Ubuntu One" here, as this is ubuntu-sso-client. And this is
> also similar enough to REGISTER_TITLE, that perhaps we should just use it as
> the label instead? Otherwise, this will need to use the app_name variable, as
> REGISTER_TITLE does.

You are correct. Fixed.

[dobey (dobey)]

+ logger.debug('About to emit passwordForgotten signal')

I suppose this also needs to say 'createAccount signal' instead?

[dobey (dobey)]

Also, shouldn't the strings in the .ui files, and the ui.py match? Is there a reason they need to be different?

[lp:~ralsina/ubuntu-sso-client/change-your-mind]

1000. By Roberto Alsina on 2012-09-05

fixed wrong signal name in log and docstring

[Roberto Alsina (ralsina)]

On 09/05/2012 02:33 PM, Rodney Dawes wrote:
> Also, shouldn't the strings in the .ui files, and the ui.py match? Is there a reason they need to be different?

The strings in the .ui files are only there as placeholders, they are
never shown. No need to be different, but I put them there when I didn't
have the real strings ;-)

[lp:~ralsina/ubuntu-sso-client/change-your-mind]

1001. By Roberto Alsina on 2012-09-05

make strings match

[dobey (dobey)]

review: Approve

[lp:~ralsina/ubuntu-sso-client/change-your-mind]

1002. By Roberto Alsina on 2012-09-06

added tests

1003. By Roberto Alsina on 2012-09-06

added tests

1004. By Roberto Alsina on 2012-09-06

lint

[Alejandro J. Cura (alecu)]

Looks good

review: Approve

=== modified file 'data/qt/current_user_sign_in.ui'
--- data/qt/current_user_sign_in.ui	2012-03-05 20:40:24 +0000
+++ data/qt/current_user_sign_in.ui	2012-09-06 15:23:20 +0000
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>302</width>
-    <height>244</height>
+    <height>295</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -18,6 +18,13 @@
     <number>0</number>
    </property>
    <item>
+    <widget class="QLabel" name="create_account_label">
+     <property name="text">
+      <string>Register with {app_name}.</string>
+     </property>
+    </widget>
+   </item>
+   <item>
     <layout class="QVBoxLayout" name="verticalLayout">
      <property name="spacing">
       <number>3</number>
@@ -140,6 +147,7 @@
   <zorder>verticalSpacer</zorder>
   <zorder>forgot_password_label</zorder>
   <zorder></zorder>
+  <zorder>create_account_label</zorder>
  </widget>
  <resources/>
  <connections>

=== modified file 'data/qt/setup_account.ui'
--- data/qt/setup_account.ui	2012-03-20 15:05:19 +0000
+++ data/qt/setup_account.ui	2012-09-06 15:23:20 +0000
@@ -37,7 +37,7 @@
      <property name="verticalSpacing">
       <number>6</number>
      </property>
-     <item row="4" column="0" colspan="2">
+     <item row="5" column="0" colspan="2">
       <spacer name="verticalSpacer_2">
        <property name="orientation">
         <enum>Qt::Vertical</enum>
@@ -50,7 +50,7 @@
        </property>
       </spacer>
      </item>
-     <item row="10" column="0" colspan="2">
+     <item row="11" column="0" colspan="2">
       <spacer name="verticalSpacer_3">
        <property name="orientation">
         <enum>Qt::Vertical</enum>
@@ -63,7 +63,7 @@
        </property>
       </spacer>
      </item>
-     <item row="7" column="0" colspan="2">
+     <item row="8" column="0" colspan="2">
       <spacer name="verticalSpacer_4">
        <property name="orientation">
         <enum>Qt::Vertical</enum>
@@ -76,7 +76,7 @@
        </property>
       </spacer>
      </item>
-     <item row="0" column="0">
+     <item row="1" column="0">
       <layout class="QVBoxLayout" name="verticalLayout_5">
        <property name="spacing">
         <number>3</number>
@@ -85,6 +85,7 @@
         <widget class="QLabel" name="name_label">
          <property name="font">
           <font>
+           <weight>75</weight>
            <bold>true</bold>
           </font>
          </property>
@@ -120,7 +121,7 @@
        </item>
       </layout>
      </item>
-     <item row="2" column="0">
+     <item row="3" column="0">
       <layout class="QVBoxLayout" name="verticalLayout_6">
        <property name="spacing">
         <number>3</number>
@@ -129,6 +130,7 @@
         <widget class="QLabel" name="email_label">
          <property name="font">
           <font>
+           <weight>75</weight>
            <bold>true</bold>
           </font>
          </property>
@@ -167,7 +169,7 @@
        </item>
       </layout>
      </item>
-     <item row="2" column="1">
+     <item row="3" column="1">
       <layout class="QVBoxLayout" name="verticalLayout_8">
        <property name="spacing">
         <number>0</number>
@@ -208,7 +210,7 @@
        </item>
       </layout>
      </item>
-     <item row="3" column="0">
+     <item row="4" column="0">
       <layout class="QVBoxLayout" name="verticalLayout_10">
        <property name="spacing">
         <number>3</number>
@@ -217,6 +219,7 @@
         <widget class="QLabel" name="confirm_email_label">
          <property name="font">
           <font>
+           <weight>75</weight>
            <bold>true</bold>
           </font>
          </property>
@@ -255,7 +258,7 @@
        </item>
       </layout>
      </item>
-     <item row="3" column="1">
+     <item row="4" column="1">
       <layout class="QVBoxLayout" name="verticalLayout_9">
        <property name="spacing">
         <number>0</number>
@@ -299,7 +302,7 @@
        </item>
       </layout>
      </item>
-     <item row="11" column="0" colspan="2">
+     <item row="12" column="0" colspan="2">
       <layout class="QHBoxLayout" name="hlayout_check">
        <property name="spacing">
         <number>6</number>
@@ -309,7 +312,7 @@
        </property>
       </layout>
      </item>
-     <item row="0" column="1">
+     <item row="1" column="1">
       <layout class="QVBoxLayout" name="verticalLayout_7">
        <property name="spacing">
         <number>0</number>
@@ -350,7 +353,7 @@
        </item>
       </layout>
      </item>
-     <item row="5" column="0">
+     <item row="6" column="0">
       <layout class="QVBoxLayout" name="verticalLayout_3">
        <property name="spacing">
         <number>3</number>
@@ -359,6 +362,7 @@
         <widget class="QLabel" name="password_label">
          <property name="font">
           <font>
+           <weight>75</weight>
            <bold>true</bold>
           </font>
          </property>
@@ -406,7 +410,7 @@
        </item>
       </layout>
      </item>
-     <item row="5" column="1" rowspan="2">
+     <item row="6" column="1" rowspan="2">
       <layout class="QHBoxLayout" name="horizontalLayout_3">
        <property name="spacing">
         <number>0</number>
@@ -444,7 +448,7 @@
        </item>
       </layout>
      </item>
-     <item row="6" column="0">
+     <item row="7" column="0">
       <layout class="QVBoxLayout" name="verticalLayout_2">
        <property name="spacing">
         <number>3</number>
@@ -453,6 +457,7 @@
         <widget class="QLabel" name="confirm_password_label">
          <property name="font">
           <font>
+           <weight>75</weight>
            <bold>true</bold>
           </font>
          </property>
@@ -494,7 +499,7 @@
        </item>
       </layout>
      </item>
-     <item row="8" column="0">
+     <item row="9" column="0">
       <layout class="QVBoxLayout" name="verticalLayout_4">
        <property name="spacing">
         <number>3</number>
@@ -569,7 +574,7 @@
        </item>
       </layout>
      </item>
-     <item row="1" column="0" colspan="2">
+     <item row="2" column="0" colspan="2">
       <spacer name="verticalSpacer">
        <property name="orientation">
         <enum>Qt::Vertical</enum>
@@ -582,7 +587,7 @@
        </property>
       </spacer>
      </item>
-     <item row="8" column="1">
+     <item row="9" column="1">
       <layout class="QVBoxLayout" name="verticalLayout_13">
        <property name="rightMargin">
         <number>0</number>
@@ -617,6 +622,13 @@
        </item>
       </layout>
      </item>
+     <item row="0" column="0">
+      <widget class="QLabel" name="sign_in_label">
+       <property name="text">
+        <string>Log-in with my existing account.</string>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
   </layout>

=== modified file 'ubuntu_sso/qt/current_user_sign_in_page.py'
--- ubuntu_sso/qt/current_user_sign_in_page.py	2012-07-03 15:48:59 +0000
+++ ubuntu_sso/qt/current_user_sign_in_page.py	2012-09-06 15:23:20 +0000
@@ -40,6 +40,7 @@
 from ubuntu_sso.utils import compat
 from ubuntu_sso.utils.ui import (
     CANCEL_BUTTON,
+    CREATE_ACCOUNT_LABEL,
     EMAIL_LABEL,
     FORGOTTEN_PASSWORD_BUTTON,
     is_correct_email,
@@ -59,6 +60,7 @@
     ui_class = Ui_CurrentUserSignInPage
     userLoggedIn = QtCore.pyqtSignal(compat.text_type)
     passwordForgotten = QtCore.pyqtSignal()
+    createAccount = QtCore.pyqtSignal()
     userNotValidated = QtCore.pyqtSignal(compat.text_type)
 
     @property
@@ -118,12 +120,17 @@
         forgotten_text = LINK_STYLE.format(link_url='#',
                             link_text=FORGOTTEN_PASSWORD_BUTTON)
         self.ui.forgot_password_label.setText(forgotten_text)
+        account_text = LINK_STYLE.format(link_url='#',
+            link_text=CREATE_ACCOUNT_LABEL % {'app_name': self.app_name})
+        self.ui.create_account_label.setText(account_text)
         self.ui.sign_in_button.setText(SIGN_IN_BUTTON)
 
     def _connect_ui(self):
         """Connect the buttons to perform actions."""
         self.ui.forgot_password_label.linkActivated.connect(
                                                     self.on_forgotten_password)
+        self.ui.create_account_label.linkActivated.connect(
+                                                    self.on_create_account)
         self.ui.email_edit.textChanged.connect(self._validate)
         self.ui.password_edit.textChanged.connect(self._validate)
         self.ui.sign_in_button.clicked.connect(self.login)
@@ -175,3 +182,9 @@
         self.hide_overlay()
         logger.debug('About to emit passwordForgotten signal')
         self.passwordForgotten.emit()
+
+    def on_create_account(self, link=None):
+        """Show the user the account creation page."""
+        self.hide_overlay()
+        logger.debug('About to emit createAccount signal')
+        self.createAccount.emit()

=== modified file 'ubuntu_sso/qt/setup_account_page.py'
--- ubuntu_sso/qt/setup_account_page.py	2012-08-14 16:27:53 +0000
+++ ubuntu_sso/qt/setup_account_page.py	2012-09-06 15:23:20 +0000
@@ -86,6 +86,7 @@
     RETYPE_EMAIL,
     RETYPE_PASSWORD,
     SET_UP_ACCOUNT_BUTTON,
+    SIGN_IN_LABEL,
     TERMS_TEXT,
     REGISTER_TITLE,
 )
@@ -101,6 +102,7 @@
 
     ui_class = Ui_SetUpAccountPage
     userRegistered = QtCore.pyqtSignal(compat.text_type)
+    signIn = QtCore.pyqtSignal()
 
     def __init__(self, *args, **kwargs):
         self.captcha_file = None
@@ -176,6 +178,9 @@
         self.setSubTitle(self.help_text)
 
         self.ui.name_label.setText(NAME_ENTRY)
+        sign_in_link = LINK_STYLE.format(link_url='#',
+            link_text=SIGN_IN_LABEL)
+        self.ui.sign_in_label.setText(sign_in_link)
         self.ui.email_label.setText(EMAIL1_ENTRY)
         self.ui.confirm_email_label.setText(EMAIL2_ENTRY)
         self.ui.password_label.setText(PASSWORD1_ENTRY)
@@ -259,6 +264,7 @@
         self.ui.captcha_solution_edit.textEdited.connect(
             self._enable_setup_button)
         self.terms_checkbox.stateChanged.connect(self._enable_setup_button)
+        self.ui.sign_in_label.linkActivated.connect(self.signIn)
 
         self._refresh_captcha()
 

=== modified file 'ubuntu_sso/qt/tests/test_current_user_sign_in_page.py'
--- ubuntu_sso/qt/tests/test_current_user_sign_in_page.py	2012-07-03 19:13:54 +0000
+++ ubuntu_sso/qt/tests/test_current_user_sign_in_page.py	2012-09-06 15:23:20 +0000
@@ -48,7 +48,8 @@
     """Test the SetupAccountPage code."""
 
     ui_class = gui.CurrentUserSignInPage
-    ui_signals = ('userLoggedIn', 'passwordForgotten', 'userNotValidated')
+    ui_signals = ('userLoggedIn', 'passwordForgotten', 'userNotValidated',
+        'createAccount')
     ui_backend_signals = ('LoggedIn', 'LoginError', 'UserNotValidated')
 
     def test_initialize_page(self):
@@ -86,6 +87,10 @@
         self.assert_subtitle_correct(expected)
         self.assertEqual(compat.text_type(self.ui.ui.email_label.text()),
             gui.EMAIL_LABEL)
+        expected = gui.LINK_STYLE.format(link_url='#',
+            link_text=gui.CREATE_ACCOUNT_LABEL % {'app_name': self.app_name})
+        self.assertEqual(compat.text_type(
+            self.ui.ui.create_account_label.text()), expected)
         self.assertEqual(compat.text_type(self.ui.ui.password_label.text()),
             gui.LOGIN_PASSWORD_LABEL)
         text = gui.LINK_STYLE.format(link_url='#',
@@ -107,6 +112,8 @@
             QtCore.SIGNAL("textChanged(const QString&)")), 1)
         self.assertEqual(self.ui.ui.sign_in_button.receivers(
             QtCore.SIGNAL("clicked()")), 1)
+        self.assertEqual(self.ui.ui.create_account_label.receivers(
+            QtCore.SIGNAL("linkActivated(const QString&)")), 1)
 
     def test_validate_not_valid(self):
         """Test validate method."""
@@ -191,3 +198,13 @@
         """Forgotten passsword clicked emits passwordForgotten signal."""
         self.assert_signal_emitted(self.ui.passwordForgotten, (),
             self.ui.ui.forgot_password_label.linkActivated.emit, "link")
+
+    def test_on_create_account(self):
+        """Test the on_create_account method."""
+        self.assert_signal_emitted(self.ui.createAccount, (),
+            self.ui.on_create_account)
+
+    def test_on_create_account_link_clicked(self):
+        """Create account clicked emits createAccount signal."""
+        self.assert_signal_emitted(self.ui.createAccount, (),
+            self.ui.ui.create_account_label.linkActivated.emit, "link")

=== modified file 'ubuntu_sso/qt/tests/test_setup_account.py'
--- ubuntu_sso/qt/tests/test_setup_account.py	2012-08-14 23:15:15 +0000
+++ ubuntu_sso/qt/tests/test_setup_account.py	2012-09-06 15:23:20 +0000
@@ -41,7 +41,7 @@
     """Test the SetupAccountPage code."""
 
     ui_class = gui.SetupAccountPage
-    ui_signals = ('userRegistered',)
+    ui_signals = ('userRegistered', 'signIn')
     ui_backend_signals = ('CaptchaGenerated', 'CaptchaGenerationError',
                           'UserRegistered', 'UserRegistrationError')
 
@@ -234,6 +234,15 @@
         self.assertEqual(
                 compat.text_type(self.ui.ui.confirm_password_label.text()),
                 gui.RETYPE_PASSWORD)
+        expected = gui.LINK_STYLE.format(link_url='#',
+            link_text=gui.SIGN_IN_LABEL)
+        self.assertEqual(
+                compat.text_type(self.ui.ui.sign_in_label.text()),
+                expected)
+
+        # connections
+        self.assertEqual(self.ui.set_up_button.receivers(
+            QtCore.SIGNAL("clicked(const bool)")), 1)
 
         # assistants
         self.assertFalse(self.ui.ui.name_assistance.isVisible())
@@ -242,6 +251,36 @@
         self.assertFalse(self.ui.ui.password_assistance.isVisible())
         self.assertTrue(self.ui.ui.refresh_label.isVisible())
 
+    def test_connect_ui(self):
+        """Test the connect ui method."""
+        self.assertEqual(self.ui.ui.password_edit.receivers(
+            QtCore.SIGNAL("textEdited(const QString&)")), 2)
+        self.assertEqual(self.ui.ui.refresh_label.receivers(
+            QtCore.SIGNAL("linkActivated(const QString&)")), 2)
+        self.assertEqual(self.ui.ui.name_edit.receivers(
+            QtCore.SIGNAL("textEdited(const QString&)")), 1)
+        self.assertEqual(self.ui.ui.email_edit.receivers(
+            QtCore.SIGNAL("textEdited(const QString&)")), 1)
+        self.assertEqual(self.ui.ui.confirm_email_edit.receivers(
+            QtCore.SIGNAL("textEdited(const QString&)")), 1)
+        self.assertEqual(self.ui.ui.password_edit.receivers(
+            QtCore.SIGNAL("textEdited(const QString&)")), 2)
+        self.assertEqual(self.ui.ui.confirm_password_edit.receivers(
+            QtCore.SIGNAL("textEdited(const QString&)")), 1)
+        self.assertEqual(self.ui.ui.sign_in_label.receivers(
+            QtCore.SIGNAL("linkActivated(const QString&)")), 1)
+
+    def test_connect_ui_2(self):
+        """Test more connections from connect_ui"""
+
+        #
+        self.assertEqual(self.ui.ui.captcha_solution_edit.receivers(
+            QtCore.SIGNAL("textEdited(const QString&)")), 1)
+        self.assertEqual(self.ui.terms_checkbox.receivers(
+            QtCore.SIGNAL("stateChanged(bool)")), 1)
+
+    test_connect_ui_2.skip = "These oscilate 0/1 (LP:1046885)"
+
     def test_set_up_button_clicked(self):
         """Validation and overlay is shown when the setupbutton is clicked."""
         self.patch(self.ui, 'set_next_validation', self._set_called)

=== modified file 'ubuntu_sso/qt/ubuntu_sso_wizard.py'
--- ubuntu_sso/qt/ubuntu_sso_wizard.py	2012-07-03 16:31:45 +0000
+++ ubuntu_sso/qt/ubuntu_sso_wizard.py	2012-09-06 15:23:20 +0000
@@ -96,11 +96,13 @@
         self.addPage(self.network_page)
 
         # set the diff pages of the QWizard
-        if not self.login_only:
-            self.setup_account = SetupAccountPage(**kwargs)
-            self.setup_account.userRegistered.connect(
-                self._move_to_email_verification_page)
-            self.addPage(self.setup_account)
+        self.setup_account = SetupAccountPage(**kwargs)
+        self.setup_account.userRegistered.connect(
+            self._move_to_email_verification_page)
+        # There are no tests for signal connections on
+        # this file (LP:1046886)
+        self.setup_account.signIn.connect(self._move_to_login_page)
+        self.addPage(self.setup_account)
 
         self.current_user = CurrentUserSignInPage(**kwargs)
         self.current_user.userNotValidated.connect(
@@ -108,6 +110,8 @@
         self.current_user.userLoggedIn.connect(self._move_to_success_page)
         self.current_user.passwordForgotten.connect(
             self._move_to_forgotten_page)
+        self.current_user.createAccount.connect(
+            self._move_to_setup_account_page)
         self.addPage(self.current_user)
 
         self.email_verification = EmailVerificationPage(**kwargs)
@@ -144,6 +148,12 @@
         self.setMinimumSize(PREFERED_UI_SIZE['width'],
             PREFERED_UI_SIZE['height'])
 
+        # This is missing tests (LP:1046887)
+        if self.login_only:
+            self._move_to_login_page()
+        else:
+            self._move_to_setup_account_page()
+
     @defer.inlineCallbacks
     def check_network_connection(self):
         """Check if the NetworkDetectionPage is needed to be shown."""
@@ -213,17 +223,15 @@
         """Move to the setup account page wizard."""
         logger.debug('Moving to SetupAccountPage from: %s',
             self.currentPage())
-        self._next_id = self.setup_account_page_id
-        self.next()
-        self._next_id = -1
+        self.setStartId(self.setup_account_page_id)
+        self.restart()
 
     def _move_to_login_page(self):
         """Move to the login page wizard."""
         logger.debug('Moving to CurrentUserSignInPage from: %s',
             self.currentPage())
-        self._next_id = self.current_user_page_id
-        self.next()
-        self._next_id = -1
+        self.setStartId(self.current_user_page_id)
+        self.restart()
 
     def _move_to_success_page(self):
         """Move to the success page wizard."""

=== modified file 'ubuntu_sso/utils/ui.py'
--- ubuntu_sso/utils/ui.py	2012-08-14 16:30:09 +0000
+++ ubuntu_sso/utils/ui.py	2012-09-06 15:23:20 +0000
@@ -64,6 +64,7 @@
 CONGRATULATIONS = _("Congratulations, {app_name} is installed!")
 CONNECT_HELP_LABEL = _('To connect this computer to %(app_name)s enter your '
     'details below.')
+CREATE_ACCOUNT_LABEL = _('Register with {app_name}.')
 EMAIL_LABEL = EMAIL1_ENTRY = _('Email address')
 EMAIL2_ENTRY = _('Re-type Email address')
 EMAIL_INVALID = _('The email must be a valid email address.')
@@ -146,6 +147,7 @@
 SET_UP_ACCOUNT_BUTTON = _('Set Up Account')
 SET_UP_ACCOUNT_CHOICE_BUTTON = _('I don\'t have an account yet - sign me up')
 SIGN_IN_BUTTON = _('Sign In')
+SIGN_IN_LABEL = _('Log-in with my existing account.')
 SSL_APPNAME_HELP = _('the appname whose ssl error we are going to show.')
 SSL_CERT_DETAILS = _('Certificate details')
 SSL_CONNECT_BUTTON = _('Connect')