Split Items_Controller_Test into Photos and Albums tests

3 files changed, 138 insertions, 45 deletions

diff --git a/core/tests/Albums_Controller_Test.php b/core/tests/Albums_Controller_Test.php
new file mode 100644
index 00000000..06360b79
--- /dev/null
+++ b/core/tests/Albums_Controller_Test.php
@@ -0,0 +1,69 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2008 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class Albums_Controller_Test extends Unit_Test_Case {
+  public function teardown() {
+    unset($_POST);
+  }
+
+  public function change_album_test() {
+    $controller = new Albums_Controller();
+    $root = ORM::factory("item", 1);
+    $album = album::create($root, "test", "test", "test");
+    $orig_name = $album->name;
+
+    $_POST["name"] = "new name";
+    $_POST["title"] = "new title";
+    $_POST["description"] = "new description";
+    $_POST["csrf"] = access::csrf_token();
+    access::allow(group::everybody(), "edit", $root);
+
+    ob_start();
+    $controller->_update($album);
+    $results = ob_get_contents();
+    ob_end_clean();
+
+    $this->assert_equal(
+      json_encode(array("result" => "success",
+                        "location" => "http://./index.php/albums/$album->id")),
+      $results);
+    $this->assert_equal("new title", $album->title);
+    $this->assert_equal("new description", $album->description);
+
+    // We don't change the name, yet.
+    $this->assert_equal($orig_name, $album->name);
+  }
+
+  public function change_album_no_csrf_fails_test() {
+    $controller = new Albums_Controller();
+    $root = ORM::factory("item", 1);
+    $album = album::create($root, "test", "test", "test");
+    $_POST["name"] = "new name";
+    $_POST["title"] = "new title";
+    $_POST["description"] = "new description";
+    access::allow(group::everybody(), "edit", $root);
+
+    try {
+      $controller->_update($album);
+      $this->assert_true(false, "This should fail");
+    } catch (Exception $e) {
+      // pass
+    }
+  }
+}
diff --git a/core/tests/Items_Controller_Test.php b/core/tests/Items_Controller_Test.php
deleted file mode 100644
index 85ff3e03..00000000
--- a/core/tests/Items_Controller_Test.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2008 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class Items_Controller_Test extends Unit_Test_Case {
-  public function change_item_test() {
-    $controller = new Items_Controller();
-    $root = ORM::factory("item", 1);
-    $album = album::create($root, "test", "test");
-    $_POST["title"] = "new title";
-    $_POST["description"] = "new description";
-
-    $controller->_update($album);
-    $this->assert_equal("new title", $album->title);
-    $this->assert_equal("new description", $album->description);
-  }
-
-  public function change_item_test_with_return() {
-    $controller = new Items_Controller();
-    $root = ORM::factory("item", 1);
-    $album = album::create($root, "test", "test");
-    $_POST["title"] = "item_title";
-    $_POST["description"] = "item_description";
-    $_POST["__return"] = "item_description";
-
-    $this->assert_equal("item_description", $controller->_post($album));
-    $this->assert_equal("item_title", $album->title);
-    $this->assert_equal("item_description", $album->description);
-  }
-}
diff --git a/core/tests/Photos_Controller_Test.php b/core/tests/Photos_Controller_Test.php
new file mode 100644
index 00000000..d48ae35e
--- /dev/null
+++ b/core/tests/Photos_Controller_Test.php
@@ -0,0 +1,69 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2008 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class Photos_Controller_Test extends Unit_Test_Case {
+  public function teardown() {
+    unset($_POST);
+  }
+
+  public function change_photo_test() {
+    $controller = new Photos_Controller();
+    $root = ORM::factory("item", 1);
+    $photo = photo::create($root, DOCROOT . "core/tests/test.jpg", "test", "test", "test");
+    $orig_name = $photo->name;
+
+    $_POST["name"] = "new name";
+    $_POST["title"] = "new title";
+    $_POST["description"] = "new description";
+    $_POST["csrf"] = access::csrf_token();
+    access::allow(group::everybody(), "edit", $root);
+
+    ob_start();
+    $controller->_update($photo);
+    $results = ob_get_contents();
+    ob_end_clean();
+
+    $this->assert_equal(
+      json_encode(array("result" => "success",
+                        "location" => "http://./index.php/photos/$photo->id")),
+      $results);
+    $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, $photo->name);
+  }
+
+  public function change_photo_no_csrf_fails_test() {
+    $controller = new Photos_Controller();
+    $root = ORM::factory("item", 1);
+    $photo = photo::create($root, DOCROOT . "core/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);
+      $this->assert_true(false, "This should fail");
+    } catch (Exception $e) {
+      // pass
+    }
+  }
+}