Merge lp:~diegosarmentero/ubuntu-sso-client/reset-page-not-working into lp:ubuntu-sso-client

[Diego Sarmentero]

- Changed the name of the function assigned to the lambda that is called on passwordChanged signal from reset_password_page (LP: #945080).

Start with --login_only, select the option to reset the password, enter a valid token in the Reset Password Page and press the "reset" button, that should take you to the current user sign in page again.

[Roberto Alsina (ralsina)]

+1 but please change sing_in to sign_in

review: Approve

[lp:~diegosarmentero/ubuntu-sso-client/reset-page-not-working]

898. By Diego Sarmentero on 2012-03-05

fixing typo

[Natalia Bidart (nataliabidart)]

Loosk good, and works as expected.

review: Approve

=== modified file 'ubuntu_sso/qt/tests/test_ubuntu_sso_wizard.py'
--- ubuntu_sso/qt/tests/test_ubuntu_sso_wizard.py	2012-03-01 18:03:54 +0000
+++ ubuntu_sso/qt/tests/test_ubuntu_sso_wizard.py	2012-03-05 14:40:21 +0000
@@ -136,3 +136,13 @@
         # We do +1 because a hide action is executed on the wizard init.
         self.assertEqual(self.ui.overlay.hide_counter,
             len(self.ui._pages) + 1)
+
+    def test_go_back_to_current_user_sign_in(self):
+        """Move the wizard back to the current user sign in page."""
+        self.patch(self.ui, '_go_back_to_page', self._set_called)
+        self.ui._next_id = self.ui.current_user_page_id
+        self.ui.next()
+        self.ui._move_to_reset_password_page()
+        self.ui.reset_password.passwordChanged.emit('')
+        expected = ((self.ui.current_user,), {})
+        self.assertEqual(expected, self._called)

=== modified file 'ubuntu_sso/qt/ubuntu_sso_wizard.py'
--- ubuntu_sso/qt/ubuntu_sso_wizard.py	2012-03-01 18:03:54 +0000
+++ ubuntu_sso/qt/ubuntu_sso_wizard.py	2012-03-05 14:40:21 +0000
@@ -107,7 +107,7 @@
         self.addPage(self.forgotten)
 
         self.reset_password = ResetPasswordPage(**kwargs)
-        back = lambda *a: self._go_back_to_current_page(self.current_user)
+        back = lambda *a: self._go_back_to_page(self.current_user)
         self.reset_password.passwordChanged.connect(back)
         self.addPage(self.reset_password)