Merge lp:~nataliabidart/ubuntu/maverick/ubuntu-sso-client/ubuntu-sso-client-1.0.9 into lp:ubuntu/maverick-proposed/ubuntu-sso-client

[Natalia Bidart]

  * New upstream release:
    [ Natalia B. Bidart <email address hidden> ]
      - Register now uses the 'displayname' field to pass it on to SSO as display name (LP: #709494).

=== modified file 'PKG-INFO'
--- PKG-INFO	2010-12-16 13:19:01 +0000
+++ PKG-INFO	2011-04-12 19:05:52 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: ubuntu-sso-client
-Version: 1.0.8
+Version: 1.0.9
 Summary: Ubuntu Single Sign-On client
 Home-page: https://launchpad.net/ubuntu-sso-client
 Author: Natalia Bidart
 
=== modified file 'data/ui.glade'
--- data/ui.glade	2010-08-27 22:16:40 +0000
+++ data/ui.glade	2011-04-12 19:05:52 +0000
@@ -264,36 +264,62 @@
       </packing>
     </child>
     <child>
-      <object class="GtkHButtonBox" id="hbuttonbox1">
+      <object class="GtkHBox" id="hbox2">
         <property name="visible">True</property>
-        <property name="spacing">5</property>
-        <property name="layout_style">end</property>
         <child>
-          <object class="GtkButton" id="join_cancel_button">
-            <property name="label">gtk-cancel</property>
+          <object class="GtkLinkButton" id="login_button">
+            <property name="label">login button</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
-            <property name="use_stock">True</property>
+            <property name="relief">none</property>
+            <signal name="clicked" handler="on_sign_in_button_clicked" swapped="no"/>
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="fill">False</property>
+            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
-          <object class="GtkButton" id="join_ok_button">
-            <property name="label">gtk-go-forward</property>
+          <object class="GtkHButtonBox" id="hbuttonbox1">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="use_stock">True</property>
-            <signal name="clicked" handler="on_join_ok_button_clicked"/>
+            <property name="can_focus">False</property>
+            <property name="spacing">5</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="join_cancel_button">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="join_ok_button">
+                <property name="label">gtk-go-forward</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+                <signal name="clicked" handler="on_join_ok_button_clicked" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="fill">False</property>
+            <property name="pack_type">end</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -303,24 +329,6 @@
         <property name="position">12</property>
       </packing>
     </child>
-    <child>
-      <object class="GtkLinkButton" id="login_button">
-        <property name="label" translatable="yes">login button</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
-        <property name="has_tooltip">True</property>
-        <property name="relief">none</property>
-        <signal name="clicked" handler="on_sign_in_button_clicked"/>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="position">13</property>
-      </packing>
-    </child>
-    <child>
-      <placeholder/>
-    </child>
   </object>
   <object class="GtkVBox" id="processing_vbox">
     <property name="visible">True</property>
 
=== modified file 'debian/changelog'
--- debian/changelog	2010-12-16 13:19:01 +0000
+++ debian/changelog	2011-04-12 19:05:52 +0000
@@ -1,3 +1,13 @@
+ubuntu-sso-client (1.0.9-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release:
+
+    [ Natalia B. Bidart <[e-mail]> ]
+      - Register now uses the 'displayname' field to pass it on to SSO as
+      display name (LP: #709494).
+
+ -- Natalia Bidart (nessita) <[e-mail]>  Tue, 29 Mar 2011 16:26:42 -0300
+
 ubuntu-sso-client (1.0.8-0ubuntu1) maverick-proposed; urgency=low
 
   * New upstream release.
 
=== removed file 'po/ubuntu-sso-client.pot'
--- po/ubuntu-sso-client.pot	2010-12-16 13:19:01 +0000
+++ po/ubuntu-sso-client.pot	1970-01-01 00:00:00 +0000
@@ -1,179 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 12:42-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <[e-mail]>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../ubuntu_sso/gui.py:189
-msgid "Type the characters above"
-msgstr ""
-
-#: ../ubuntu_sso/gui.py:190
-#, python-format
-msgid "To connect this computer to %(app_name)s enter your details below."
-msgstr ""
-
-#: ../ubuntu_sso/gui.py:192 ../ubuntu_sso/gui.py:203 ../ubuntu_sso/gui.py:221
-msgid "Email address"
-msgstr ""
-
-#: ../ubuntu_sso/gui.py:193
-msgid "Re-type Email address"
-msgstr ""
-
-#: ../ubuntu_sso/gui.py:194
-msgid ""
-"The email addresses don't match, please double check and try entering them "
-"again."
-msgstr ""
-
-#: ../ubuntu_sso/gui.py:196
-msgid "The email must be a valid email address."
-msgstr ""
-
-#: ../ubuntu_sso/gui.py:197
-msgid "Enter code verification here"
-msgstr ""
-
-#: ../ubuntu_sso/gui.py:198
-msgid "This field is required."
-msgstr ""
-
-#: ../ubuntu_sso/gui.py:199
-msgid "I've forgotten my password"
-msgstr ""
-
-#: ../ubuntu_sso/gui.py:200
-#, python-format
-msgid "Create %(app_name)s account"
-msgstr ""
-
-#: ../ubuntu_sso/gui.py:201
-msgid "Loading..."
-msgstr ""
-
-#: ../ubuntu_sso/gui.py:202
-msgid "Already have an account? Click here to sign in"
-msgstr ""
-
-#: ../ubuntu_sso/gui.py:204
-#, python-format
-msgid "Connect to %(app_name)s"
-msgstr ""
-
-#: ../ubuntu_sso/gui.py:205 ../ubuntu_sso/gui.py:210
-msgid "Password"
-msgstr ""
-
-#: ../ubuntu_sso/gui.py:206
-msgid "Name"
-msgstr ""
-
-#: ../ubuntu_sso/gui.py:207
-msgid "Next"
-msgstr ""
-
-#: ../ubuntu_sso/gui.py:208
-msgid "One moment please..."
-msgstr ""
-
-#: ../ubuntu_sso/gui.py:209
-msgid "Your password was successfully changed."
-msgstr ""
-
-#: ../ubuntu_sso/gui.py:211
-msgid "Re-type Password"
-msgstr ""
-
-#: ../ubuntu_sso/gui.py:212
-msgid ""
-"The password must have a minimum of 8 characters and include one uppercase "
-"character and one number."
-msgstr ""
-
-#: ../ubuntu_sso/gui.py:214
-msgid ""
-"The passwords don't match, please double check and try entering them again."
-msgstr ""
-
-#: ../ubuntu_sso/gui.py:216
-msgid "The password is too weak."
-msgstr ""
-
-#: ../ubuntu_sso/gui.py:217
-#, python-format
-msgid "To reset your %(app_name)s password, enter your email address below:"
-msgstr ""
-
-#: ../ubuntu_sso/gui.py:219
-msgid "Reset password"
-msgstr ""
-
-#: ../ubuntu_sso/gui.py:220
-msgid "Reset code"
-msgstr ""
-
-#: ../ubuntu_sso/gui.py:222
-#, python-format
-msgid ""
-"A password reset code has been sent to %(email)s.\n"
-"Please enter the code below along with your new password."
-msgstr ""
-
-#: ../ubuntu_sso/gui.py:225
-msgid "The process finished successfully. Congratulations!"
-msgstr ""
-
-#: ../ubuntu_sso/gui.py:226
-msgid "Terms & Conditions"
-msgstr ""
-
-#: ../ubuntu_sso/gui.py:227
-msgid "Agreeing to the Ubuntu One Terms & Conditions is required to subscribe."
-msgstr ""
-
-#: ../ubuntu_sso/gui.py:229
-msgid ""
-"There was an error when trying to complete the process. Please check the "
-"information and try again."
-msgstr ""
-
-#: ../ubuntu_sso/gui.py:231
-msgid "Enter verification code"
-msgstr ""
-
-#: ../ubuntu_sso/gui.py:232
-#, python-format
-msgid ""
-"Check %(email)s for an email from Ubuntu Single Sign On. This message "
-"contains a verification code. Enter the code in the field below and click OK "
-"to complete creating your %(app_name)s account"
-msgstr ""
-
-#: ../ubuntu_sso/gui.py:237
-#, python-format
-msgid "I agree with the %(app_name)s "
-msgstr ""
-
-#. Terms&Conditions button
-#: ../ubuntu_sso/gui.py:238
-#, python-format
-msgid "Yes! Email me %(app_name)s tips and updates."
-msgstr ""
-
-#: ../ubuntu_sso/gui.py:239
-msgid "Reload"
-msgstr ""
 
=== modified file 'run-tests'
--- run-tests	2010-09-08 19:25:02 +0000
+++ run-tests	2011-04-12 19:05:52 +0000
@@ -16,7 +16,7 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 `which xvfb-run` ./contrib/test "$@"
-pylint contrib ubuntu_sso
+pylint ubuntu_sso
 if [ -x `which pep8` ]; then
     pep8 --repeat bin/ contrib/ ubuntu_sso/
 else
 
=== modified file 'setup.py'
--- setup.py	2010-12-16 13:19:01 +0000
+++ setup.py	2011-04-12 19:05:52 +0000
@@ -36,7 +36,8 @@
 from distutils.command import clean, build
 
 # Defining variables for various rules here, similar to a Makefile.am
-CLEANFILES = ['data/com.ubuntu.sso.service']
+CLEANFILES = ['data/com.ubuntu.sso.service', 'po/ubuntu-sso-client.pot',
+              'MANIFEST']
 
 
 # XXX: This needs some serious cleanup
@@ -86,7 +87,7 @@
 
 DistUtilsExtra.auto.setup(
     name='ubuntu-sso-client',
-    version='1.0.8',
+    version='1.0.9',
     license='GPL v3',
     author='Natalia Bidart',
     author_email='[e-mail]',
 
=== modified file 'ubuntu_sso/gui.py'
--- ubuntu_sso/gui.py	2010-12-16 13:19:01 +0000
+++ ubuntu_sso/gui.py	2011-04-12 19:05:52 +0000
@@ -387,8 +387,6 @@
                 msg = 'UbuntuSSOClientGUI: failed set_transient_for win id %r'
                 logger.exception(msg, window_id)
 
-        # Hidding unused widgets to save some space (LP #627440).
-        self.name_entry.hide()
         self.yes_to_updates_checkbutton.hide()
 
         self.window.show()
@@ -769,11 +767,10 @@
 
         error = False
 
-        # Hidding unused widgets to save some space (LP #627440).
-        #name = self.name_entry.get_text()
-        #if not name:
-        #    self.name_entry.set_warning(self.FIELD_REQUIRED)
-        #    error = True
+        name = self.name_entry.get_text()
+        if not name:
+            self.name_entry.set_warning(self.FIELD_REQUIRED)
+            error = True
 
         # check email
         email1 = self.email1_entry.get_text()
@@ -811,11 +808,12 @@
         self.user_email = email1
         self.user_password = password1
 
-        logger.info('Calling register_user with email %r, password <hidden>,' \
-                    ' captcha_id %r and captcha_solution %r.', email1,
-                    self._captcha_id, captcha_solution)
-        f = self.backend.register_user
-        f(self.app_name, email1, password1, self._captcha_id, captcha_solution,
+        logger.info('Calling register_with_name with email %r, password, '
+                    '<hidden> name %r, captcha_id %r and captcha_solution %r.',
+                    email1, name, self._captcha_id, captcha_solution)
+        f = self.backend.register_with_name
+        f(self.app_name, email1, password1, name,
+          self._captcha_id, captcha_solution,
           reply_handler=NO_OP, error_handler=NO_OP)
 
     def on_tc_button_clicked(self, *args, **kwargs):
 
=== modified file 'ubuntu_sso/main.py'
--- ubuntu_sso/main.py	2010-12-16 13:19:01 +0000
+++ ubuntu_sso/main.py	2011-04-12 19:05:52 +0000
@@ -171,24 +171,27 @@
 
         return captcha['captcha_id']
 
-    def register_user(self, email, password, captcha_id, captcha_solution):
+    def register_with_name(self, email, password, displayname,
+                      captcha_id, captcha_solution):
         """Register a new user with 'email' and 'password'."""
-        logger.debug('register_user: email: %r password: <hidden>, '
-                     'captcha_id: %r, captcha_solution: %r',
-                     email, captcha_id, captcha_solution)
+        logger.debug('register_with_name: email: %r password: <hidden>, '
+                     'displayname: %r, captcha_id: %r, captcha_solution: %r',
+                     email, displayname, captcha_id, captcha_solution)
         sso_service = self.sso_service_class(None, self.service_url)
         if not self._valid_email(email):
-            logger.error('register_user: InvalidEmailError for email: %r',
+            logger.error('register_with_name: InvalidEmailError for email: %r',
                          email)
             raise InvalidEmailError()
         if not self._valid_password(password):
-            logger.error('register_user: InvalidPasswordError')
+            logger.error('register_with_name: InvalidPasswordError')
             raise InvalidPasswordError()
 
         result = sso_service.registrations.register(
-                    email=email, password=password, captcha_id=captcha_id,
+                    email=email, password=password,
+                    displayname=displayname,
+                    captcha_id=captcha_id,
                     captcha_solution=captcha_solution)
-        logger.info('register_user: email: %r result: %r', email, result)
+        logger.info('register_with_name: email: %r result: %r', email, result)
 
         if result['status'] == 'error':
             errorsdict = self._format_webservice_errors(result['errors'])
@@ -198,6 +201,17 @@
         else:
             return email
 
+    def register_user(self, email, password,
+                      captcha_id, captcha_solution):
+        """Register a new user with 'email' and 'password'."""
+        logger.debug('register_user: email: %r password: <hidden>, '
+                     'captcha_id: %r, captcha_solution: %r',
+                     email, captcha_id, captcha_solution)
+        res = self.register_with_name(email, password, displayname='',
+                                      captcha_id=captcha_id,
+                                      captcha_solution=captcha_solution)
+        return res
+
     def login(self, email, password, token_name):
         """Login a user with 'email' and 'password'."""
         logger.debug('login: email: %r password: <hidden>, token_name: %r',
@@ -387,6 +401,17 @@
                                                 captcha_id, captcha_solution)
         blocking(f, app_name, self.UserRegistered, self.UserRegistrationError)
 
+    @dbus.service.method(dbus_interface=DBUS_IFACE_USER_NAME,
+                         in_signature='ssssss')
+    def register_with_name(self, app_name, email, password, name,
+                           captcha_id, captcha_solution):
+        """Call the matching method in the processor."""
+        def f():
+            """Inner function that will be run in a thread."""
+            return self.processor.register_with_name(email, password, name,
+                                                captcha_id, captcha_solution)
+        blocking(f, app_name, self.UserRegistered, self.UserRegistrationError)
+
     # login signals
     @dbus.service.signal(DBUS_IFACE_USER_NAME, signature="ss")
     def LoggedIn(self, app_name, result):
 
=== modified file 'ubuntu_sso/tests/test_gui.py'
--- ubuntu_sso/tests/test_gui.py	2010-11-04 12:20:56 +0000
+++ ubuntu_sso/tests/test_gui.py	2011-04-12 19:05:52 +0000
@@ -63,7 +63,7 @@
         self._args = args
         self._kwargs = kwargs
         self._called = {}
-        for i in ('generate_captcha', 'login', 'register_user',
+        for i in ('generate_captcha', 'login', 'register_with_name',
                   'validate_email', 'request_password_reset_token',
                   'set_new_password'):
             setattr(self, i, self._record_call(i))
@@ -674,11 +674,11 @@
         """Clicking 'join_ok_button' sends info to backend using 'register'."""
         self.click_join_with_valid_data()
 
-        # assert register_user was called
-        expected = 'register_user'
+        # assert register_with_name was called
+        expected = 'register_with_name'
         self.assertIn(expected, self.ui.backend._called)
         self.assertEqual(self.ui.backend._called[expected],
-                         ((APP_NAME, EMAIL, PASSWORD, CAPTCHA_ID,
+                         ((APP_NAME, EMAIL, PASSWORD, NAME, CAPTCHA_ID,
                            CAPTCHA_SOLUTION),
                           dict(reply_handler=gui.NO_OP,
                                error_handler=gui.NO_OP)))
@@ -1161,12 +1161,7 @@
 
         self.assert_correct_entry_warning(self.ui.name_entry,
                                           self.ui.FIELD_REQUIRED)
-        self.assertNotIn('register_user', self.ui.backend._called)
-
-    # Unused variable 'skip'
-    # pylint: disable=W0612
-    test_warning_is_shown_if_name_empty.skip = \
-        'Unused for now, will be hidden to save space (LP: #627440).'
+        self.assertNotIn('register_with_name', self.ui.backend._called)
 
     def test_warning_is_shown_if_empty_email(self):
         """A warning message is shown if emails are empty."""
@@ -1179,7 +1174,7 @@
                                           self.ui.FIELD_REQUIRED)
         self.assert_correct_entry_warning(self.ui.email2_entry,
                                           self.ui.FIELD_REQUIRED)
-        self.assertNotIn('register_user', self.ui.backend._called)
+        self.assertNotIn('register_with_name', self.ui.backend._called)
 
     def test_warning_is_shown_if_email_mismatch(self):
         """A warning message is shown if emails doesn't match."""
@@ -1192,7 +1187,7 @@
                                           self.ui.EMAIL_MISMATCH)
         self.assert_correct_entry_warning(self.ui.email2_entry,
                                           self.ui.EMAIL_MISMATCH)
-        self.assertNotIn('register_user', self.ui.backend._called)
+        self.assertNotIn('register_with_name', self.ui.backend._called)
 
     def test_warning_is_shown_if_invalid_email(self):
         """A warning message is shown if email is invalid."""
@@ -1205,7 +1200,7 @@
                                           self.ui.EMAIL_INVALID)
         self.assert_correct_entry_warning(self.ui.email2_entry,
                                           self.ui.EMAIL_INVALID)
-        self.assertNotIn('register_user', self.ui.backend._called)
+        self.assertNotIn('register_with_name', self.ui.backend._called)
 
     def test_password_help_is_always_shown(self):
         """Password help text is correctly displayed."""
@@ -1213,7 +1208,7 @@
                         'password help text is visible.')
         self.assertEqual(self.ui.password_help_label.get_text(),
                          self.ui.PASSWORD_HELP)
-        self.assertNotIn('register_user', self.ui.backend._called)
+        self.assertNotIn('register_with_name', self.ui.backend._called)
 
     def test_warning_is_shown_if_password_mismatch(self):
         """A warning message is shown if password doesn't match."""
@@ -1226,7 +1221,7 @@
                                           self.ui.PASSWORD_MISMATCH)
         self.assert_correct_entry_warning(self.ui.password2_entry,
                                           self.ui.PASSWORD_MISMATCH)
-        self.assertNotIn('register_user', self.ui.backend._called)
+        self.assertNotIn('register_with_name', self.ui.backend._called)
 
     def test_warning_is_shown_if_password_too_weak(self):
         """A warning message is shown if password is too weak."""
@@ -1241,7 +1236,7 @@
                                               self.ui.PASSWORD_TOO_WEAK)
             self.assert_correct_entry_warning(self.ui.password2_entry,
                                               self.ui.PASSWORD_TOO_WEAK)
-        self.assertNotIn('register_user', self.ui.backend._called)
+        self.assertNotIn('register_with_name', self.ui.backend._called)
 
     def test_warning_is_shown_if_tc_not_accepted(self):
         """A warning message is shown if TC are not accepted."""
@@ -1252,7 +1247,7 @@
 
         self.assert_correct_label_warning(self.ui.tc_warning_label,
                                           self.ui.TC_NOT_ACCEPTED)
-        self.assertNotIn('register_user', self.ui.backend._called)
+        self.assertNotIn('register_with_name', self.ui.backend._called)
 
     def test_warning_is_shown_if_not_captcha_solution(self):
         """A warning message is shown if TC are not accepted."""
@@ -1263,7 +1258,7 @@
 
         self.assert_correct_entry_warning(self.ui.captcha_solution_entry,
                                           self.ui.FIELD_REQUIRED)
-        self.assertNotIn('register_user', self.ui.backend._called)
+        self.assertNotIn('register_with_name', self.ui.backend._called)
 
     def test_no_warning_messages_if_valid_data(self):
         """No warning messages are shown if the data is valid."""
 
=== modified file 'ubuntu_sso/tests/test_main.py'
--- ubuntu_sso/tests/test_main.py	2010-12-16 13:19:01 +0000
+++ ubuntu_sso/tests/test_main.py	2011-04-12 19:05:52 +0000
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+#
 # test_main - tests for ubuntu_sso.main
 #
 # Author: Natalia Bidart <[e-mail]>
@@ -63,6 +65,7 @@
 EMAIL_ALREADY_REGISTERED = '[e-mail]'
 EMAIL_TOKEN = 'B2Pgtf'
 HELP = 'help text'
+NAME = 'Juanito Pérez'
 PASSWORD = 'be4tiFul'
 RESET_PASSWORD_TOKEN = '8G5Wtq'
 TOKEN = {u'consumer_key': u'xQ7xDAz',
@@ -107,7 +110,8 @@
 class FakedRegistrations(object):
     """Fake the registrations service."""
 
-    def register(self, email, password, captcha_id, captcha_solution):
+    def register(self, email, password, displayname,
+                 captcha_id, captcha_solution):
         """Fake registration. Return a fix result."""
         if email == EMAIL_ALREADY_REGISTERED:
             return {'status': 'error',
@@ -399,6 +403,16 @@
         self.assertIn('Received invalid reply: %s' % STATUS_UNKNOWN, exc)
 
 
+class SSORegistrationWithNameTestCase(SSOLoginProcessorTestCase):
+    """Test suite for the SSO login processor for register_with_name."""
+
+    def setUp(self):
+        """Init."""
+        super(SSORegistrationWithNameTestCase, self).setUp()
+        self.register_kwargs['displayname'] = NAME
+        self.processor.register_user = self.processor.register_with_name
+
+
 class BlockingSampleException(Exception):
     """The exception that will be thrown by the fake blocking."""
 
@@ -510,8 +524,8 @@
         """Test that the register_user method works ok."""
         d = Deferred()
         expected_result = "expected result"
-        self.create_mock_processor().register_user(EMAIL, PASSWORD, CAPTCHA_ID,
-                                                   CAPTCHA_SOLUTION)
+        self.create_mock_processor().register_user(EMAIL, PASSWORD,
+            CAPTCHA_ID, CAPTCHA_SOLUTION)
         self.mocker.result(expected_result)
         self.patch(ubuntu_sso.main, "blocking", self.fake_ok_blocking)
         self.mocker.replay()
@@ -534,8 +548,8 @@
         """Test that the register_user method fails as expected."""
         d = Deferred()
         expected_result = "expected result"
-        self.create_mock_processor().register_user(EMAIL, PASSWORD, CAPTCHA_ID,
-                                                   CAPTCHA_SOLUTION)
+        self.create_mock_processor().register_user(EMAIL, PASSWORD,
+            CAPTCHA_ID, CAPTCHA_SOLUTION)
         self.mocker.result(expected_result)
         self.patch(ubuntu_sso.main, "blocking", self.fake_err_blocking)
         self.mocker.replay()
@@ -554,6 +568,54 @@
                              CAPTCHA_SOLUTION)
         return d
 
+    def test_register_with_name(self):
+        """Test that the register_with_name method works ok."""
+        d = Deferred()
+        expected_result = "expected result"
+        self.create_mock_processor().register_with_name(EMAIL, PASSWORD, NAME,
+            CAPTCHA_ID, CAPTCHA_SOLUTION)
+        self.mocker.result(expected_result)
+        self.patch(ubuntu_sso.main, "blocking", self.fake_ok_blocking)
+        self.mocker.replay()
+
+        def verify(app_name, result):
+            """The actual test."""
+            self.assertEqual(result, expected_result)
+            self.assertEqual(app_name, APP_NAME)
+            d.callback(result)
+
+        client = SSOLogin(self.mockbusname,
+                          sso_login_processor_class=self.mockprocessorclass)
+        self.patch(client, "UserRegistered", verify)
+        self.patch(client, "UserRegistrationError", d.errback)
+        client.register_with_name(APP_NAME, EMAIL, PASSWORD, NAME, CAPTCHA_ID,
+                             CAPTCHA_SOLUTION)
+        return d
+
+    def test_register_with_name_error(self):
+        """Test that the register_with_name method fails as expected."""
+        d = Deferred()
+        expected_result = "expected result"
+        self.create_mock_processor().register_with_name(EMAIL, PASSWORD, NAME,
+            CAPTCHA_ID, CAPTCHA_SOLUTION)
+        self.mocker.result(expected_result)
+        self.patch(ubuntu_sso.main, "blocking", self.fake_err_blocking)
+        self.mocker.replay()
+
+        def verify(app_name, errdict):
+            """The actual test."""
+            self.assertEqual(errdict["errtype"], "BlockingSampleException")
+            self.assertEqual(app_name, APP_NAME)
+            d.callback("Ok")
+
+        client = SSOLogin(self.mockbusname,
+                          sso_login_processor_class=self.mockprocessorclass)
+        self.patch(client, "UserRegistered", d.errback)
+        self.patch(client, "UserRegistrationError", verify)
+        client.register_with_name(APP_NAME, EMAIL, PASSWORD, NAME, CAPTCHA_ID,
+                             CAPTCHA_SOLUTION)
+        return d
+
     def test_login(self):
         """Test that the login method works ok."""
         d = Deferred()