diff options
Diffstat (limited to 'modules/gallery/tests/Albums_Controller_Test.php')
| -rw-r--r-- | modules/gallery/tests/Albums_Controller_Test.php | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/modules/gallery/tests/Albums_Controller_Test.php b/modules/gallery/tests/Albums_Controller_Test.php index d65946c7..8562355c 100644 --- a/modules/gallery/tests/Albums_Controller_Test.php +++ b/modules/gallery/tests/Albums_Controller_Test.php @@ -19,13 +19,13 @@ */ class Albums_Controller_Test extends Unit_Test_Case { public function setup() { - $this->_post = $_POST; - $this->_album = null; + $this->_save = array($_POST, $_SERVER); + $_SERVER["HTTP_REFERER"] = "HTTP_REFERER"; } public function teardown() { - $_POST = $this->_post; - if ($this->_album) { + list($_POST, $_SERVER) = $this->_save; + if (isset($this->_album)) { $this->_album->delete(); } } @@ -43,8 +43,9 @@ class Albums_Controller_Test extends Unit_Test_Case { $_POST["column"] = "weight"; $_POST["direction"] = "ASC"; $_POST["csrf"] = access::csrf_token(); + $_POST["slug"] = "new-name"; $_POST["_method"] = "put"; - access::allow(group::everybody(), "edit", $root); + access::allow(identity::everybody(), "edit", $root); ob_start(); $controller->_update($this->_album); @@ -52,7 +53,7 @@ class Albums_Controller_Test extends Unit_Test_Case { ob_end_clean(); $this->assert_equal( - json_encode(array("result" => "success")), + json_encode(array("result" => "success", "location" => "HTTP_REFERER")), $results); $this->assert_equal("new title", $this->_album->title); $this->assert_equal("new description", $this->_album->description); @@ -68,7 +69,7 @@ class Albums_Controller_Test extends Unit_Test_Case { $_POST["name"] = "new name"; $_POST["title"] = "new title"; $_POST["description"] = "new description"; - access::allow(group::everybody(), "edit", $root); + access::allow(identity::everybody(), "edit", $root); try { $controller->_update($this->_album); |