diff options
author | Bharat Mediratta <bharat@menalto.com> | 2010-01-02 15:49:17 -0800 |
---|---|---|
committer | Bharat Mediratta <bharat@menalto.com> | 2010-01-02 15:49:17 -0800 |
commit | 11f6a3d1eb55193a8fd8ba14d0a34eacec87f51e (patch) | |
tree | 213833a3f2bffdddec617cf43e1108580c8a08ec /modules/gallery/tests | |
parent | bad83900ae07490975541902f157d7e16a8254d9 (diff) | |
parent | ff95c4079e70cec101a214a07d2ef64ac381d5cd (diff) |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/gallery/tests')
-rw-r--r-- | modules/gallery/tests/Gallery_Rest_Helper_Test.php | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/modules/gallery/tests/Gallery_Rest_Helper_Test.php b/modules/gallery/tests/Gallery_Rest_Helper_Test.php index 605a4f37..65a60ff1 100644 --- a/modules/gallery/tests/Gallery_Rest_Helper_Test.php +++ b/modules/gallery/tests/Gallery_Rest_Helper_Test.php @@ -132,8 +132,13 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case { "title" => "Updated Title", "name" => "new name"); - $this->assert_equal(json_encode(array("status" => "ERROR", "message" => "Invalid request")), - gallery_rest::put($request)); + try { + gallery_rest::put($request); + } catch (Rest_Exception $e) { + $this->assert_equal("400 Bad request", $e->getMessage()); + } catch (Exception $e) { + $this->assert_false(true, $e->__toString()); + } } public function gallery_rest_put_album_not_found_test() { |