From cab44227c133af60a31f1988939cbeca5a865efd Mon Sep 17 00:00:00 2001 From: Tulio Casagrande Date: Wed, 12 Apr 2017 17:14:51 -0300 Subject: [#927] Confirm email with the recovery code with @deniscostadsc --- service/test/functional/features/environment.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'service/test/functional/features/environment.py') diff --git a/service/test/functional/features/environment.py b/service/test/functional/features/environment.py index f1cc0e44..efc86801 100644 --- a/service/test/functional/features/environment.py +++ b/service/test/functional/features/environment.py @@ -52,12 +52,14 @@ def before_all(context): if not context.host.startswith('http'): context.host = 'https://{}'.format(context.host) - hostname = urlparse(context.host).hostname - context.signup_url = 'https://{}/signup'.format(hostname) - context.login_url = 'https://mail.{}/login'.format(hostname) - context.backup_account_url = 'https://mail.{}/backup-account'.format(hostname) - context.account_recovery_url = 'https://mail.{}/account-recovery'.format(hostname) + context.hostname = urlparse(context.host).hostname + context.signup_url = 'https://{}/signup'.format(context.hostname) + context.inbox_url = 'https://mail.{}'.format(context.hostname) + context.login_url = 'https://mail.{}/login'.format(context.hostname) + context.backup_account_url = 'https://mail.{}/backup-account'.format(context.hostname) + context.account_recovery_url = 'https://mail.{}/account-recovery'.format(context.hostname) context.username = 'testuser_{}'.format(uuid.uuid4()) + context.user_email = '{}@{}'.format(context.username, context.hostname) if 'localhost' in context.host: _mock_user_agent(context) @@ -70,6 +72,7 @@ def before_all(context): def before_tag(context, tag): if tag == "smoke": context.username = 'testuser_{}'.format(uuid.uuid4()) + context.user_email = '{}@{}'.format(context.username, context.hostname) utils.create_user(context) -- cgit v1.2.3 From ec00906375cd35220ee694264dce9c4ba5cdbcc9 Mon Sep 17 00:00:00 2001 From: Tulio Casagrande Date: Wed, 12 Apr 2017 17:55:14 -0300 Subject: [#927] Add require_user tag with @deniscostadsc --- service/test/functional/features/environment.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'service/test/functional/features/environment.py') diff --git a/service/test/functional/features/environment.py b/service/test/functional/features/environment.py index efc86801..bc2e1283 100644 --- a/service/test/functional/features/environment.py +++ b/service/test/functional/features/environment.py @@ -70,7 +70,7 @@ def before_all(context): def before_tag(context, tag): - if tag == "smoke": + if tag == "require_user": context.username = 'testuser_{}'.format(uuid.uuid4()) context.user_email = '{}@{}'.format(context.username, context.hostname) utils.create_user(context) -- cgit v1.2.3