Merge lp:~elopio/ubuntuone-testing/newaccount into lp:ubuntuone-testing

[Leo Arias]

Added the code for the creation of a new account.
Added a utility module to calculate payments expiration dates.
Fixed a bug with the calculation of the next month of December.
Verify only the first 40 characters of the user name.

Added the code for the creation of a new account.
Added a utility module to calculate payments expiration dates.
Fixed a bug with the calculation of the next month of December.
Verify only the first 40 characters of the user name.

[Rick McBride (rmcbride)]

One change:

I'd like to see the following:

4 + user_email = user_uuid + '@elopio.net'

not include a hard coded value. If we can put the '@elopio.net' bit in config and reference it here, that will be better long term. Otherwise, looks great!

review: Needs Fixing

[lp:~elopio/ubuntuone-testing/newaccount]

63. By Leo Arias on 2011-12-08

Take the new email address server from the config file.

Unmerged revisions

=== modified file 'ubuntuone/web/tests/sst/payments/u1webp002_payadditionalstorage.py'
--- ubuntuone/web/tests/sst/payments/u1webp002_payadditionalstorage.py	2011-11-24 04:58:16 +0000
+++ ubuntuone/web/tests/sst/payments/u1webp002_payadditionalstorage.py	2011-12-08 15:26:27 +0000
@@ -34,7 +34,7 @@
 services_actions.buy_extra_storage()
 payment_actions.assert_title()
 payment_actions.place_order_with_valid_card()
-payment_confirmed_actions.assert_title()
+payment_actions.confirm_payment_details()
 payment_confirmed_actions.assert_processed_payment('annually', 29.99, 29.99)
 payment_confirmed_actions.view_account()
 # TODO move this to the module account actions.

=== modified file 'ubuntuone/web/tests/sst/shared/actions/header.py'
--- ubuntuone/web/tests/sst/shared/actions/header.py	2011-11-15 07:18:27 +0000
+++ ubuntuone/web/tests/sst/shared/actions/header.py	2011-12-08 15:26:27 +0000
@@ -31,7 +31,7 @@
 
 def _assert_full_name(full_name):
     welcome_element = get_element_by_css('#ac-status > span')
-    text_is(welcome_element, 'Welcome %s' % full_name)
+    text_is(welcome_element, 'Welcome %s' % full_name[:40])
 
 def _get_my_account_link():
     return get_element(tag='a', css_class='account', text='My Account')

=== modified file 'ubuntuone/web/tests/sst/shared/actions/payment.py'
--- ubuntuone/web/tests/sst/shared/actions/payment.py	2011-10-25 17:10:29 +0000
+++ ubuntuone/web/tests/sst/shared/actions/payment.py	2011-12-08 15:26:27 +0000
@@ -21,6 +21,7 @@
 
 from datetime import datetime
 from sst.actions import *
+from utils import paymentperiods
 
 def assert_title():
     """Assert that the title of the page is the expected."""
@@ -46,13 +47,13 @@
     get_element(css_class='price', text=price)
     get_element(tag='span', css_class='price', text=price)
     today = datetime.utcnow()
-    next_month = today.replace(month = today.month + 1)
+    trial_expiration_date = paymentperiods.get_trial_expiration_date()
     get_element(tag='p', text='This is a trial subscription which will '
-                              'expire %(next_month)s after which your card '
-                              'will automatically be billed %(price)s '  
+                              'expire %(trial_expiration)s after which your '
+                              'card will automatically be billed %(price)s '  
                               '%(period)s'
-                              % {'next_month':
-                                     next_month.strftime('%B %-d, %Y'),
+                              % {'trial_expiration':
+                                  trial_expiration_date.strftime('%B %-d, %Y'),
                                  'price': price, 'period': period})
 
 def assert_monthly_music_streaming_subscription():
@@ -83,12 +84,11 @@
     if period == 'monthly':
         price_per_add_on = 2.99
         period_alternate = period
-        period_end = today.replace(month = today.month + 1)
+        period_end = paymentperiods.get_monthly_expiration_date()
     elif period == 'annually':
         price_per_add_on = 29.99
         period_alternate = 'yearly'
-        period_end = today.replace(year = today.year + 1, 
-                                   day = today.day + 1)
+        period_end = paymentperiods.get_yearly_expiration_date()
     else:
         # TODO throw an error.                                                 
         pass

=== modified file 'ubuntuone/web/tests/sst/shared/actions/payment_confirmed.py'
--- ubuntuone/web/tests/sst/shared/actions/payment_confirmed.py	2011-10-20 05:24:23 +0000
+++ ubuntuone/web/tests/sst/shared/actions/payment_confirmed.py	2011-12-08 15:26:27 +0000
@@ -21,6 +21,7 @@
 
 from sst.actions import *
 from datetime import datetime
+from utils import paymentperiods
 
 def assert_title():
     """Assert that the title of the page is the expected."""
@@ -45,19 +46,24 @@
     """
     get_element(tag='h1', text='Payment Processed')
     today = datetime.utcnow()
-    if trial or period == 'monthly':
-        expire_date = today.replace(month = today.month + 1)
+    if trial:
+        expire_date = paymentperiods.get_trial_expiration_date()
+    elif period == 'monthly':
+        expire_date = paymentperiods.get_monthly_expiration_date()
     elif period == 'annually':
-        expire_date = today.replace(year = today.year + 1)
+        expire_date = paymentperiods.get_yearly_expiration_date()
     # TODO assert the paid amount.
     # TODO assert payments in euros.
-    get_element(tag='dt', css_class='purchase_details',
-                text='Expires: %(expire_date)s'
-                % {'expire_date': expire_date.strftime('%B %-d, %Y')}) 
+    element_expire_date = _get_purchase_details_data_elements()[0]
+    text_is(element_expire_date, expire_date.strftime('%B %-d, %Y'))
     get_element(tag='p', css_class='explanation',
                 text='Your card will automatically be billed $%(price)s ' \
                      '%(period)s' % {'price': str(price), 'period': period})
-    get_element(tag='dd', text='AUTHORISED')
+    element_payment_status = _get_purchase_details_data_elements()[1]
+    text_is(element_payment_status, 'AUTHORISED')
+
+def _get_purchase_details_data_elements():
+    return get_elements_by_css('dl.purchase_details > dd')
 
 def view_account():
     """Go to the account information page."""

=== modified file 'ubuntuone/web/tests/sst/shared/actions/services.py'
--- ubuntuone/web/tests/sst/shared/actions/services.py	2011-10-07 00:45:14 +0000
+++ ubuntuone/web/tests/sst/shared/actions/services.py	2011-12-08 15:26:27 +0000
@@ -31,6 +31,9 @@
     """Assert that the title of the page is the expected."""
     title_is(u'Ubuntu One : Services')
 
+def agree_and_subscribe_to_free_plan():
+    button_click(get_element(name='subscribe'))
+
 def assert_services_information():
     """Assert that the information about the services is the expected."""
     assert_free_service_information()

=== modified file 'ubuntuone/web/tests/sst/shared/actions/setup.py'
--- ubuntuone/web/tests/sst/shared/actions/setup.py	2011-11-24 04:58:16 +0000
+++ ubuntuone/web/tests/sst/shared/actions/setup.py	2011-12-08 15:26:27 +0000
@@ -1,9 +1,5 @@
 # -*- coding: utf-8 -*-
 
-# Authors:
-#     Rick McBride <[e-mail]>
-#     Leo Arias <[e-mail]>
-#
 # Copyright 2011 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
@@ -22,16 +18,20 @@
 
 from sst.actions import *
 from config import *
+import actions.header as header_actions
+import actions.sso as sso_actions
+import actions.services as services_actions
+import uuid
+from utils import mail
 try:
     from _passwords import full_name, email, password
 except:
     skip('Try adding a _passwords.py file to the shared folder if you ' \
         'expect this to work. Read the README.txt file ;)')
-import actions.header as header_actions
-import actions.sso as sso_actions
+
 
 def setup(new_user=False):
-    """Create new user (optional) and log in to the Ubuntu One website.
+    """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
     start testing.
@@ -45,11 +45,21 @@
     goto()
     waitfor(title_is, 'Ubuntu One : Home')
     header_actions.click_login_or_sign_up()
+    user_name = full_name
+    user_email = email
     if new_user:
-        skip('New user creation is not yet implemented.')
+        user_uuid = str(uuid.uuid1())
+        user_name = 'Test user ' + user_uuid
+        user_email = user_uuid + '@' IMAP_SERVER
+        sso_actions.create_new_account(user_name, user_email, 'Hola123*')
+        confirmation_code  = mail.get_confirmation_code_for_address(user_email)
+        sso_actions.confirm_email(confirmation_code)
     else:
-        sso_actions.login(email, password)
-    header_actions.assert_login(full_name)
+        sso_actions.login(user_email, password)
+    sso_actions.authenticate()
+    if new_user:
+        services_actions.agree_and_subscribe_to_free_plan()
+    header_actions.assert_login(user_name)
 
 def get_base_url():
     base_url = None

=== modified file 'ubuntuone/web/tests/sst/shared/actions/sso.py'
--- ubuntuone/web/tests/sst/shared/actions/sso.py	2011-11-24 04:58:16 +0000
+++ ubuntuone/web/tests/sst/shared/actions/sso.py	2011-12-08 15:26:27 +0000
@@ -38,6 +38,21 @@
     textfield_write('id_email', email)
     textfield_write('id_password', password)
     button_click(get_element(css_class='btn', name='continue'), wait=False)
+
+def create_new_account(full_name, email, password):
+    link_click(get_element(href='+new_account'))
+    waitfor(title_is, 'Create account')
+    textfield_write('id_displayname', full_name)
+    textfield_write('id_email', email)
+    textfield_write('id_password', password)
+    textfield_write('id_passwordconfirm', password)
+    button_click(get_element(name='continue'))
+
+def confirm_email(confirmation_code):
+    textfield_write(get_element(name='confirmation_code'), confirmation_code)
+    button_click(get_element(css_class='btn', text='Continue'))
+
+def authenticate():
     waitfor(title_is, 'Authenticate to %s' % get_base_url())
     waitfor(get_element, tag='body')
     button_click(get_element(css_class='btn', name='yes'))

=== modified file 'ubuntuone/web/tests/sst/shared/config.py'
--- ubuntuone/web/tests/sst/shared/config.py	2011-11-30 22:39:09 +0000
+++ ubuntuone/web/tests/sst/shared/config.py	2011-12-08 15:26:27 +0000
@@ -23,6 +23,11 @@
 #ENVIRONMENT = 'edge'
 #ENVIRONMENT = 'production'
 
+# Email inbox data
+IMAP_SERVER = 'mail.canonical.com'
+IMAP_USERNAME = 'u1test'
+IMAP_PASSWORD = 'password'
+
 # You can overwrite the default configuration setting the variables on
 # the file shared/_local_config.py.
 try:

=== added directory 'ubuntuone/web/tests/sst/shared/utils'
=== added file 'ubuntuone/web/tests/sst/shared/utils/__init__.py'
=== added file 'ubuntuone/web/tests/sst/shared/utils/mail.py'
--- ubuntuone/web/tests/sst/shared/utils/mail.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/web/tests/sst/shared/utils/mail.py	2011-12-08 15:26:27 +0000
@@ -0,0 +1,93 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 2011 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
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Email reading utility copied from ISD test scripts."""
+
+import quopri
+import re
+import imaplib
+import time
+from config import IMAP_SERVER, IMAP_USERNAME, IMAP_PASSWORD
+
+def get_confirmation_code_for_address(email_address):
+    email_msg = get_latest_email_sent_to(email_address)
+    vcode = None
+    if email_msg:
+        # The body is encoded as quoted-printable.  This affects any line
+        # longer than a certain length.  Decode now to not have to worry
+        # about it in the regexen.
+        body = quopri.decodestring(email_msg.get_payload())
+        match = re.search(
+            'Here is your confirmation code:(.*)(Enter|If you made)',
+            body, re.S)
+        if match:
+            vcode = match.group(1).strip()
+        else:
+            raise AssertionError("No verification link found in email.")
+    return vcode
+
+def get_latest_email_sent_to(email_address):
+    with MailBox(IMAP_USERNAME, IMAP_PASSWORD) as mbox:
+        email_msg = mbox.get_latest_email_sent_to(email_address)
+        mbox.delete_msgs_sent_to(email_address)
+        return email_msg
+                            
+class MailBox(object):
+    def __init__(self, user, password):
+        self.user = user
+        self.password = password
+        self.imap = imaplib.IMAP4_SSL(IMAP_SERVER, 993)
+
+    def __enter__(self):
+        self.imap.login(self.user, self.password)
+        return self
+
+    def __exit__(self, type, value, traceback):
+        self.imap.close()
+        self.imap.logout()
+        
+    def get_latest_email_sent_to(self, email_address, timeout=300, poll=1):
+        start_time = time.time()
+        while ((time.time() - start_time) < timeout):
+            # It's no use continuing until we've successfully selected
+            # the inbox. And if we don't select it on each iteration
+            # before searching, we get intermittent failures.
+            status, data = self.imap.select('Inbox')
+            if status != 'OK':
+                time.sleep(poll)
+                continue
+
+            status, data = self.imap.search(None, 'TO', email_address)
+            if status == 'OK':
+                for num in reversed(data[0].split()):
+                    status, data = self.imap.fetch(num, '(RFC822)')
+                    email_msg = email.message_from_string(data[0][1])
+                    return email_msg
+            time.sleep(poll)
+
+        raise AssertionError("No email sent to '%s' found in inbox "
+                             "after polling for %s seconds."
+                             % (email_address, timeout))
+    
+    def delete_msgs_sent_to(self, email_address):
+        self.imap.select('Inbox')
+        status, data = self.imap.search(None, 'TO', email_address)
+        if status == 'OK':
+            for num in reversed(data[0].split()):
+                status, data = self.imap.fetch(num, '(RFC822)')
+                body = data[0][1]
+                self.imap.store(num, '+FLAGS', r'\Deleted')
+        self.imap.expunge()

=== added file 'ubuntuone/web/tests/sst/shared/utils/paymentperiods.py'
--- ubuntuone/web/tests/sst/shared/utils/paymentperiods.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/web/tests/sst/shared/utils/paymentperiods.py	2011-12-08 15:26:27 +0000
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 2011 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
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Utilities to help the calculation of payment periods."""
+
+from datetime import datetime
+
+def get_monthly_expiration_date():
+    today = _get_today()
+    if today.month != 12:
+        return today.replace(month=today.month + 1)
+    else:
+        return today.replace(month=1, year=today.year + 1)
+    
+def get_yearly_expiration_date():
+    today = _get_today()
+    return today.replace(year = today.year + 1)
+
+def get_trial_expiration_date():
+    return get_monthly_expiration_date()
+
+def _get_today():
+    return datetime.utcnow()