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

3 files changed, 73 insertions, 1 deletions

diff --git a/modules/gallery/tests/Database_Test.php b/modules/gallery/tests/Database_Test.php
index 861f7bba..730785e2 100644
--- a/modules/gallery/tests/Database_Test.php
+++ b/modules/gallery/tests/Database_Test.php
@@ -130,6 +130,13 @@ class Database_Test extends Gallery_Unit_Test_Case {
     $this->assert_same($expected, $sql);
   }
 
+  function prefix_replacement_for_rename_table_test() {
+    $db = Database::instance("mock");
+    $this->assert_same(
+      "RENAME TABLE g_test TO g_new_test",
+      $db->add_table_prefixes("RENAME TABLE {test} TO {new_test}"));
+  }
+
   function prefix_no_replacement_test() {
     $sql = db::build("mock")
       ->from("test_tables")
diff --git a/modules/gallery/tests/File_Structure_Test.php b/modules/gallery/tests/File_Structure_Test.php
index 4590e95d..9b2b1480 100644
--- a/modules/gallery/tests/File_Structure_Test.php
+++ b/modules/gallery/tests/File_Structure_Test.php
@@ -195,7 +195,7 @@ class File_Structure_Test extends Gallery_Unit_Test_Case {
     foreach ($dir as $file) {
       $file_as_string = file_get_contents($file);
       if (preg_match('/\t/', $file_as_string)) {
-        foreach (split("\n", $file_as_string) as $l => $line) {
+        foreach (explode("\n", $file_as_string) as $l => $line) {
           if (preg_match('/\t/', $line)) {
             $errors[] = "$file:$l has tab(s) ($line)";
           }
diff --git a/modules/gallery/tests/Item_Helper_Test.php b/modules/gallery/tests/Item_Helper_Test.php
index cdbdd324..50587702 100644
--- a/modules/gallery/tests/Item_Helper_Test.php
+++ b/modules/gallery/tests/Item_Helper_Test.php
@@ -19,6 +19,10 @@
  */
 class Item_Helper_Test extends Gallery_Unit_Test_Case {
 
+  public function setup() {
+    identity::set_active_user(identity::admin_user());
+  }
+
   public function viewable_test() {
     $album = test::random_album();
     $item = test::random_photo($album);
@@ -42,4 +46,65 @@ class Item_Helper_Test extends Gallery_Unit_Test_Case {
     $this->assert_equal("foo", item::convert_filename_to_slug("{[foo]}"));
     $this->assert_equal("foo-bar", item::convert_filename_to_slug("{[foo!@#!$@#^$@($!(@bar]}"));
   }
+
+  public function move_test() {
+    $photo = test::random_photo(item::root());
+    $dst_album = test::random_album();
+
+    item::move($photo, $dst_album);
+    $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();
+    $photo1 = test::random_photo($src_album);
+    $photo2 = test::random_photo($src_album);
+    $src_album->reload();
+
+    // destination album
+    $dst_album = test::random_album();
+
+    item::move($photo1, $dst_album);
+
+    // Refresh cached copies
+    $src_album->reload();
+    $dst_album->reload();
+
+    // photo 2 becomes the album cover for the source album and photo 1
+    // becomes the album cover for the destination
+    $this->assert_same($photo1->id, $dst_album->album_cover_item_id);
+    $this->assert_same($photo2->id, $src_album->album_cover_item_id);
+  }
+
+  public function move_leaves_empty_album_with_no_album_cover_test() {
+    $src_album = test::random_album();
+    $photo = test::random_photo($src_album);
+
+    item::move($photo, item::root());
+
+    $src_album->reload();
+    $this->assert_false($src_album->album_cover_item_id);
+  }
+
+  public function move_conflicts_result_in_a_rename_test() {
+    $rand = rand();
+    $photo1 = test::random_photo_unsaved(item::root());
+    $photo1->name = "{$rand}.jpg";
+    $photo1->slug = (string)$rand;
+    $photo1->save();
+
+    $src_album = test::random_album();
+    $photo2 = test::random_photo_unsaved($src_album);
+    $photo2->name = "{$rand}.jpg";
+    $photo2->slug = (string)$rand;
+    $photo2->save();
+
+    item::move($photo2, item::root());
+
+    $this->assert_same(item::root()->id, $photo2->parent_id);
+    $this->assert_not_same("{$rand}.jpg", $photo2->name);
+    $this->assert_not_same($rand, $photo2->slug);
+  }
 }