Merge branch 'kohana_3' of github.com:gallery/gallery3 into kohana_3

gallery · May 31, 2013 · 45eb206 · 45eb206
2 parents db601d3 + 58b465e
commit 45eb206
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/modules/gallery/tests/Gallery_Graphics_Test.php b/modules/gallery/tests/Gallery_Graphics_Test.php
@@ -40,7 +40,7 @@ public function test_rotate_jpg_without_options() {
   }
 
   /**
-   * @expectedException Gallery_Exception
+   * @expectedException Kohana_Exception
    */
   public function test_rotate_bad_jpg() {
     // Input is a garbled jpg, output is jpg autofit to 300x300
@@ -49,7 +49,8 @@ public function test_rotate_bad_jpg() {
     $options = array("degrees" => 90);
     file_put_contents($input_file, Test::lorem_ipsum(200));
 
-    // Should get passed to Image library and throw an exception
+    // Should get passed to Image library and throw an exception.
+    // Since it's image and not gallery that throws the exception, it's a Kohana_Exception.
     GalleryGraphics::rotate($input_file, $output_file, $options, null);
   }
 

diff --git a/modules/gallery/tests/Item_Test.php b/modules/gallery/tests/Item_Test.php
@@ -67,7 +67,7 @@ public function test_move() {
   }
 
   /**
-   * @expectedException Gallery_Exception
+   * @expectedException ORM_Validation_Exception
    */
   public function test_cant_move_parent_into_own_subtree() {
     $album1 = Test::random_album(Item::root());