Merge lp:~elopio/ubuntuone-testing/open-photo into lp:ubuntuone-testing

[Leo Arias]

Added the open photo test.
Updated selenium simple test to use the refresh action.

Added the open photo test.
Updated selenium simple test to use the refresh action.

[Philip Fibiger (pfibiger)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

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

[Ubuntu One Auto Pilot (otto-pilot)]

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

=== modified file 'config-manager.txt'
--- config-manager.txt	2012-02-01 22:57:55 +0000
+++ config-manager.txt	2012-07-16 05:58:24 +0000
@@ -4,4 +4,4 @@
 #   make clean-sourcedeps update-sourcedeps
 #
 
-./sourcecode/selenium-simple-test        bzr+ssh://bazaar.launchpad.net/~canonical-isd-qa/selenium-simple-test/trunk;revno=256
+./sourcecode/selenium-simple-test        bzr+ssh://bazaar.launchpad.net/~canonical-isd-qa/selenium-simple-test/trunk;revno=274

=== added file 'ubuntuone/web/tests/sst/photos/u1webp107_openphoto.py'
--- ubuntuone/web/tests/sst/photos/u1webp107_openphoto.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/web/tests/sst/photos/u1webp107_openphoto.py	2012-07-16 05:58:24 +0000
@@ -0,0 +1,39 @@
+# -*- 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 *
+from os import path, remove
+import actions.setup as setup_actions
+import actions.files as files_actions
+import actions.photos as photos_actions
+from utils.randomphotos import make_random_photo_and_return_path 
+
+setup_actions.setup(new_user=False)
+random_photo_path = make_random_photo_and_return_path()
+files_actions.open()
+files_actions.upload_file(random_photo_path)
+remove(random_photo_path)
+random_photo_name = path.basename(random_photo_path)
+# XXX refresh because there is a bug in edge server.
+# See https://bugs.launchpad.net/ubuntuone-servers/+bug/1007147
+refresh()
+files_actions.assert_file_exists(random_photo_name)
+photos_actions.open()
+photo_id = photos_actions.get_photo_id(random_photo_name)
+photos_actions.open_photo(random_photo_name)
+photos_actions.assert_photo_name_in_gallery(random_photo_name)
+photos_actions.assert_photo_is_present_in_gallery(photo_id)
+photos_actions.assert_photo_is_present_in_gallery_sidebar(photo_id)

=== modified file 'ubuntuone/web/tests/sst/photos/u1webp83_addphoto.py'
--- ubuntuone/web/tests/sst/photos/u1webp83_addphoto.py	2012-07-16 05:58:24 +0000
+++ ubuntuone/web/tests/sst/photos/u1webp83_addphoto.py	2012-07-16 05:58:24 +0000
@@ -20,13 +20,8 @@
 import actions.files as files_actions
 import actions.photos as photos_actions
 from utils.randomphotos import make_random_photo_and_return_path 
-import uuid
-import tempfile
-import numpy
-import Image
 
 setup_actions.setup(new_user=False)
-
 random_photo_path = make_random_photo_and_return_path()
 files_actions.open()
 files_actions.upload_file(random_photo_path)
@@ -34,7 +29,7 @@
 random_photo_name = path.basename(random_photo_path)
 # XXX refresh because there is a bug in edge server.
 # See https://bugs.launchpad.net/ubuntuone-servers/+bug/1007147
-files_actions.open()
+refresh()
 files_actions.assert_file_exists(random_photo_name)
 photos_actions.open()
-photos_actions.assert_photo_present_in_list(random_photo_name)
+photos_actions.assert_photo_is_present_in_list(random_photo_name)

=== modified file 'ubuntuone/web/tests/sst/shared/actions/photos.py'
--- ubuntuone/web/tests/sst/shared/actions/photos.py	2012-07-16 05:58:24 +0000
+++ ubuntuone/web/tests/sst/shared/actions/photos.py	2012-07-16 05:58:24 +0000
@@ -47,14 +47,75 @@
     assert_text(heading1_element, folder_name)
 
 
-def assert_photo_present_in_list(photo_name):
+# List view actions.
+# TODO make sure we are viewing the photo list.
+
+def assert_photo_is_present_in_list(photo_name):
+    photo_link = _get_photo_link_in_list(photo_name)
+    assert_displayed(photo_element)
+
+
+def _get_photo_link_in_list(photo_name):
+    return get_element('.photo-list a[data-u1name="%(name)s"]' 
+        % {'name': photo_name})
+
+
+def get_photo_id(photo_name):
+    photo_link = _get_photo_link_in_list(photo_name)
+    return photo_link.get_attribute('data-u1nodekey')
+
+
+def open_photo(photo_name):
     photo_element = _get_photo_element_in_list(photo_name)
-    assert_displayed(photo_element)
+    click_element(photo_element)
+    # XXX find a better way to wait for the gallery to load.
+    sleep(10)
 
 
 def _get_photo_element_in_list(photo_name):
-    return get_element('.photo-list img.scaled[data-qa-id="%(name)s"]' 
-        % {'name': photo_name})
+   photo_link = _get_photo_link_in_list(photo_name)
+   return photo_link.find_element_by_css_selector('img')
+
+
+# Gallery view actions.
+# TODO make sure we are viewing the photo gallery.
+
+def assert_photo_name_in_gallery(photo_name):
+    heading1_element = get_element_by_css('.title h1')
+    assert_text(heading1_element, photo_name)
+
+def assert_photo_is_present_in_gallery(photo_id):
+    photo_element = _get_photo_element_in_gallery(photo_id)
+    assert_displayed(photo_element)
+
+
+def _get_photo_element_in_gallery(photo_id):
+    photo_css_locator = _get_photo_element_css_locator_in_gallery(photo_id)
+    return get_element_by_css(photo_css_locator)
+
+
+def _get_photo_element_css_locator_in_gallery(photo_id):
+    # TODO take into account staging url.
+    photo_source_url_format = 'https://files.one.ubuntu.com/thumbnail/file_storage/{0}/1000x1000'
+    photo_source_url = photo_source_url_format.format(photo_id)
+    return '.photoset .photo > img[src="{0}"]'.format(photo_source_url)
+
+
+def assert_photo_is_present_in_gallery_sidebar(photo_id):
+    photo_element = _get_photo_element_in_gallery_sidebar(photo_id)
+    assert_displayed(photo_element)
+
+
+def _get_photo_element_in_gallery_sidebar(photo_id):
+    photo_css_locator = _get_photo_element_css_locator_in_gallery_sidebar(photo_id)
+    return get_element_by_css(photo_css_locator)
+
+
+def _get_photo_element_css_locator_in_gallery_sidebar(photo_id):
+    # TODO take into account staging url.
+    photo_source_url_format = 'https://files.one.ubuntu.com/thumbnail/file_storage/{0}/108x108/'
+    photo_source_url = photo_source_url_format.format(photo_id)
+    return '.photoset .sidebar img[src="{0}"]'.format(photo_source_url)
 
 
 def _get_md5(filename):