Merge lp:~diegosarmentero/ubuntu-sso-client/pass-recover into lp:ubuntu-sso-client

[Diego Sarmentero]

Fixed: Password recovery on Windows client gives error (LP: #853794).

Fixed: Password recovery on Windows client gives error (LP: #853794).

And add some functions to complete the email field from the next page if the user already complete that in the previous page.

[Roberto Alsina (ralsina)]

E0102:1029:FakeLineEdit: class already defined line 199
C0103:1041:FakeLineEdit.setText: Invalid name "setText" (should match ([a-z_][a-z0-9_]{2,79}$|setUp|tearDown))

review: Needs Fixing

[lp:~diegosarmentero/ubuntu-sso-client/pass-recover]

796. By Diego Sarmentero on 2011-09-28

Fixed lint issues.

[Natalia Bidart (nataliabidart)]

Looks and works great.

review: Approve

[Roberto Alsina (ralsina)]

+1

review: Approve

=== modified file 'ubuntu_sso/qt/controllers.py'
--- ubuntu_sso/qt/controllers.py	2011-09-22 17:03:50 +0000
+++ ubuntu_sso/qt/controllers.py	2011-09-28 17:58:19 +0000
@@ -250,6 +250,8 @@
     def on_forgotten_password(self):
         """Show the user the forgotten password page."""
         logger.info('Forgotten password')
+        email = unicode(self.view.ui.email_edit.text())
+        self.view.wizard().forgotten.ui.email_line_edit.setText(email)
         self.view.next = self.view.wizard().forgotten_password_page_id
         self.view.wizard().next()
 
@@ -653,7 +655,8 @@
     def pageInitialized(self):
         """Set the initial state of ForgottenPassword page."""
         self.view.send_button.setDefault(True)
-        self.view.send_button.setEnabled(False)
+        enabled = not self.view.ui.email_line_edit.text().isEmpty()
+        self.view.send_button.setEnabled(enabled)
         # The style from this property come from the Wizard
         self.view.send_button.setProperty("DisabledState",
             not self.view.send_button.isEnabled())
@@ -826,6 +829,11 @@
 
     def on_password_changed(self, app_name, result):
         """Let user know that the password was changed."""
+        email = unicode(self.view.wizard().forgotten.ui.email_line_edit.text())
+        self.view.wizard().current_user.ui.email_edit.setText(email)
+        self.view.wizard().overlay.hide()
+        self.view.wizard().back()
+        self.view.wizard().back()
 
     def on_password_change_error(self, app_name, error):
         """Let the user know that there was an error."""
@@ -837,7 +845,7 @@
     def set_new_password(self):
         """Request a new password to be set."""
         app_name = self.view.wizard().app_name
-        email = unicode(self.view.wizard().field('email_address').toString())
+        email = unicode(self.view.wizard().forgotten.ui.email_line_edit.text())
         code = unicode(self.view.ui.reset_code_line_edit.text())
         password = unicode(self.view.ui.password_line_edit.text())
         logger.info('Settig new password for %s and email %s with code %s',

=== modified file 'ubuntu_sso/qt/tests/test_controllers.py'
--- ubuntu_sso/qt/tests/test_controllers.py	2011-09-26 19:18:26 +0000
+++ ubuntu_sso/qt/tests/test_controllers.py	2011-09-28 17:58:19 +0000
@@ -23,6 +23,7 @@
 
 from mocker import MATCH, MockerTestCase
 from PyQt4.QtGui import QWizard
+from PyQt4.QtCore import QString
 
 # pylint: disable=F0401
 try:
@@ -1111,6 +1112,26 @@
         self.controller.setupUi(self.view)
 
 
+class FakeLineEditForForgottenPage(object):
+
+    """Fake Line Edit"""
+
+    def __init__(self):
+        """Initilize object."""
+        self.email_text = QString()
+
+    def text(self):
+        """Fake text for QLineEdit."""
+        return self.email_text
+
+    # setText is inherited
+    # pylint: disable=C0103
+    def setText(self, text):
+        """Fake setText for QLineEdit."""
+        self.email_text = QString(text)
+    # pylint: enable=C0103
+
+
 class FakeForgottenPasswordPage(FakePageUiStyle):
     """Fake the page."""
 
@@ -1121,6 +1142,7 @@
         self.email_widget = FakePageUiStyle()
         self.forgotted_password_intro_label = FakePageUiStyle()
         self.try_again_widget = FakePageUiStyle()
+        self.email_line_edit = FakeLineEditForForgottenPage()
 
 
 class ForgottenPasswordControllerValidationTest(BaseTestCase):
@@ -1146,6 +1168,19 @@
         self.assertTrue(self.controller.view.properties.get('unpolish', False))
         self.assertTrue(self.controller.view.properties.get('polish', False))
 
+    def test_page_initialized_with_text(self):
+        """Test the initial state of the page when it is loaded."""
+        self.controller.view.email_line_edit.setText('[e-mail]')
+        self.controller.pageInitialized()
+        self.assertTrue(self.controller.view.send_button.enabled())
+        self.assertTrue(
+            self.controller.view.send_button.properties['default'])
+        self.assertTrue("DisabledState" in self.controller.view.properties)
+        self.assertEqual(self.controller.view.properties["DisabledState"],
+            not self.controller.view.send_button.enabled())
+        self.assertTrue(self.controller.view.properties.get('unpolish', False))
+        self.assertTrue(self.controller.view.properties.get('polish', False))
+
     def test_valid(self):
         """The submit button should be enabled with a valid email."""
         self.controller.view.email_address_line_edit.setText("a@b")
@@ -1338,7 +1373,7 @@
         password = 'password'
         self.view.wizard().app_name
         self.mocker.result(app_name)
-        self.view.wizard().field('email_address').toString()
+        unicode(self.view.wizard().forgotten.ui.email_line_edit.text())
         self.mocker.result(email)
         self.view.ui.reset_code_line_edit.text()
         self.mocker.result(code)
@@ -1445,3 +1480,59 @@
         self.controller.view.confirm_password_line_edit.setText("1234567")
         self.controller._validate()
         self.assertFalse(self.controller.view.reset_password_button.enabled())
+
+
+class FakeWizardForResetPassword(object):
+
+    """Fake Wizard for ResetPasswordController."""
+
+    def __init__(self):
+        self.current_user = self
+        self.ui = self
+        self.email_edit = self
+        self.email_line_edit = self
+        self.forgotten = self
+        self.overlay = self
+        self.count_back = 0
+        self.hide_value = False
+        self.text_value = '[e-mail]'
+
+    def wizard(self):
+        """Fake wizard function for view."""
+        return self
+
+    def back(self):
+        """Fake back for wizard."""
+        self.count_back += 1
+
+    def hide(self):
+        """Fake hide for overlay."""
+        self.hide_value = True
+
+    def text(self):
+        """Fake text for QLineEdit."""
+        return self.text_value
+
+    # pylint: disable=C0103
+    def setText(self, text):
+        """Fake setText for QLineEdit."""
+        self.text_value = text
+    # pylint: enable=C0103
+
+
+class ResetPasswordControllerRealControllerTest(BaseTestCase):
+
+    """Tests for ResetPasswordController, but without Mocker."""
+
+    def setUp(self):
+        """Setup test."""
+        super(ResetPasswordControllerRealControllerTest, self).setUp()
+        self.controller = ResetPasswordController()
+        self.controller.view = FakeWizardForResetPassword()
+
+    def test_on_password_changed(self):
+        """Test that on_password_changed execute the proper operation."""
+        self.controller.on_password_changed('app_name', '')
+        self.assertTrue(self.controller.view.hide_value)
+        self.assertEqual(self.controller.view.count_back, 2)
+        self.assertEqual(self.controller.view.text_value, '[e-mail]')