Merge lp:~elopio/ubuntuone-testing/fix-payadditionalstorage into lp:ubuntuone-testing

[Leo Arias]

Fixed the expected additional storage space and cleaned the setup code.

Fixed the expected additional storage space.
Cleaned up the setup actions.

[Rick McBride (rmcbride)]

review: Approve

=== modified file 'ubuntuone/web/tests/sst/payments/u1webp002_payadditionalstorage.py'
--- ubuntuone/web/tests/sst/payments/u1webp002_payadditionalstorage.py	2011-12-09 18:18:25 +0000
+++ ubuntuone/web/tests/sst/payments/u1webp002_payadditionalstorage.py	2012-03-21 22:25:18 +0000
@@ -4,7 +4,7 @@
 #     Rick McBride <[e-mail]>
 #     Leo Arias <[e-mail]>
 #
-# Copyright 2011 Canonical Ltd.
+# Copyright 2011-2012 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -27,8 +27,6 @@
 import actions.payment as payment_actions
 import actions.payment_confirmed as payment_confirmed_actions
 
-if ENVIRONMENT == 'production':
-    skip('Can\'t test payments on production.')
 setup_actions.setup(new_user=True)
 services_actions.open()
 services_actions.buy_extra_storage()
@@ -39,4 +37,4 @@
 payment_confirmed_actions.view_account()
 # TODO move this to the module account actions.
 get_element(tag='span', text='5GB with Ubuntu One Free')
-get_element(tag='span', text='100GB from storage add-on')
+get_element(tag='span', text='20GB from storage add-on')

=== modified file 'ubuntuone/web/tests/sst/shared/actions/setup.py'
--- ubuntuone/web/tests/sst/shared/actions/setup.py	2011-12-19 15:35:59 +0000
+++ ubuntuone/web/tests/sst/shared/actions/setup.py	2012-03-21 22:25:18 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2011 Canonical Ltd.
+# Copyright 2011-2012 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -33,40 +33,22 @@
 
 
 def setup(new_user=False, user=None):
-    """Log in to the Ubuntu One website. Optionally, you can create a new user.
-
-    After calling setup, the browser will be in the Dashboard ready to
+    """After calling setup, the browser will be in the Dashboard ready to
     start testing.
 
-    Keyword arguments:
-    new_user -- Indicates if a new user has to be created for the test.
-
     """
+    set_wait_timeout(DEFAULT_TIMEOUT)
+    _go_to_ubuntu_one_home()
+    if user is None:
+        user = _get_user_from_configuration(new_user)
+    _sign_up_or_login(new_user, user)
+    dashboard_actions.wait_for_page_to_load()
+    header_actions.assert_login(user.full_name)
+
+def _go_to_ubuntu_one_home():
     set_base_url(get_base_url())
-    set_wait_timeout(DEFAULT_TIMEOUT)
     go_to()
     wait_for(assert_title, 'Ubuntu One : Home')
-    header_actions.click_login_or_sign_up()
-    test_user = user
-    if new_user:
-        if user is None:
-            user_uuid = str(uuid.uuid1())
-            user_name = 'Test user ' + user_uuid
-            user_email = user_uuid + '@' + IMAP_SERVER
-            user_password = 'Hola123*'
-            test_user = User(user_name, user_email, user_password)
-        sso_actions.create_new_account(test_user)
-        confirmation_code  = \
-            mail.get_confirmation_code_for_address(test_user.email)
-        sso_actions.confirm_email(confirmation_code)
-    else:
-        if user is None:
-            test_user = User(full_name, email, password)
-        sso_actions.login(test_user)
-    if new_user:
-        services_actions.agree_and_subscribe_to_free_plan()
-    dashboard_actions.wait_for_page_to_load()
-    header_actions.assert_login(test_user.full_name)
 
 def get_base_url():
     base_url = None
@@ -79,3 +61,42 @@
     else:
         skip('Unknown environment: %s.' % ENVIRONMENT)
     return base_url
+
+def _sign_up_or_login(new_user, user):
+    if new_user:
+        _sign_up(user)
+    else:
+        _login(user)
+        
+def _get_user_from_configuration(new_user):
+    test_user = None
+    if new_user:
+        test_user = _get_random_user()
+    else:
+        test_user = User(full_name, email, password)
+    return test_user
+
+def _get_random_user():
+    random_user_uuid = str(uuid.uuid1())
+    random_user_name = 'Test user ' + random_user_uuid
+    random_user_email = random_user_uuid + '@' + IMAP_SERVER
+    random_user_password = 'Hola123*'
+    return User(random_user_name, random_user_email, random_user_password)
+
+def _sign_up(user):
+    if ENVIRONMENT == 'production':
+        skip('Can\'t create new users on production.')
+    else:
+        header_actions.click_login_or_sign_up()
+        sso_actions.create_new_account(user)
+        _confirm_email(user.email)
+        services_actions.agree_and_subscribe_to_free_plan()
+
+def _confirm_email(email):
+    confirmation_code  = \
+            mail.get_confirmation_code_for_address(email)
+    sso_actions.confirm_email(confirmation_code)
+
+def _login(user):
+    header_actions.click_login_or_sign_up()
+    sso_actions.login(user)