diff options
Diffstat (limited to 'src/leap/gui/tests')
| -rw-r--r-- | src/leap/gui/tests/test_firstrun_login.py | 2 | ||||
| -rw-r--r-- | src/leap/gui/tests/test_firstrun_providerselect.py | 8 | ||||
| -rw-r--r-- | src/leap/gui/tests/test_firstrun_register.py | 6 | ||||
| -rw-r--r-- | src/leap/gui/tests/test_firstrun_wizard.py | 8 |
4 files changed, 13 insertions, 11 deletions
diff --git a/src/leap/gui/tests/test_firstrun_login.py b/src/leap/gui/tests/test_firstrun_login.py index fa800c23..6c45b8ef 100644 --- a/src/leap/gui/tests/test_firstrun_login.py +++ b/src/leap/gui/tests/test_firstrun_login.py @@ -100,7 +100,7 @@ class RegisterUserPageUITestCase(qunittest.TestCase): pages = OrderedDict(( (self.pagename, TestPage), ('providersetupvalidation', - firstrun.regvalidation.RegisterUserValidationPage))) + firstrun.connect.ConnectionPage))) self.wizard = firstrun.wizard.FirstRunWizard(None, pages_dict=pages) self.page = self.wizard.page(self.wizard.get_page_index(self.pagename)) diff --git a/src/leap/gui/tests/test_firstrun_providerselect.py b/src/leap/gui/tests/test_firstrun_providerselect.py index 976c68cd..18d89010 100644 --- a/src/leap/gui/tests/test_firstrun_providerselect.py +++ b/src/leap/gui/tests/test_firstrun_providerselect.py @@ -61,9 +61,11 @@ class SelectProviderPageLogicTestCase(qunittest.TestCase): checks = [x for x in self.page._do_checks()] eq(len(checks), 5) labels = [str(x) for (x, y), z in checks] - eq(labels, ['head_sentinel', 'checking domain name', - 'checking https connection', - 'fetching provider info', 'end_sentinel']) + eq(labels, ['head_sentinel', + 'Checking if it is a valid provider', + 'Checking for a secure connection', + 'Getting info from the provider', + 'end_sentinel']) progress = [y for (x, y), z in checks] eq(progress, [0, 20, 40, 80, 100]) diff --git a/src/leap/gui/tests/test_firstrun_register.py b/src/leap/gui/tests/test_firstrun_register.py index 3447fe9d..9d62f808 100644 --- a/src/leap/gui/tests/test_firstrun_register.py +++ b/src/leap/gui/tests/test_firstrun_register.py @@ -78,7 +78,7 @@ class RegisterUserPageLogicTestCase(qunittest.TestCase): eq(len(checks), 3) labels = [str(x) for (x, y), z in checks] eq(labels, ['head_sentinel', - 'registering with provider', + 'Registering username', 'end_sentinel']) progress = [y for (x, y), z in checks] eq(progress, [0, 40, 100]) @@ -112,8 +112,8 @@ class RegisterUserPageUITestCase(qunittest.TestCase): self.pagename = "signup" pages = OrderedDict(( (self.pagename, TestPage), - ('signupvalidation', - firstrun.regvalidation.RegisterUserValidationPage))) + ('connect', + firstrun.connect.ConnectionPage))) self.wizard = firstrun.wizard.FirstRunWizard(None, pages_dict=pages) self.page = self.wizard.page(self.wizard.get_page_index(self.pagename)) diff --git a/src/leap/gui/tests/test_firstrun_wizard.py b/src/leap/gui/tests/test_firstrun_wizard.py index 091cd932..395604d3 100644 --- a/src/leap/gui/tests/test_firstrun_wizard.py +++ b/src/leap/gui/tests/test_firstrun_wizard.py @@ -29,8 +29,8 @@ PAGES_DICT = dict(( ('providersetupvalidation', firstrun.providersetup.ProviderSetupValidationPage), ('signup', firstrun.register.RegisterUserPage), - ('signupvalidation', - firstrun.regvalidation.RegisterUserValidationPage), + ('connect', + firstrun.connect.ConnectionPage), ('lastpage', firstrun.last.LastPage) )) @@ -94,7 +94,7 @@ class FirstRunWizardTestCase(qunittest.TestCase): calls = [call("FirstRunWizardDone", True), call("provider_domain", "testprovider"), call("remember_user_and_pass", True), - call("eip_username", "testuser@testprovider"), + call("username", "testuser@testprovider"), call("testprovider_seed", RANDOMSTR)] mqs().setValue.assert_has_calls(calls, any_order=True) @@ -113,7 +113,7 @@ class FirstRunWizardTestCase(qunittest.TestCase): # remember it's implemented as an ordered dict pagenames = ('intro', 'providerselection', 'login', 'providerinfo', - 'providersetupvalidation', 'signup', 'signupvalidation', + 'providersetupvalidation', 'signup', 'connect', 'lastpage') eq = self.assertEqual w = self.wizard |