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

[Leo Arias]

Updated the logout test.

Updated the logout test.

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

131. By Leo Arias on 2012-08-14

Corrected the copyright years.

Unmerged revisions

=== renamed file 'ubuntuone/web/tests/sst/session/u1webs003_logout.py' => 'ubuntuone/web/tests/sst/session/u1webs9_logout.py'
--- ubuntuone/web/tests/sst/session/u1webs003_logout.py	2011-11-15 06:38:57 +0000
+++ ubuntuone/web/tests/sst/session/u1webs9_logout.py	2012-08-14 16:26:25 +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
@@ -14,18 +14,15 @@
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Test case u1webs-003 Log out.
-Log out from the website.
-
-"""
-
 from sst.actions import *
 import actions.setup as setup_actions
 import actions.header as header_actions
 import actions.sso as sso_actions
+from config import environment
 
 setup_actions.setup()
 header_actions.logout()
 sso_actions.assert_logout()
 sso_actions.return_to_site()
+assert_url(environment.get_environment().url)
 header_actions.assert_logout()

=== modified file 'ubuntuone/web/tests/sst/shared/actions/sso.py'
--- ubuntuone/web/tests/sst/shared/actions/sso.py	2011-12-18 05:00:51 +0000
+++ ubuntuone/web/tests/sst/shared/actions/sso.py	2012-08-14 16:26:25 +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
@@ -39,6 +35,7 @@
     write_textfield('id_password', user.password)
     click_button(get_element(css_class='btn', name='continue'), wait=False)
 
+
 def create_new_account(user):
     click_link(get_element(href='+new_account'))
     wait_for(assert_title, 'Create account')
@@ -48,14 +45,17 @@
     write_textfield('id_passwordconfirm', user.password)
     click_button(get_element(name='continue'))
 
+
 def confirm_email(confirmation_code):
     write_textfield(get_element(name='confirmation_code'), confirmation_code)
     click_button(get_element(css_class='btn', text='Continue'))
 
+
 def assert_logout():
     assert_title('You have been logged out')
     assert_text(get_element(tag='h1', css_class='main'),
             'You have been logged out')
 
+
 def return_to_site():
     click_link(get_element_by_css('.returnto a'))

=== modified file 'ubuntuone/web/tests/sst/shared/data/environment.py'
--- ubuntuone/web/tests/sst/shared/data/environment.py	2012-08-14 16:26:24 +0000
+++ ubuntuone/web/tests/sst/shared/data/environment.py	2012-08-14 16:26:25 +0000
@@ -14,15 +14,15 @@
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-base_urls = {'staging': 'https://staging.one.ubuntu.com',
-             'edge': 'https://edge.one.ubuntu.com',
-             'production': 'https://one.ubuntu.com'}
-sso_urls = {'staging': 'https://loging.staging.ubuntu.com',
-            'edge': 'https://loging.ubuntu.com',
-            'production': 'https://loging.ubuntu.com'}
-files_urls = {'staging': 'https://staging.one.ubuntu.com',
-              'edge': 'https://edge.one.ubuntu.com',
-              'production': 'https://one.ubuntu.com'}
+base_urls = {'staging': 'https://staging.one.ubuntu.com/',
+             'edge': 'https://edge.one.ubuntu.com/',
+             'production': 'https://one.ubuntu.com/'}
+sso_urls = {'staging': 'https://loging.staging.ubuntu.com/',
+            'edge': 'https://loging.ubuntu.com/',
+            'production': 'https://loging.ubuntu.com/'}
+files_urls = {'staging': 'https://staging.one.ubuntu.com/',
+              'edge': 'https://edge.one.ubuntu.com/',
+              'production': 'https://one.ubuntu.com/'}
 
 class Environment: