Merge lp:~diegosarmentero/ubuntuone-windows-installer/forgotten845737 into lp:ubuntuone-windows-installer

[Diego Sarmentero]

- Fixed: When entering email to reset password, errors are not highlighted (LP: #845737).

- Fixed: When entering email to reset password, errors are not highlighted (LP: #845737).

[Roberto Alsina (ralsina)]

review: Approve

[Alejandro J. Cura (alecu)]

Code looks great, and all tests pass.

review: Approve

=== modified file 'ubuntuone_installer/gui/qt/forgotten.py'
--- ubuntuone_installer/gui/qt/forgotten.py	2011-08-02 02:36:16 +0000
+++ ubuntuone_installer/gui/qt/forgotten.py	2011-09-21 18:31:16 +0000
@@ -29,6 +29,5 @@
 
     def on_password_reset_error(self, app_name, error):
         """Hide the overlay, then do as the default controller does."""
-        self.view.wizard().overlay.hide()
         super(ForgottenPasswordController,
             self).on_password_reset_error(app_name, error)

=== modified file 'ubuntuone_installer/gui/qt/tests/test_gui.py'
--- ubuntuone_installer/gui/qt/tests/test_gui.py	2011-09-16 12:55:16 +0000
+++ ubuntuone_installer/gui/qt/tests/test_gui.py	2011-09-21 18:31:16 +0000
@@ -362,7 +362,8 @@
     def test_forgotten_password_controller_error(self):
         """When there is an error, it should hide the overlay."""
         self.assertEqual(self.ui.overlay.hide_counter, 1)
-        controller = forgotten.ForgottenPasswordController()
+        controller = forgotten.ForgottenPasswordController(
+            message_box=self.ui)
         controller.view = self.ui.forgotten
         controller.on_password_reset_error("app_name",
             {'errtype': 'ResetPasswordTokenError'})