diff options
author | Bharat Mediratta <bharat@menalto.com> | 2013-01-24 12:46:26 -0800 |
---|---|---|
committer | Bharat Mediratta <bharat@menalto.com> | 2013-01-24 12:46:26 -0800 |
commit | 6830ac4542f1afda275fcdf332e25ce35e53d0e7 (patch) | |
tree | 18c2b1e7770bd97b5f03875d04af749bb69a94bd /modules/gallery/tests | |
parent | c9a30e3b7e3b85b645a987d7024572345091364a (diff) | |
parent | 126727b4f2fa521d8b8dd45b6b4c26431efdfd66 (diff) |
Merge pull request #99 from shadlaws/fix_1955
#1955 - Make unit test photos unique.
Diffstat (limited to 'modules/gallery/tests')
-rw-r--r-- | modules/gallery/tests/Item_Model_Test.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/gallery/tests/Item_Model_Test.php b/modules/gallery/tests/Item_Model_Test.php index a7eba1ad..c45bbc3c 100644 --- a/modules/gallery/tests/Item_Model_Test.php +++ b/modules/gallery/tests/Item_Model_Test.php @@ -66,7 +66,7 @@ class Item_Model_Test extends Gallery_Unit_Test_Case { } public function rename_photo_test() { - $item = test::random_photo(); + $item = test::random_unique_photo(); $original_name = $item->name; $thumb_file = file_get_contents($item->thumb_path()); @@ -89,7 +89,7 @@ class Item_Model_Test extends Gallery_Unit_Test_Case { public function rename_album_test() { $album = test::random_album(); - $photo = test::random_photo($album); + $photo = test::random_unique_photo($album); $album->reload(); $thumb_file = file_get_contents($photo->thumb_path()); @@ -152,7 +152,7 @@ class Item_Model_Test extends Gallery_Unit_Test_Case { public function move_album_test() { $album2 = test::random_album(); $album1 = test::random_album($album2); - $photo = test::random_photo($album1); + $photo = test::random_unique_photo($album1); $thumb_file = file_get_contents($photo->thumb_path()); $resize_file = file_get_contents($photo->resize_path()); @@ -180,7 +180,7 @@ class Item_Model_Test extends Gallery_Unit_Test_Case { public function move_photo_test() { $album1 = test::random_album(); - $photo = test::random_photo($album1); + $photo = test::random_unique_photo($album1); $album2 = test::random_album(); |