Merge lp:~diegosarmentero/ubuntu-sso-client/fix-double-navigation into lp:ubuntu-sso-client

[Diego Sarmentero]

Fix double back navigation in SSO reset code page (LP: #862403).

Fix double back navigation in SSO reset code page (LP: #862403).

[Roberto Alsina (ralsina)]

+1 nice!

review: Approve

[lp:~diegosarmentero/ubuntu-sso-client/fix-double-navigation]

819. By Diego Sarmentero on 2011-11-30

Adding one more test

820. By Diego Sarmentero on 2011-12-01

back navigation fixed

821. By Diego Sarmentero on 2011-12-01

Adding improves to tests.

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

=== modified file 'ubuntu_sso/qt/controllers.py'
--- ubuntu_sso/qt/controllers.py	2011-11-11 20:34:57 +0000
+++ ubuntu_sso/qt/controllers.py	2011-12-01 12:19:27 +0000
@@ -828,8 +828,12 @@
         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()
+        current_user_id = self.view.wizard().current_user_page_id
+        visited_pages = self.view.wizard().visitedPages()
+        for index in reversed(visited_pages):
+            if index == current_user_id:
+                break
+            self.view.wizard().back()
 
     def on_password_change_error(self, app_name, error):
         """Let the user know that there was an error."""
@@ -844,7 +848,7 @@
         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',
+        logger.info('Setting new password for %r and email %r with code %r',
                     app_name, email, code)
         self.backend.set_new_password(app_name, email, code, password)
 

=== modified file 'ubuntu_sso/qt/tests/test_controllers.py'
--- ubuntu_sso/qt/tests/test_controllers.py	2011-11-11 20:34:57 +0000
+++ ubuntu_sso/qt/tests/test_controllers.py	2011-12-01 12:19:27 +0000
@@ -669,6 +669,7 @@
         self.count_back = 0
         self.hide_value = False
         self.text_value = '[e-mail]'
+        self.current_user_page_id = 4
 
     def wizard(self):
         """Fake wizard function for view."""
@@ -690,6 +691,10 @@
     def setText(self, text):
         """Fake setText for QLineEdit."""
         self.text_value = text
+
+    def visitedPages(self):
+        """Return an int list of fake visited pages."""
+        return [1, 4, 6, 8]
     # pylint: enable=C0103
 
 
@@ -2094,5 +2099,17 @@
         """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)
+        times_visited = 2
+        self.assertEqual(self.controller.view.count_back, times_visited)
+        self.assertEqual(self.controller.view.text_value, '[e-mail]')
+
+    def test_on_password_changed_not_visited(self):
+        """Test that on_password_changed execute the proper operation."""
+        current_user_page_id = 20
+        self.patch(self.controller.view, "current_user_page_id",
+            current_user_page_id)
+        self.controller.on_password_changed('app_name', '')
+        self.assertTrue(self.controller.view.hide_value)
+        times_visited = 4
+        self.assertEqual(self.controller.view.count_back, times_visited)
         self.assertEqual(self.controller.view.text_value, '[e-mail]')