stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-08-01 20:50:38 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change $this->_photo to just $photo

Browse Source
This commit is contained in:
Bharat Mediratta
2009-09-08 21:33:45 -07:00
parent 5d76a73596
commit 0709f7526d
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gallery/tests/Photos_Controller_Test.php
+11 -14
View File
@@ -20,22 +20,19 @@
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);
$this->_photo = photo::create(
$root, MODPATH . "gallery/tests/test.jpg", "test.jpeg", "test", "test");
$orig_name = $this->_photo->name;
$photo = photo::create(
$root, MODPATH . "gallery/tests/test.jpg", "test.jpeg",
"test", "test", user::active(), "slug");
$orig_name = $photo->name;
$_POST["filename"] = "test.jpeg";
$_POST["name"] = "new name";
@@ -46,23 +43,23 @@ class Photos_Controller_Test extends Unit_Test_Case {
access::allow(group::everybody(), "edit", $root);
ob_start();
$controller->_update($this->_photo);
$controller->_update($photo);
$results = ob_get_contents();
ob_end_clean();
$this->assert_equal(json_encode(array("result" => "success")), $results);
$this->assert_equal("new-slug", $this->_photo->slug);
$this->assert_equal("new title", $this->_photo->title);
$this->assert_equal("new description", $this->_photo->description);
$this->assert_equal("new-slug", $photo->slug);
$this->assert_equal("new title", $photo->title);
$this->assert_equal("new description", $photo->description);
// We don't change the name, yet.
$this->assert_equal($orig_name, $this->_photo->name);
$this->assert_equal($orig_name, $photo->name);
}
public function change_photo_no_csrf_fails_test() {
$controller = new Photos_Controller();
$root = ORM::factory("item", 1);
$this->_photo = photo::create(
$photo = photo::create(
$root, MODPATH . "gallery/tests/test.jpg", "test.jpg", "test", "test");
$_POST["name"] = "new name";
$_POST["title"] = "new title";
@@ -70,7 +67,7 @@ class Photos_Controller_Test extends Unit_Test_Case {
access::allow(group::everybody(), "edit", $root);
try {
$controller->_update($this->_photo);
$controller->_update($photo);
$this->assert_true(false, "This should fail");
} catch (Exception $e) {
// pass