stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-06-04 10:49:07 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve test isolation so that Albums_Controller_Test doesn't fail when run with Photos_Controller_Test

Browse Source
This commit is contained in:
Tim Almdal
2009-06-02 14:19:03 -07:00
parent ffb3abdcac
commit dbeceb333b
2 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
modules/gallery/tests/Photos_Controller_Test.php
View File

@@ -20,17 +20,22 @@
class Photos_Controller_Test extends Unit_Test_Case {
public function setup() {
$this->_post = $_POST;
$this->_photo = null;
}
public function teardown() {
$_POST = $this->_post;
if ($this->_photo) {
$this->_photo->delete();
}
}
public function change_photo_test() {
$controller = new Photos_Controller();
$root = ORM::factory("item", 1);
$photo = photo::create($root, MODPATH . "gallery/tests/test.jpg", "test.jpeg", "test", "test");
$orig_name = $photo->name;
$this->_photo = photo::create($root, MODPATH . "gallery/tests/test.jpg", "test.jpeg", "test",
"test");
$orig_name = $this->_photo->name;
$_POST["filename"] = "test.jpeg";
$_POST["name"] = "new name";
@@ -40,7 +45,7 @@ class Photos_Controller_Test extends Unit_Test_Case {
access::allow(group::everybody(), "edit", $root);
ob_start();
$controller->_update($photo);
$controller->_update($this->_photo);
$results = ob_get_contents();
ob_end_clean();
@@ -48,24 +53,24 @@ class Photos_Controller_Test extends Unit_Test_Case {
json_encode(array("result" => "success",
"location" => "http://./index.php/test.jpeg")),
$results);
$this->assert_equal("new title", $photo->title);
$this->assert_equal("new description", $photo->description);
$this->assert_equal("new title", $this->_photo->title);
$this->assert_equal("new description", $this->_photo->description);
// We don't change the name, yet.
$this->assert_equal($orig_name, $photo->name);
$this->assert_equal($orig_name, $this->_photo->name);
}
public function change_photo_no_csrf_fails_test() {
$controller = new Photos_Controller();
$root = ORM::factory("item", 1);
$photo = photo::create($root, MODPATH . "gallery/tests/test.jpg", "test", "test", "test");
$this->_photo = photo::create($root, MODPATH . "gallery/tests/test.jpg", "test", "test", "test");
$_POST["name"] = "new name";
$_POST["title"] = "new title";
$_POST["description"] = "new description";
access::allow(group::everybody(), "edit", $root);
try {
$controller->_update($photo);
$controller->_update($this->_photo);
$this->assert_true(false, "This should fail");
} catch (Exception $e) {
// pass