Merge branch 'feature/wizard-tests' into develop

1 files changed, 55 insertions, 33 deletions

diff --git a/src/leap/gui/firstrun/wizard.py b/src/leap/gui/firstrun/wizard.py
index 9b77b877..89209401 100755
--- a/src/leap/gui/firstrun/wizard.py
+++ b/src/leap/gui/firstrun/wizard.py
@@ -2,8 +2,11 @@
 import logging
 
 import sip
-sip.setapi('QString', 2)
-sip.setapi('QVariant', 2)
+try:
+    sip.setapi('QString', 2)
+    sip.setapi('QVariant', 2)
+except ValueError:
+    pass
 
 from PyQt4 import QtCore
 from PyQt4 import QtGui
@@ -46,12 +49,29 @@ TODO-ish:
 """
 
 
+def get_pages_dict():
+    return OrderedDict((
+        ('intro', firstrun.intro.IntroPage),
+        ('providerselection',
+            firstrun.providerselect.SelectProviderPage),
+        ('login', firstrun.login.LogInPage),
+        ('providerinfo', firstrun.providerinfo.ProviderInfoPage),
+        ('providersetupvalidation',
+            firstrun.providersetup.ProviderSetupValidationPage),
+        ('signup', firstrun.register.RegisterUserPage),
+        ('signupvalidation',
+            firstrun.regvalidation.RegisterUserValidationPage),
+        ('lastpage', firstrun.last.LastPage)
+    ))
+
+
 class FirstRunWizard(QtGui.QWizard):
 
     def __init__(
             self,
             conductor_instance,
             parent=None,
+            pages_dict=None,
             eip_username=None,
             providers=None,
             success_cb=None, is_provider_setup=False,
@@ -112,20 +132,7 @@ class FirstRunWizard(QtGui.QWizard):
         self.is_previously_registered = bool(self.eip_username)
         self.from_login = False
 
-        pages_dict = OrderedDict((
-            ('intro', firstrun.intro.IntroPage),
-            ('providerselection',
-                firstrun.providerselect.SelectProviderPage),
-            ('login', firstrun.login.LogInPage),
-            ('providerinfo', firstrun.providerinfo.ProviderInfoPage),
-            ('providersetupvalidation',
-                firstrun.providersetup.ProviderSetupValidationPage),
-            ('signup', firstrun.register.RegisterUserPage),
-            ('signupvalidation',
-                firstrun.regvalidation.RegisterUserValidationPage),
-            ('connecting', firstrun.connect.ConnectingPage),
-            ('lastpage', firstrun.last.LastPage)
-        ))
+        pages_dict = pages_dict or get_pages_dict()
         self.add_pages_from_dict(pages_dict)
 
         self.validation_errors = {}
@@ -146,6 +153,10 @@ class FirstRunWizard(QtGui.QWizard):
         # TODO: set style for MAC / windows ...
         #self.setWizardStyle()
 
+    #
+    # setup pages in wizard
+    #
+
     def add_pages_from_dict(self, pages_dict):
         """
         @param pages_dict: the dictionary with pages, where
@@ -168,6 +179,10 @@ class FirstRunWizard(QtGui.QWizard):
         """
         return self.pages_dict.keys().index(page_name)
 
+    #
+    # validation errors
+    #
+
     def set_validation_error(self, pagename, error):
         self.validation_errors[pagename] = error
 
@@ -179,20 +194,6 @@ class FirstRunWizard(QtGui.QWizard):
     def get_validation_error(self, pagename):
         return self.validation_errors.get(pagename, None)
 
-    def set_providerconfig(self, providerconfig):
-        self.providerconfig = providerconfig
-
-    def setWindowFlags(self, flags):
-        logger.debug('setting window flags')
-        QtGui.QWizard.setWindowFlags(self, flags)
-
-    def focusOutEvent(self, event):
-        # needed ?
-        self.setFocus(True)
-        self.activateWindow()
-        self.raise_()
-        self.show()
-
     def accept(self):
         """
         final step in the wizard.
@@ -246,11 +247,14 @@ class FirstRunWizard(QtGui.QWizard):
         if cb and callable(cb):
             self.success_cb()
 
-    def get_provider_by_index(self):
-        provider = self.field('provider_index')
-        return self.providers[provider]
+    # misc helpers
 
     def get_random_str(self, n):
+        """
+        returns a random string
+        :param n: the length of the desired string
+        :rvalue: str
+        """
         from string import (ascii_uppercase, ascii_lowercase, digits)
         from random import choice
         return ''.join(choice(
@@ -258,6 +262,24 @@ class FirstRunWizard(QtGui.QWizard):
             ascii_lowercase +
             digits) for x in range(n))
 
+    def set_providerconfig(self, providerconfig):
+        """
+        sets a providerconfig attribute
+        used when we fetch and parse a json configuration
+        """
+        self.providerconfig = providerconfig
+
+    def get_provider_by_index(self):  # pragma: no cover
+        """
+        returns the value of a provider given its index.
+        this was used in the select provider page,
+        in the case where we were preseeding providers in a combobox
+        """
+        # Leaving it here for the moment when we go back at the
+        # option of preseeding with known provider values.
+        provider = self.field('provider_index')
+        return self.providers[provider]
+
 
 if __name__ == '__main__':
     # standalone test