Merge lp:~phablet-team/gallery-app/delete-album-on-cancel-add into lp:gallery-app

[Ugo Riboni]

Delete the new empty album if the album editor is closed by clicking outside of the album cover

Delete the new empty album if the album editor is closed by clicking outside of the album cover

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1103
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1060/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-amd64-ci/235
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/235
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/235/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-i386-ci/235
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/481
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4053
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/624
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/801
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14577
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3419
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4382
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4382/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/1060/rebuild

review: Needs Fixing (continuous-integration)

[Arthur Mello (artmello)]

lgtm.

review: Approve

=== modified file 'rc/qml/AlbumEditor/AlbumEditor.qml'
--- rc/qml/AlbumEditor/AlbumEditor.qml	2014-09-06 21:08:57 +0000
+++ rc/qml/AlbumEditor/AlbumEditor.qml	2014-10-13 10:33:43 +0000
@@ -132,7 +132,7 @@
     onWidthChanged: resetEditorRect()
     onHeightChanged: resetEditorRect()
 
-    AlbumCollectionModel {
+    property AlbumCollectionModel model: AlbumCollectionModel {
         id: albumModel
     }
 
 
=== modified file 'rc/qml/AlbumEditor/AlbumEditorAnimated.qml'
--- rc/qml/AlbumEditor/AlbumEditorAnimated.qml	2014-05-19 13:28:40 +0000
+++ rc/qml/AlbumEditor/AlbumEditorAnimated.qml	2014-10-13 10:33:43 +0000
@@ -71,6 +71,10 @@
 
                 onCloseRequested: {
                     root.isOpen = false;
+                    if (album && album.newAlbum && album.containedCount == 0) {
+                        inner_albumEditor.model.destroyAlbum(album);
+                        album = null;
+                    }
                     if (album) {
                         inner_albumEditorTransition.exitEditor(album, root.origin);
                     } else {
 
=== modified file 'tests/autopilot/gallery_app/tests/test_albums_view.py'
--- tests/autopilot/gallery_app/tests/test_albums_view.py	2014-08-27 02:41:33 +0000
+++ tests/autopilot/gallery_app/tests/test_albums_view.py	2014-10-13 10:33:43 +0000
@@ -68,8 +68,10 @@
 
     def test_add_album_and_cancel(self):
         """Add one album, cancel it and checks if the number of albums does
-        not change
+        not change. Do this in the two different ways we have to cancel editing.
         """
+
+        # Cancel by pressing back in the header
         albums = self.albums_view.number_of_albums_in_albums_view()
         self.main_view.get_header().click_action_button("addButton")
         editor = self.app.select_single(album_editor.AlbumEditor)
@@ -80,6 +82,17 @@
             Eventually(Equals(albums))
         )
 
+        # Cancel by clicking outside of the album cover
+        self.main_view.get_header().click_action_button("addButton")
+        editor = self.app.select_single(album_editor.AlbumEditor)
+        editor.ensure_fully_open()
+        editor.close()
+
+        self.assertThat(
+            lambda: self.albums_view.number_of_albums_in_albums_view(),
+            Eventually(Equals(albums))
+        )
+
     # Check if Camera Button is not visible at Desktop mode
     def test_camera_button_visible(self):
         cameraButtonVisible = self.check_header_button_exist("cameraButton")