Merge lp:~ralsina/ubuntuone-control-panel/switch-baby-switch into lp:ubuntuone-control-panel

[Roberto Alsina]

- Switch to folders tab only hen credentials are not found (Fixes lp:1063904).

This branch fixes the --switch-to option. To test IRL, run u1cp with the "--switch-to=devices" option (or any other tabname) and it should work.

Also important is that it should not break the following behaviour: when you remove your device and login again, you should end in the "folders" tab, not in the "devices" tab.

To test that: start u1cp, remove your device, then login again (without exiting u1cp) and you should end in the folders tab.

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[Brian Curtin (brian.curtin)]

Looks ok to me.

review: Approve

=== modified file 'ubuntuone/controlpanel/gui/qt/controlpanel.py'
--- ubuntuone/controlpanel/gui/qt/controlpanel.py	2012-08-20 17:51:54 +0000
+++ ubuntuone/controlpanel/gui/qt/controlpanel.py	2012-10-08 18:17:23 +0000
@@ -99,14 +99,17 @@
         """Credentials are not found or were removed."""
         self.ui.wizard.restart()
         self.ui.switcher.setCurrentWidget(self.ui.wizard)
-        self.is_processing = False
-
-    @defer.inlineCallbacks
-    @log_call(logger.debug)
-    def on_credentials_found(self):
-        """Credentials are not found or were removed."""
+        # By design request, when the user logs in, he has to end
+        # in the folders tab, so setting that up for after the wizard is
+        # done.
         folders_tab_idx = self.ui.tab_widget.indexOf(self.ui.folders_tab)
         self.ui.tab_widget.setCurrentIndex(folders_tab_idx)
+        self.is_processing = False
+
+    @defer.inlineCallbacks
+    @log_call(logger.debug)
+    def on_credentials_found(self):
+        """Credentials are not found or were removed."""
         self.ui.switcher.setCurrentWidget(self.ui.management)
         self.connect_file_sync()
         self.is_processing = False

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py	2012-04-10 19:15:11 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py	2012-10-08 18:17:23 +0000
@@ -74,6 +74,14 @@
         self.assertIs(self.ui.ui.switcher.currentWidget(), self.ui.ui.wizard)
         self.assertEqual(self._called, ((), {}))
 
+    def test_on_credentials_not_found_sets_folder_tab(self):
+        """Credentials_not_found should switch to the folder tab."""
+        unexpected = self.ui.ui.tab_widget.indexOf(self.ui.ui.devices_tab)
+        expected = self.ui.ui.tab_widget.indexOf(self.ui.ui.folders_tab)
+        self.ui.ui.tab_widget.setCurrentIndex(unexpected)
+        self.ui.on_credentials_not_found()
+        self.assertEqual(self.ui.ui.tab_widget.currentIndex(), expected)
+
     @defer.inlineCallbacks
     def test_on_credentials_found_called(self):
         """If credentials, on_credentials_not_found is called."""