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

[Leo Arias]

Added the actions for the Add Storage page. Fixes lp:1017525

Added the actions for the Add Storage page. Fixes lp:1017525.

Unmerged revisions

=== modified file 'ubuntuone/web/tests/sst/payments/u1webp001_paymusicstreaming.py'
--- ubuntuone/web/tests/sst/payments/u1webp001_paymusicstreaming.py	2012-03-27 19:04:46 +0000
+++ ubuntuone/web/tests/sst/payments/u1webp001_paymusicstreaming.py	2012-06-25 14:42:24 +0000
@@ -28,6 +28,7 @@
 import actions.payment as payment_actions
 import actions.payment_confirmed as payment_confirmed_actions
 
+skip('This test must be updated for Ubuntu Pay.')
 if ENVIRONMENT == 'production':
     skip('Can\'t test payments on production.')
 setup_actions.setup(new_user=True)

=== modified file 'ubuntuone/web/tests/sst/payments/u1webp002_payadditionalstorage.py'
--- ubuntuone/web/tests/sst/payments/u1webp002_payadditionalstorage.py	2012-03-27 19:04:46 +0000
+++ ubuntuone/web/tests/sst/payments/u1webp002_payadditionalstorage.py	2012-06-25 14:42:24 +0000
@@ -27,6 +27,7 @@
 import actions.payment as payment_actions
 import actions.payment_confirmed as payment_confirmed_actions
 
+skip('This test must be updated for Ubuntu Pay.')
 setup_actions.setup(new_user=True)
 services_actions.open()
 services_actions.buy_extra_storage()

=== modified file 'ubuntuone/web/tests/sst/payments/u1webp003_paywithrefusedcard.py'
--- ubuntuone/web/tests/sst/payments/u1webp003_paywithrefusedcard.py	2012-03-27 19:04:46 +0000
+++ ubuntuone/web/tests/sst/payments/u1webp003_paywithrefusedcard.py	2012-06-25 14:42:24 +0000
@@ -27,6 +27,7 @@
 import actions.payment as payment_actions
 import actions.payment_confirmed as payment_confirmed_actions
 
+skip('This test must be updated for Ubuntu Pay.')
 if ENVIRONMENT == 'production':
     skip('Can\'t test payments on production.')
 setup_actions.setup()

=== modified file 'ubuntuone/web/tests/sst/services/u1webse004_choosestorageamount.py'
--- ubuntuone/web/tests/sst/services/u1webse004_choosestorageamount.py	2012-03-27 19:04:46 +0000
+++ ubuntuone/web/tests/sst/services/u1webse004_choosestorageamount.py	2012-06-25 14:42:24 +0000
@@ -1,10 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Authors: 
-#     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
@@ -26,6 +22,7 @@
 
 setup_actions.setup()
 services_actions.open()
+services_actions.click_add_extra_storage()
 services_actions.assert_storage(1)
 services_actions.increase_storage_quantity()
 services_actions.assert_storage(2)

=== modified file 'ubuntuone/web/tests/sst/services/u1webse005_addmonthlystorage.py'
--- ubuntuone/web/tests/sst/services/u1webse005_addmonthlystorage.py	2012-03-27 19:04:46 +0000
+++ ubuntuone/web/tests/sst/services/u1webse005_addmonthlystorage.py	2012-06-25 14:42:24 +0000
@@ -1,10 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Authors: 
-#     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,7 +23,6 @@
 
 setup_actions.setup()
 services_actions.open()
-services_actions.set_storage_quantity(5)
-services_actions.buy_extra_storage_monthly()
+services_actions.buy_extra_storage_monthly(5)
 payment_actions.assert_page_title()
 payment_actions.assert_monthly_extra_storage_subscription(5)

=== modified file 'ubuntuone/web/tests/sst/services/u1webse006_addannuallystorage.py'
--- ubuntuone/web/tests/sst/services/u1webse006_addannuallystorage.py	2012-03-27 19:04:46 +0000
+++ ubuntuone/web/tests/sst/services/u1webse006_addannuallystorage.py	2012-06-25 14:42:24 +0000
@@ -1,10 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Authors: 
-#     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,7 +23,6 @@
 
 setup_actions.setup()
 services_actions.open()
-services_actions.set_storage_quantity(5)
-services_actions.buy_extra_storage_yearly()
+services_actions.buy_extra_storage_yearly(5)
 payment_actions.assert_page_title()
 payment_actions.assert_annually_extra_storage_subscription(5)

=== modified file 'ubuntuone/web/tests/sst/shared/actions/services.py'
--- ubuntuone/web/tests/sst/shared/actions/services.py	2012-06-01 16:09:57 +0000
+++ ubuntuone/web/tests/sst/shared/actions/services.py	2012-06-25 14:42:24 +0000
@@ -1,10 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Authors: 
-#     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
@@ -72,29 +68,72 @@
     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')
+    get_element(tag='li', text='$29.99 / year')
 
 def assert_discount_information():
     """Assert that the yearly discount information is the expected."""
-    get_element(tag='h3', text='Discount')
+    get_element(tag='h2', text='Discount')
     get_element(tag='p', text='Two months free on Music Streaming and Storage '
                               'when you sign up for 12 months')
 
 def buy_music_streaming_monthly():
     """Buy the monthly music streaming service."""
+    _click_add_music_streaming()
+    _select_music_streaming_monthly()
+    _click_next_checkout_button()
+
+def _click_add_music_streaming():
+    add_music_streaming_link = get_element(text='Add Music Streaming')
+    click_link(add_music_streaming_link)
+
+def _select_music_streaming_monthly():
     set_radio_value('ms1')
-    click_button(get_elements(css_class='buy-now',
-                              text='Buy now and go to checkout')[0])
+
+def _click_next_checkout_button():
+    next_checkout_button = get_element(text='Next-checkout')
+    click_button(next_checkout_button)
 
 def buy_music_streaming_yearly():
     """Buy the yearly music streaming service."""
+    _click_add_music_streaming()
+    _select_music_streaming_yearly()
+    _click_next_checkout_button()
+
+def _select_music_streaming_yearly():
     set_radio_value('ms2')
-    buy_music_streaming()
-
-def buy_music_streaming():
-    """Click the button to buy the music streaming service."""
-    click_button(get_elements(css_class='buy-now',
-                              text='Buy now and go to checkout')[0])
+
+def buy_extra_storage_monthly(quantity):
+    """Buy the monthly extra storage service."""
+    click_add_extra_storage()
+    set_storage_quantity(quantity)
+    _select_extra_storage_montly()
+    _click_next_checkout_button()
+
+def click_add_extra_storage():
+    add_extra_storage_link = get_element(text='Add extra Storage')
+    click_link(add_extra_storage_link)
+
+def set_storage_quantity(quantity):
+    """Set the storage quantity to buy.
+    
+    Keyword arguments: 
+    quantity -- The quantity to buy.   
+
+    """
+    write_textfield('qty', str(quantity))
+
+def _select_extra_storage_montly():
+    set_radio_value('st1')
+
+def buy_extra_storage_yearly(quantity):
+    """Buy the yearly extra storage service."""
+    click_add_extra_storage()
+    set_storage_quantity(quantity)
+    _select_extra_storage_yearly()
+    _click_next_checkout_button()
+
+def _select_extra_storage_yearly():
+    set_radio_value('st2')
 
 def assert_storage(quantity):
     """Asert the storage quantity selected and its space and price. 
@@ -117,27 +156,3 @@
 def decrease_storage_quantity():
     """Click the button that decreases the storage quantity to buy."""
     click_button('minus_qty')
-
-def set_storage_quantity(quantity):
-    """Set the storage quantity to buy.
-    
-    Keyword arguments: 
-    quantity -- The quantity to buy.   
-
-    """
-    write_textfield('qty', str(quantity))
-    
-def buy_extra_storage_monthly():
-    """Buy the monthly extra storage service."""
-    set_radio_value('st1')
-    buy_extra_storage()
-
-def buy_extra_storage_yearly():
-    """Buy the yearly extra storage service."""
-    set_radio_value('st2')
-    buy_extra_storage()
-
-def buy_extra_storage():
-    """Click the button to buy extra storage."""
-    click_button(get_elements(css_class='buy-now',
-                              text='Buy now and go to checkout')[1])