Merge lp:~ralsina/ubuntuone-windows-installer/add_install_option into lp:ubuntuone-windows-installer

[Roberto Alsina]

Add --installer option to the wizard.

Add --installer option to the wizard.

To test IRL:

* if you run it with --installer, you get the license page.
* if you run it without arguments, you get the "choose sign in" page.

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[lp:~ralsina/ubuntuone-windows-installer/add_install_option]

58. By Roberto Alsina on 2011-09-14

change name of variable from installer to installing, as suggested

59. By Roberto Alsina on 2011-09-14

merged trunk

60. By Roberto Alsina on 2011-09-14

fix test

[Natalia Bidart (nataliabidart)]

- When running the installer without the --installer option, I still get the "Congratulations, Ubuntu One is installed!" legend in the first screen. I think we need to remove that?

- Also, if passing the --installer switch, I can't close the window, even if I choose 'yes I want to cancel' (on the license page).

review: Needs Fixing

[lp:~ralsina/ubuntuone-windows-installer/add_install_option]

61. By Roberto Alsina on 2011-09-14

Don't show 'is installed' message if not installing

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

=== modified file 'bin/ubuntuone-installer-qt'
--- bin/ubuntuone-installer-qt	2011-07-29 18:30:21 +0000
+++ bin/ubuntuone-installer-qt	2011-09-14 15:15:47 +0000
@@ -38,11 +38,14 @@
     """Parse command line parameters."""
     usage = "Usage: %prog [option]"
     result = OptionParser(usage=usage)
-    # There are no options currently
+    result.add_option("-i", "--installer", dest="installer",
+        action="store_true",
+        default=False, help="To be used by the installer: "
+        "Show license page, offer uninstall on cancel.")
     return result
 
 
 if __name__ == "__main__":
     parser = parser_options()
     (options, args) = parser.parse_args(sys.argv)
-    main.main()
+    main.main(installing=options.installer)
 
=== modified file 'ubuntuone_installer/gui/qt/gui.py'
--- ubuntuone_installer/gui/qt/gui.py	2011-09-12 18:48:09 +0000
+++ ubuntuone_installer/gui/qt/gui.py	2011-09-14 15:15:47 +0000
@@ -265,7 +265,7 @@
     registrationSuccess = QtCore.pyqtSignal('QString', 'QString')
     userCancellation = QtCore.pyqtSignal('QString')
 
-    def __init__(self, close_callback=None):
+    def __init__(self, close_callback=None, installing=False):
         """Initialize this instance."""
         # Used to decide the next page dynamically
         self._next_id = None
@@ -313,6 +313,8 @@
             ui=choose_sign_in_ui.Ui_ChooseSignInPage(),
             controller=self.sign_in_controller,
             parent=self)
+        if not installing:
+            self.sign_in_page.ui.message_label.setText("")
 
         self.setup_controller = SetUpAccountController(message_box=self)
         self.setup_account = SetupAccountPage(
@@ -381,6 +383,12 @@
         # Set Wizard buttons style
         self.button(QtGui.QWizard.NextButton).setDefault(True)
 
+        if installing:
+            self.setStartId(self.LICENSE_PAGE_ID)
+        else:
+            self.setStartId(self.SIGNIN_PAGE)
+        self.restart()
+
     # Invalid name "closeEvent"
     # pylint: disable=C0103
 
 
=== modified file 'ubuntuone_installer/gui/qt/main/tests/test_windows.py'
--- ubuntuone_installer/gui/qt/main/tests/test_windows.py	2011-08-29 12:41:02 +0000
+++ ubuntuone_installer/gui/qt/main/tests/test_windows.py	2011-09-14 15:15:47 +0000
@@ -126,3 +126,25 @@
         self.assertEqual(self._called, ((), {}))
         # Should stop the app
         self.assertTrue(self.stopped)
+
+    @defer.inlineCallbacks
+    def test_without_installed_flag(self):
+        """Test behaviour without the installer flag."""
+        logger = FakeLogger()
+        self.patch(windows, "success_cb", self._set_called)
+        yield windows.check_credentials(
+            FakeCredentialsManagementTool,
+            gui, logger)
+        self.assertEqual(self._called, (('Something not false',
+            gui, False), {}))
+
+    @defer.inlineCallbacks
+    def test_with_installed_flag(self):
+        """Test behaviour without the installer flag."""
+        logger = FakeLogger()
+        self.patch(windows, "success_cb", self._set_called)
+        yield windows.check_credentials(
+            FakeCredentialsManagementTool,
+            gui, logger, installer=True)
+        self.assertEqual(self._called, (('Something not false',
+            gui, True), {}))
 
=== modified file 'ubuntuone_installer/gui/qt/main/windows.py'
--- ubuntuone_installer/gui/qt/main/windows.py	2011-09-08 14:18:30 +0000
+++ ubuntuone_installer/gui/qt/main/windows.py	2011-09-14 15:15:47 +0000
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 # Authors: Manuel de la Pena <[e-mail]>
+#          Roberto Alsina <[e-mail]>
 #
 # Copyright 2011 Canonical Ltd.
 #
@@ -43,14 +44,14 @@
     stop()
 
 
-def success_cb(creds, gui):
+def success_cb(creds, gui, installing):
     """Handle credentials success."""
     if creds:  # Have credentials already
         from ubuntuone_installer.gui.qt import utils
         utils.start_control_panel()
         stop()
     else:  # No credentials
-        window = gui.MainWindow(close_callback=stop)
+        window = gui.MainWindow(close_callback=stop, installing=installing)
         # Set Application Style Sheet
         app = QtGui.QApplication.instance()
         qss = QtCore.QResource(":/ubuntuone.qss")
@@ -64,7 +65,7 @@
 
 
 @defer.inlineCallbacks
-def check_credentials(credentials_tool, gui, logger):
+def check_credentials(credentials_tool, gui, logger, installer=False):
     """Check credentials and either start u1cp or show the wizard."""
     credtool = credentials_tool()
     # pylint: disable=W0703
@@ -73,10 +74,10 @@
     except Exception, exc:
         error_cb(exc, logger)
     else:
-        success_cb(creds, gui)
-
-
-def main():
+        success_cb(creds, gui, installer)
+
+
+def main(installing=False):
     """Perform a client request to be logged in."""
     # pylint: disable=W0612
     app = QtGui.QApplication(sys.argv)
@@ -89,5 +90,5 @@
     from ubuntuone.platform.credentials import CredentialsManagementTool
     from ubuntuone_installer.logger import setup_logging
     logger = setup_logging('qt.gui')
-    check_credentials(CredentialsManagementTool, gui, logger)
+    check_credentials(CredentialsManagementTool, gui, logger, installing)
     reactor.run()
 
=== modified file 'ubuntuone_installer/gui/qt/tests/test_gui.py'
--- ubuntuone_installer/gui/qt/tests/test_gui.py	2011-09-12 18:49:40 +0000
+++ ubuntuone_installer/gui/qt/tests/test_gui.py	2011-09-14 15:15:47 +0000
@@ -161,6 +161,19 @@
             QtCore.Qt.WindowContextHelpButtonHint)
         self.assertEqual(flag, 0)
 
+    def test_with_flag(self):
+        """test with flag activated."""
+        win = gui.MainWindow(installing=True)
+        self.assertEqual(win.startId(), win.LICENSE_PAGE_ID)
+        self.assertEqual(
+            unicode(self.ui.sign_in_page.ui.message_label.text()),
+            u"")
+
+    def test_without_flag(self):
+        """test with flag activated."""
+        win = gui.MainWindow()
+        self.assertEqual(win.startId(), win.SIGNIN_PAGE)
+
     def test_initialize_page(self):
         """Check the initializePage to ensure proper widgets visibility."""
         setup_page = self.ui.page(self.ui.setup_account_page_id)
@@ -472,7 +485,10 @@
 
     def test_continue_cancels_cancel(self):
         """Clicking 'Continue' cancels cancellation."""
-        gui.AreYouSure.result = 1
+        # Must not be LICENSE_PAGE not CONGRATULATIONS_PAGE
+        self.patch(self.ui, 'currentId', lambda: self.ui.SIGNIN_PAGE)
+        # Make AreYouSure say the user is "not sure"
+        gui.AreYouSure.result = 0
         self.patch(subprocess, "Popen", self._set_called)
         self.ui.show()
         self.addCleanup(self.ui.hide)