Merge lp:~artmello/gallery-app/gallery-app-fix_1613816 into lp:gallery-app

[Arthur Mello]

Fix how autopilot tests select media entries from Organic media view

Fix how autopilot tests select media entries from Organic media view

[system-apps-ci-bot (system-apps-ci-bot)]

PASSED: Continuous integration, rev:1326
https://jenkins.canonical.com/system-apps/job/lp-gallery-app-ci/11/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/1235
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/264
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1235
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/1107
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/1107
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/1107
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1094
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1094/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1094
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1094/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1094
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1094/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1094
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1094/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1094
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1094/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1094
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1094/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1094
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1094/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1094
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1094/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1094
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1094/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-gallery-app-ci/11/rebuild

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/gallery_app/emulators/media_selector.py'
--- tests/autopilot/gallery_app/emulators/media_selector.py	2016-02-12 21:53:45 +0000
+++ tests/autopilot/gallery_app/emulators/media_selector.py	2016-08-18 04:09:35 +0000
@@ -21,17 +21,11 @@
     def get_second_photo(self):
         """Return the second photo item"""
         selector = self.get_media_selector()
-
         # get the first row in the selector
-        mediaRow = selector.wait_select_single(objectName="mediaSelectorList0")
-
-        # get the loader for the second item
-        thumbnailLoader = mediaRow.wait_select_single(
-            objectName="thumbnailLoader1")
-
+        events = self.app.select_many('OrganicMediaList')
+        photos = events[0].select_many( 'QQuickItem', objectName='eventPhoto')
         # return the item itself
-        return thumbnailLoader.wait_select_single(objectName="eventPhoto",
-                                                  thumbnailLoaded=True)
+        return photos[0]
 
     def ensure_fully_open(self):
         """Ensure media selector is fully open"""

=== modified file 'tests/autopilot/gallery_app/tests/test_events_view.py'
--- tests/autopilot/gallery_app/tests/test_events_view.py	2016-03-07 20:20:03 +0000
+++ tests/autopilot/gallery_app/tests/test_events_view.py	2016-08-18 04:09:35 +0000
@@ -130,8 +130,8 @@
         self.assertThat(lambda: exists(self.sample_jpg_files[3]),
                         Eventually(Equals(True)))
         self.enable_select_mode()
-        self.events_view.select_photo(self.sample_jpg_files[2])
-        self.events_view.select_photo(self.sample_jpg_files[3])
+        self.events_view.select_photo(self.sample_jpg_files[2], 1)
+        self.events_view.select_photo(self.sample_jpg_files[3], 0)
         self.main_view.get_header().click_action_button("shareButton")
         share_picker = self.events_view.get_share_peer_picker()
         self.assertThat(share_picker.visible, Eventually(Equals(True)))