Merge lp:~diegosarmentero/ubuntu-sso-client/reset-password into lp:ubuntu-sso-client

[Diego Sarmentero]

- Fixed Reset Password (added Titles to that page) (LP: #842813).

Fixed Reset Password.
Added Titles to that page.

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

[Natalia Bidart (nataliabidart)]

Please file a bug and link it to this proposal. Thanks!

[lp:~diegosarmentero/ubuntu-sso-client/reset-password]

779. By Diego Sarmentero on 2011-09-06

Assigning bug

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'ubuntu_sso/qt/gui.py'
--- ubuntu_sso/qt/gui.py	2011-09-02 13:17:08 +0000
+++ ubuntu_sso/qt/gui.py	2011-09-06 15:21:25 +0000
@@ -16,6 +16,8 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 """Qt implementation of the UI."""
 
+import gettext
+
 from PyQt4.QtCore import pyqtSignal, Qt, SIGNAL
 from PyQt4.QtGui import (
     QApplication,
@@ -53,7 +55,11 @@
     UbuntuSSOWizardController)
 
 
+_ = gettext.gettext
 logger = setup_logging('ubuntu_sso.gui')
+RESET_TITLE = _("Reset password")
+RESET_SUBTITLE = _("A password reset code has been sent to your e-mail."
+                   "Please enter the code below along with your new password.")
 
 
 class Header(QWidget):
@@ -101,8 +107,8 @@
         self.ui.setupUi(self)
         self.header = Header()
         self.layout().insertWidget(0, self.header)
-        if controller:
-            self.controller = controller
+        self.controller = controller
+        if self.controller:
             self.controller.setupUi(self)
         self.next = -1
 
@@ -316,6 +322,8 @@
         super(ResetPasswordPage, self).initializePage()
         common.password_default_assistance(self.ui.password_assistance)
         self.ui.password_assistance.setVisible(False)
+        self.setTitle(RESET_TITLE)
+        self.setSubTitle(RESET_SUBTITLE)
 
     def showEvent(self, event):
         """Connect focusChanged signal from the application."""

=== modified file 'ubuntu_sso/qt/tests/test_reset_password.py'
--- ubuntu_sso/qt/tests/test_reset_password.py	2011-09-02 12:48:10 +0000
+++ ubuntu_sso/qt/tests/test_reset_password.py	2011-09-06 15:21:25 +0000
@@ -20,7 +20,7 @@
 from twisted.trial.unittest import TestCase
 
 from ubuntu_sso.qt import common
-from ubuntu_sso.qt.gui import ResetPasswordPage
+from ubuntu_sso.qt.gui import ResetPasswordPage, RESET_SUBTITLE, RESET_TITLE
 # pylint: disable=F0401,E0611
 from ubuntu_sso.qt.reset_password_ui import Ui_ResetPasswordPage
 # pylint: enable=F0401,E0611
@@ -40,11 +40,11 @@
         FakePasswordAssistance._called = False
 
 
-class SetupAccountTestCase(TestCase):
+class ResetPasswordTestCase(TestCase):
     """Test the ResetPasswordPage code."""
 
     def setUp(self):
-        super(SetupAccountTestCase, self).setUp()
+        super(ResetPasswordTestCase, self).setUp()
         self.page = ResetPasswordPage(Ui_ResetPasswordPage(),
                                                 None,
                                                 None)
@@ -57,6 +57,15 @@
         self.assertEqual(self.page.ui.confirm_password_line_edit.receivers(
             QtCore.SIGNAL('textEdited(QString)')), 1)
 
+    def test_initialize(self):
+        """Check the Title and Subtitle."""
+        self.page.show()
+        self.page.initializePage()
+        self.addCleanup(self.page.hide)
+        self.assertEqual(self.page.header.title_label.text(), RESET_TITLE)
+        self.assertEqual(self.page.header.subtitle_label.text(),
+            RESET_SUBTITLE)
+
     def test_focus_changed_password_visibility(self):
         """Check visibility changes when focus_changed() is executed."""
         self.page.show()