Merge branch 'master' of git://github.com/gallery/gallery3

1 files changed, 14 insertions, 17 deletions

diff --git a/modules/gallery/tests/Photos_Controller_Test.php b/modules/gallery/tests/Photos_Controller_Test.php
index f7d3f72f..0159b420 100644
--- a/modules/gallery/tests/Photos_Controller_Test.php
+++ b/modules/gallery/tests/Photos_Controller_Test.php
@@ -20,57 +20,54 @@
 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";
     $_POST["title"] = "new title";
     $_POST["description"] = "new description";
+    $_POST["slug"] = "new-slug";
     $_POST["csrf"] = access::csrf_token();
     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",
-                        "location" => "http://./index.php/test.jpeg")),
-      $results);
-    $this->assert_equal("new title", $this->_photo->title);
-    $this->assert_equal("new description", $this->_photo->description);
+    $this->assert_equal(json_encode(array("result" => "success")), $results);
+    $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($root, MODPATH . "gallery/tests/test.jpg", "test", "test", "test");
+    $photo = photo::create(
+      $root, MODPATH . "gallery/tests/test.jpg", "test.jpg", "test", "test");
     $_POST["name"] = "new name";
     $_POST["title"] = "new title";
     $_POST["description"] = "new description";
     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