Merge branch 'master' of git://github.com/gallery/gallery3

1 files changed, 12 insertions, 1 deletions

diff --git a/modules/gallery/tests/Item_Helper_Test.php b/modules/gallery/tests/Item_Helper_Test.php
index 295871a5..4771b11a 100644
--- a/modules/gallery/tests/Item_Helper_Test.php
+++ b/modules/gallery/tests/Item_Helper_Test.php
@@ -54,7 +54,6 @@ class Item_Helper_Test extends Gallery_Unit_Test_Case {
     $this->assert_same($dst_album->id, $photo->parent_id);
   }
 
-
   public function move_updates_album_covers_test() {
     // 2 photos in the source album
     $src_album = test::random_album();
@@ -106,4 +105,16 @@ class Item_Helper_Test extends Gallery_Unit_Test_Case {
     $this->assert_not_same("{$rand}.jpg", $photo2->name);
     $this->assert_not_same($rand, $photo2->slug);
   }
+
+  public function delete_cover_photo_picks_new_album_cover() {
+    $album = test::random_album();
+    $photo1 = test::random_photo($album);
+    // At this point, $photo1 is the album cover.  We verify this in
+    // Item_Model_Test::first_photo_becomes_album_cover
+    $photo2 = test::random_photo($album);
+    $photo1->delete();
+    $album->reload();
+
+    $this->assert_same($photo2->id, $album->album_cover_item_id);
+  }
 }