From 2d5c232c42ea52e0c1115dd93edafecf1978fbfe Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Wed, 25 Nov 2009 12:41:01 -0800 Subject: Refactor the album, movie and photo handling to remove the REST_Controller. Partial fix for ticket #917 --- modules/gallery/tests/Albums_Controller_Test.php | 3 ++- modules/gallery/tests/Photos_Controller_Test.php | 3 ++- modules/gallery/tests/controller_auth_data.txt | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'modules/gallery/tests') diff --git a/modules/gallery/tests/Albums_Controller_Test.php b/modules/gallery/tests/Albums_Controller_Test.php index 8562355c..9b904387 100644 --- a/modules/gallery/tests/Albums_Controller_Test.php +++ b/modules/gallery/tests/Albums_Controller_Test.php @@ -48,7 +48,8 @@ class Albums_Controller_Test extends Unit_Test_Case { access::allow(identity::everybody(), "edit", $root); ob_start(); - $controller->_update($this->_album); + $controller->update($this->_album->id); + $this->_album->reload(); $results = ob_get_contents(); ob_end_clean(); diff --git a/modules/gallery/tests/Photos_Controller_Test.php b/modules/gallery/tests/Photos_Controller_Test.php index 624e6878..fa4f101a 100644 --- a/modules/gallery/tests/Photos_Controller_Test.php +++ b/modules/gallery/tests/Photos_Controller_Test.php @@ -44,7 +44,8 @@ class Photos_Controller_Test extends Unit_Test_Case { access::allow(identity::everybody(), "edit", $root); ob_start(); - $controller->_update($photo); + $controller->update($photo->id); + $photo->reload(); $results = ob_get_contents(); ob_end_clean(); diff --git a/modules/gallery/tests/controller_auth_data.txt b/modules/gallery/tests/controller_auth_data.txt index b1ad6347..73950d88 100644 --- a/modules/gallery/tests/controller_auth_data.txt +++ b/modules/gallery/tests/controller_auth_data.txt @@ -4,7 +4,6 @@ modules/digibug/controllers/digibug.php print_proxy modules/digibug/controllers/digibug.php close_window DIRTY_AUTH modules/gallery/controllers/admin.php __call DIRTY_AUTH modules/gallery/controllers/albums.php _show DIRTY_CSRF -modules/gallery/controllers/albums.php _form_add DIRTY_CSRF modules/gallery/controllers/combined.php javascript DIRTY_AUTH modules/gallery/controllers/combined.php css DIRTY_AUTH modules/gallery/controllers/file_proxy.php __call DIRTY_CSRF|DIRTY_AUTH -- cgit v1.2.3