Merge lp:~elopio/ubuntuone-testing/update-h into lp:ubuntuone-testing

[Leo Arias]

Updated the locators that used headings.
Updated the plans messages.

Updated the locators that used headings.
Updated the plans messages.

[Rick McBride (rmcbride)]

+1
also nicely done on the handling of december

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The prerequisite lp:~elopio/ubuntuone-testing/stabilize-notes has not yet been merged into lp:ubuntuone-testing.

=== modified file 'ubuntuone/web/tests/sst/shared/actions/dashboard.py'
--- ubuntuone/web/tests/sst/shared/actions/dashboard.py	2011-12-13 23:05:13 +0000
+++ ubuntuone/web/tests/sst/shared/actions/dashboard.py	2012-02-02 01:29:19 +0000
@@ -37,4 +37,4 @@
     assert_text(_get_welcome_element(), 'Hi %s! Welcome Back' % user_full_name)
     
 def _get_welcome_element():
-    return get_element_by_css('header > hgroup > h1')
+    return get_element_by_css('h1')
 
=== modified file 'ubuntuone/web/tests/sst/shared/actions/music.py'
--- ubuntuone/web/tests/sst/shared/actions/music.py	2012-01-25 17:52:50 +0000
+++ ubuntuone/web/tests/sst/shared/actions/music.py	2012-02-02 01:29:19 +0000
@@ -102,7 +102,7 @@
     return song_row_element.get_attribute('data-u1m-songid')
 
 def assert_player_title(number_of_song, total_songs):
-    player_title_element = get_element_by_css('.player > h1')
+    player_title_element = get_element_by_css('.player > h2')
     expected_title = 'Now playing %d of %d songs' \
                      % (number_of_song, total_songs)
     assert expected_title == player_title_element.text
 
=== modified file 'ubuntuone/web/tests/sst/shared/actions/services.py'
--- ubuntuone/web/tests/sst/shared/actions/services.py	2011-12-09 18:19:11 +0000
+++ ubuntuone/web/tests/sst/shared/actions/services.py	2012-02-02 01:29:19 +0000
@@ -43,7 +43,7 @@
 
 def assert_free_service_information():
     """Assert that the information about the free service is the expected."""
-    get_element(tag='h1', text='Free')
+    get_element(tag='h2', text='Free')
     get_element(tag='li', text='File sync across platforms')
     get_element(tag='li', text='Share folders and files')
     get_element(tag='li', text='Access on your mobile')
@@ -53,9 +53,7 @@
     the expected.
 
     """
-    # TODO there are two Music Streaming elements. We should use xpath to be
-    # sure that we are on the right section.
-    #get_element(tag='h1', text='Music Streaming')
+    get_element(tag='h2', text='Music Streaming')
     get_element(css_class='try-free', text='Try for FREE')
     get_element(tag='li', text='Music streaming on your mobile')
     get_element(tag='li', text='20 GB of Storage for all your data')
@@ -67,14 +65,14 @@
     expected.
 
     """
-    get_element(tag='h1', text='Storage')
+    get_element(tag='h2', text='Storage')
     get_element(tag='li', text='20 GB')
     get_element(tag='li', text='$2.99 / month')
     get_element(tag='li', text='or $29.99 / year')
 
 def assert_discount_information():
     """Assert that the yearly discount information is the expected."""
-    get_element(tag='h1', text='Discount')
+    get_element(tag='h3', text='Discount')
     get_element(tag='p', text='Two months free on Music Streaming and Storage '
                               'when you sign up for 12 months')
 
 
=== modified file 'ubuntuone/web/tests/sst/shared/utils/paymentperiods.py'
--- ubuntuone/web/tests/sst/shared/utils/paymentperiods.py	2011-12-14 00:00:56 +0000
+++ ubuntuone/web/tests/sst/shared/utils/paymentperiods.py	2012-02-02 01:29:19 +0000
@@ -20,15 +20,17 @@
 
 def get_monthly_expiration_date():
     today = _get_today()
+    next_month = None
     if today.month != 12:
-        return today.replace(month=today.month + 1)
+        next_month = today.replace(month=today.month + 1)
     else:
-        return today.replace(month=1, year=today.year + 1)
+        next_month = today.replace(month=1, year=today.year + 1)
+    return next_month + timedelta(days=1)
     
 def get_yearly_expiration_date():
     today = _get_today()
     expiration_date = today.replace(year = today.year + 1)
-    return expiration_date + timedelta(days=1)
+    return expiration_date
 
 def get_trial_expiration_date():
     today = _get_today()