Merge lp:~elopio/ubuntuone-testing/open-tos-second-bottom into lp:ubuntuone-testing

[Leo Arias]

Added the test to open the Terms of service page from the second bottom menu.

Added the test to open the Terms of service page from the second bottom menu.
A little refactoring on the other Terms of Service test.

[Vincent Ladeuil (vila)]

review: Approve

=== modified file 'ubuntuone/web/tests/sst/shared/actions/terms_of_service.py'
--- ubuntuone/web/tests/sst/shared/actions/terms_of_service.py	2012-08-16 14:30:41 +0000
+++ ubuntuone/web/tests/sst/shared/actions/terms_of_service.py	2012-08-16 14:30:41 +0000
@@ -24,6 +24,25 @@
     return get_element_by_css('.copyright-privacy a[href="/terms/"]')
 
 
+def click_terms_of_service_second_bottom_menu_link():
+    click_link(_get_terms_of_service_second_bottom_menu_link())
+
+
+def _get_terms_of_service_second_bottom_menu_link():
+    return get_element_by_css('.sec h3 a[href="/terms/"]')
+
+
+def assert_page():
+    assert_page_url()
+    assert_page_title()
+    assert_page_heading1()
+    
+
+def assert_page_url():
+    base_url = get_base_url()
+    assert_url(base_url + 'terms/')
+
+
 def assert_page_title():
     assert_title(u'Ubuntu One : Terms and Conditions')
 

=== renamed file 'ubuntuone/web/tests/sst/termsofservice/u1webtos_opentermsofservicepagefromfooter.py' => 'ubuntuone/web/tests/sst/termsofservice/u1webtos124_opentermsofservicepagefromfooter.py'
--- ubuntuone/web/tests/sst/termsofservice/u1webtos_opentermsofservicepagefromfooter.py	2012-08-16 14:30:41 +0000
+++ ubuntuone/web/tests/sst/termsofservice/u1webtos124_opentermsofservicepagefromfooter.py	2012-08-16 14:30:41 +0000
@@ -20,5 +20,4 @@
 
 setup_actions.setup(login_or_sign_up=False)
 terms_of_service_actions.click_terms_of_service_footer_link()
-terms_of_service_actions.assert_page_title()
-terms_of_service_actions.assert_page_heading1()
+terms_of_service_actions.assert_page()

=== added file 'ubuntuone/web/tests/sst/termsofservice/u1webtos126_opentermsofservicepagefromsecondbottommenu.py'
--- ubuntuone/web/tests/sst/termsofservice/u1webtos126_opentermsofservicepagefromsecondbottommenu.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/web/tests/sst/termsofservice/u1webtos126_opentermsofservicepagefromsecondbottommenu.py	2012-08-16 14:30:41 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 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
+# 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/>.
+
+from actions import (
+    setup,
+    terms_of_service,
+    )
+
+setup.setup(login_or_sign_up=False)
+terms_of_service.click_terms_of_service_second_bottom_menu_link()
+terms_of_service.assert_page()