Merge lp:~diegosarmentero/ubuntuone-windows-installer/reset-fails into lp:ubuntuone-windows-installer

[Diego Sarmentero]

Fixed: Errors when resetting the password are not handled

Fixed: Errors when resetting the password are not handled

[Roberto Alsina (ralsina)]

+1 nice!

review: Approve

[Natalia Bidart (nataliabidart)]

oh, lint issues:

ubuntuone_installer/gui/qt/tests/test_gui.py:
    161: [E1101, MainWindowTestCase.test_setup_account_controller_params] Instance of 'SetUpAccountController' has no 'args' member
    163: [E1101, MainWindowTestCase.test_setup_account_controller_params] Instance of 'SetUpAccountController' has no 'args' member
    168: [E1101, MainWindowTestCase.test_current_user_controller_params] Instance of 'CurrentUserController' has no 'args' member
    170: [E1101, MainWindowTestCase.test_current_user_controller_params] Instance of 'CurrentUserController' has no 'args' member
    173: [E1101, MainWindowTestCase.test_current_user_controller_params] Instance of 'CurrentUserController' has no 'args' member
    176: [E1101, MainWindowTestCase.test_current_user_controller_params] Instance of 'SetUpAccountController' has no 'args' member
    181: [E1101, MainWindowTestCase.test_forgotten_password_controller_params] Instance of 'ForgottenPasswordController' has no 'args' member
    183: [E1101, MainWindowTestCase.test_forgotten_password_controller_params] Instance of 'SetUpAccountController' has no 'args' member
    188: [E1101, MainWindowTestCase.test_reset_password_controller_params] Instance of 'ResetPasswordController' has no 'args' member
    190: [E1101, MainWindowTestCase.test_reset_password_controller_params] Instance of 'SetUpAccountController' has no 'args' member

review: Needs Fixing

[lp:~diegosarmentero/ubuntuone-windows-installer/reset-fails]

66. By Diego Sarmentero on 2011-09-15

Fixed lint issues.

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

=== modified file 'ubuntuone_installer/gui/qt/gui.py'
--- ubuntuone_installer/gui/qt/gui.py	2011-09-15 18:00:28 +0000
+++ ubuntuone_installer/gui/qt/gui.py	2011-09-15 18:41:42 +0000
@@ -345,14 +345,16 @@
         self.error_controller = ErrorController()
         self.error = ErrorPage(Ui_ErrorPage(), self.error_controller)
 
-        self.forgotten_pwd_controller = ForgottenPasswordController()
+        self.forgotten_pwd_controller = ForgottenPasswordController(
+            message_box=self)
         self.forgotten = ForgottenPasswordPage(Ui_ForgottenPasswordPage(),
                                                self.forgotten_pwd_controller,
                                                parent=self)
         self.forgotten.ui.send_button.clicked.connect(
             self.overlay.show)
 
-        self.reset_password_controller = ResetPasswordController()
+        self.reset_password_controller = ResetPasswordController(
+            message_box=self)
         self.reset_password = ResetPasswordPage(Ui_ResetPasswordPage(),
                                                 self.reset_password_controller,
                                                 parent=self)

=== modified file 'ubuntuone_installer/gui/qt/tests/test_gui.py'
--- ubuntuone_installer/gui/qt/tests/test_gui.py	2011-09-15 18:00:28 +0000
+++ ubuntuone_installer/gui/qt/tests/test_gui.py	2011-09-15 18:41:42 +0000
@@ -155,6 +155,42 @@
         setup_page = self.ui.page(self.ui.setup_account_page_id)
         setup_page.initializePage()
 
+    # pylint: disable=E1101
+    def test_setup_account_controller_params(self):
+        """Test with SetupAccountController params."""
+        win = gui.MainWindow()
+        val = win.setup_controller.args[1].pop('message_box', None)
+        self.assertEqual(val, win)
+        self.assertEqual(win.setup_controller.args[0], ())
+
+    def test_current_user_controller_params(self):
+        """Test with CurrentUserController params."""
+        win = gui.MainWindow()
+        val = win.current_user_controller.args[1].pop('message_box', None)
+        self.assertEqual(val, win)
+        val = win.current_user_controller.args[1].pop('title', '')
+        title = gui.TITLE_STYLE % gui.SIGN_IN
+        self.assertEqual(val, title)
+        val = win.current_user_controller.args[1].pop('subtitle', '')
+        subtitle = gui.SIGN_IN_SUBTITLE
+        self.assertEqual(val, subtitle)
+        self.assertEqual(win.setup_controller.args[0], ())
+
+    def test_forgotten_password_controller_params(self):
+        """Test with ForgottenPasswordController params."""
+        win = gui.MainWindow()
+        val = win.forgotten_pwd_controller.args[1].pop('message_box', None)
+        self.assertEqual(val, win)
+        self.assertEqual(win.setup_controller.args[0], ())
+
+    def test_reset_password_controller_params(self):
+        """Test with ResetPasswordController params."""
+        win = gui.MainWindow()
+        val = win.reset_password_controller.args[1].pop('message_box', None)
+        self.assertEqual(val, win)
+        self.assertEqual(win.setup_controller.args[0], ())
+    # pylint: enable=E1101
+
     def test_wizard_init(self):
         """Check the Wizard flags regarding to the context help button."""
         flag = int(self.ui.windowFlags() &