Merge lp:~elopio/ubuntuone-testing/open-photos-tab into lp:ubuntuone-testing

[Leo Arias]

Added the test open photos tab.

Added the test open photos tab.

[Philip Fibiger (pfibiger)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The prerequisite https://code.launchpad.net/~elopio/ubuntuone-testing/smoke-test has not yet been merged into https://code.launchpad.net/~ubuntuone-hackers/ubuntuone-testing/trunk.

=== added file 'ubuntuone/web/tests/sst/photos/u1webp12_openphotostab.py'
--- ubuntuone/web/tests/sst/photos/u1webp12_openphotostab.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/web/tests/sst/photos/u1webp12_openphotostab.py	2012-07-15 05:33:18 +0000
@@ -0,0 +1,23 @@
+# -*- 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 sst.actions import *
+import actions.setup as setup_actions
+import actions.photos as photos_actions
+
+setup_actions.setup(new_user=False)
+photos_actions.click_photos_tab()
+photos_actions.assert_page_title()

=== modified file 'ubuntuone/web/tests/sst/shared/actions/photos.py'
--- ubuntuone/web/tests/sst/shared/actions/photos.py	2012-06-19 20:48:33 +0000
+++ ubuntuone/web/tests/sst/shared/actions/photos.py	2012-07-15 05:33:18 +0000
@@ -26,12 +26,28 @@
 
 
 def open():
-    """ Open the photos page and assert it's title. """
-    click_link(_get_photos_link())
+    click_photos_tab()
     switch_to_window()
     assert_page_title()
 
 
+def click_photos_tab():
+    click_link(_get_photos_tab_link())
+
+
+def _get_photos_tab_link():
+    return get_element_by_css('#main-nav .photos')
+
+
+def assert_page_title():
+    assert_title(u'Ubuntu One : Photos')
+
+
+def _assert_page_heading1(folder_name):
+    heading1_element = get_element(tag='h1')
+    assert_text(heading1_element, folder_name)
+
+
 def _get_md5(filename):
     """ get md5 checksum of file 'filename'. """
     m = hashlib.md5()
@@ -41,10 +57,6 @@
     return m.digest()
 
 
-def _get_photos_link():
-    return get_element_by_css('#main-nav .photos')
-
-
 def _get_photo_folder(folder_name):
     return get_element(title="~/Ubuntu One/%(name)s" %
                 {'name': folder_name})
@@ -117,11 +129,6 @@
     return folders
 
 
-def assert_page_title():
-    """Assert that the title of the page is the expected."""
-    assert_title(u'Ubuntu One : Photos')
-
-
 def assert_photo_is_displayed_on_gallery(photo_name):
     """ Assert that the photo appears in the gallery. """
     _get_photo_in_gallery(photo_name)

=== modified file 'ubuntuone/web/tests/sst/shared/actions/setup.py'
--- ubuntuone/web/tests/sst/shared/actions/setup.py	2012-07-15 05:33:18 +0000
+++ ubuntuone/web/tests/sst/shared/actions/setup.py	2012-07-15 05:33:18 +0000
@@ -78,7 +78,7 @@
 
 def _get_user_and_login_or_sign_up(new_user, user):
     if user is None:
-        user = _get_user_from_configuration(new_user)
+        user = _get_user(new_user)
     _login_or_sign_up(new_user, user)
     dashboard_actions.wait_for_page_to_load()
     header_actions.assert_login(user.full_name)