summaryrefslogtreecommitdiff
path: root/modules/gallery/tests
diff options
context:
space:
mode:
Diffstat (limited to 'modules/gallery/tests')
-rw-r--r--modules/gallery/tests/Item_Model_Test.php4
-rw-r--r--modules/gallery/tests/Item_Rest_Helper_Test.php21
-rw-r--r--modules/gallery/tests/Items_Rest_Helper_Test.php35
3 files changed, 18 insertions, 42 deletions
diff --git a/modules/gallery/tests/Item_Model_Test.php b/modules/gallery/tests/Item_Model_Test.php
index 3df6197d..f9e6a4e3 100644
--- a/modules/gallery/tests/Item_Model_Test.php
+++ b/modules/gallery/tests/Item_Model_Test.php
@@ -361,7 +361,7 @@ class Item_Model_Test extends Gallery_Unit_Test_Case {
$photo = test::random_photo($album);
$album->reload();
- $result = $album->as_restful_array(false);
+ $result = $album->as_restful_array();
$this->assert_same(rest::url("item", item::root()), $result["parent"]);
$this->assert_same(rest::url("item", $photo), $result["album_cover"]);
$this->assert_true(!array_key_exists("parent_id", $result));
@@ -373,7 +373,7 @@ class Item_Model_Test extends Gallery_Unit_Test_Case {
$photo = test::random_photo($album);
$album->reload();
- $result = $album->as_restful_array(true);
+ $result = $album->as_restful_array(false);
$this->assert_same(item::root()->id, $result["parent_id"]);
$this->assert_same($photo->id, $result["album_cover_item_id"]);
$this->assert_true(!array_key_exists("parent", $result));
diff --git a/modules/gallery/tests/Item_Rest_Helper_Test.php b/modules/gallery/tests/Item_Rest_Helper_Test.php
index 5a80d66b..0b5e0471 100644
--- a/modules/gallery/tests/Item_Rest_Helper_Test.php
+++ b/modules/gallery/tests/Item_Rest_Helper_Test.php
@@ -28,17 +28,6 @@ class Item_Rest_Helper_Test extends Gallery_Unit_Test_Case {
$this->assert_equal($album->id, $resolved->id);
}
- public function get_with_ids_test() {
- $photo1 = test::random_photo(item::root());
- $request = new stdClass();
- $request->url = rest::url("item", $photo1);
- $request->params = new stdClass();
- $request->params->preserve_ids = 1;
-
- $response = item_rest::get($request);
- $this->assert_equal(item::root()->id, $response["entity"]["parent_id"]); // Spot check
- }
-
public function get_scope_test() {
$album1 = test::random_album();
$photo1 = test::random_photo($album1);
@@ -52,7 +41,7 @@ class Item_Rest_Helper_Test extends Gallery_Unit_Test_Case {
$request->params = new stdClass();
$this->assert_equal_array(
array("url" => rest::url("item", $album1),
- "entity" => $album1->as_restful_array(false),
+ "entity" => $album1->as_restful_array(),
"relationships" => array(
"tags" => array(
"url" => rest::url("item_tags", $album1),
@@ -67,7 +56,7 @@ class Item_Rest_Helper_Test extends Gallery_Unit_Test_Case {
$request->params->scope = "direct";
$this->assert_equal_array(
array("url" => rest::url("item", $album1),
- "entity" => $album1->as_restful_array(false),
+ "entity" => $album1->as_restful_array(),
"relationships" => array(
"tags" => array(
"url" => rest::url("item_tags", $album1),
@@ -82,7 +71,7 @@ class Item_Rest_Helper_Test extends Gallery_Unit_Test_Case {
$request->params->scope = "all";
$this->assert_equal_array(
array("url" => rest::url("item", $album1),
- "entity" => $album1->as_restful_array(false),
+ "entity" => $album1->as_restful_array(),
"relationships" => array(
"tags" => array(
"url" => rest::url("item_tags", $album1),
@@ -109,7 +98,7 @@ class Item_Rest_Helper_Test extends Gallery_Unit_Test_Case {
$request->params->name = "foo";
$this->assert_equal_array(
array("url" => rest::url("item", $album1),
- "entity" => $album1->as_restful_array(false),
+ "entity" => $album1->as_restful_array(),
"relationships" => array(
"tags" => array(
"url" => rest::url("item_tags", $album1),
@@ -132,7 +121,7 @@ class Item_Rest_Helper_Test extends Gallery_Unit_Test_Case {
$request->params->type = "album";
$this->assert_equal_array(
array("url" => rest::url("item", $album1),
- "entity" => $album1->as_restful_array(false),
+ "entity" => $album1->as_restful_array(),
"relationships" => array(
"tags" => array(
"url" => rest::url("item_tags", $album1),
diff --git a/modules/gallery/tests/Items_Rest_Helper_Test.php b/modules/gallery/tests/Items_Rest_Helper_Test.php
index 3efd677d..94bf912a 100644
--- a/modules/gallery/tests/Items_Rest_Helper_Test.php
+++ b/modules/gallery/tests/Items_Rest_Helper_Test.php
@@ -34,13 +34,13 @@ class Items_Rest_Helper_Test extends Gallery_Unit_Test_Case {
$this->assert_equal_array(
array(
array("url" => rest::url("item", $photo1),
- "entity" => $photo1->as_restful_array(false),
+ "entity" => $photo1->as_restful_array(),
"relationships" => array(
"tags" => array(
"url" => rest::url("item_tags", $photo1),
"members" => array()))),
array("url" => rest::url("item", $album2),
- "entity" => $album2->as_restful_array(false),
+ "entity" => $album2->as_restful_array(),
"relationships" => array(
"tags" => array(
"url" => rest::url("item_tags", $album2),
@@ -67,7 +67,7 @@ class Items_Rest_Helper_Test extends Gallery_Unit_Test_Case {
$this->assert_equal_array(
array(
array("url" => rest::url("item", $album2),
- "entity" => $album2->as_restful_array(false),
+ "entity" => $album2->as_restful_array(),
"relationships" => array(
"tags" => array(
"url" => rest::url("item_tags", $album2),
@@ -94,7 +94,7 @@ class Items_Rest_Helper_Test extends Gallery_Unit_Test_Case {
$this->assert_equal_array(
array(
array("url" => rest::url("item", $photo1),
- "entity" => $photo1->as_restful_array(false),
+ "entity" => $photo1->as_restful_array(),
"relationships" => array(
"tags" => array(
"url" => rest::url("item_tags", $photo1),
@@ -119,13 +119,13 @@ class Items_Rest_Helper_Test extends Gallery_Unit_Test_Case {
$this->assert_equal_array(
array(
array("url" => rest::url("item", $photo1),
- "entity" => $photo1->as_restful_array(false),
+ "entity" => $photo1->as_restful_array(),
"relationships" => array(
"tags" => array(
"url" => rest::url("item_tags", $photo1),
"members" => array()))),
array("url" => rest::url("item", $album2),
- "entity" => $album2->as_restful_array(false),
+ "entity" => $album2->as_restful_array(),
"relationships" => array(
"tags" => array(
"url" => rest::url("item_tags", $album2),
@@ -146,7 +146,7 @@ class Items_Rest_Helper_Test extends Gallery_Unit_Test_Case {
$root = ORM::factory("item", 1);
$restful_root = array(
"url" => rest::url("item", $root),
- "entity" => $root->as_restful_array(false),
+ "entity" => $root->as_restful_array(),
"relationships" => rest::relationships("item", $root));
$restful_root["members"] = array();
foreach ($root->children() as $child) {
@@ -155,12 +155,12 @@ class Items_Rest_Helper_Test extends Gallery_Unit_Test_Case {
$request = new stdClass();
$request->params = new stdClass();
- $request->params->ancestors_for = rest::url("item", $photo2);
+ $request->params->ancestor_for = rest::url("item", $photo2);
$this->assert_equal_array(
array(
$restful_root,
array("url" => rest::url("item", $album1),
- "entity" => $album1->as_restful_array(false),
+ "entity" => $album1->as_restful_array(),
"relationships" => array(
"tags" => array(
"url" => rest::url("item_tags", $album1),
@@ -170,7 +170,7 @@ class Items_Rest_Helper_Test extends Gallery_Unit_Test_Case {
rest::url("item", $album2)),
),
array("url" => rest::url("item", $album2),
- "entity" => $album2->as_restful_array(false),
+ "entity" => $album2->as_restful_array(),
"relationships" => array(
"tags" => array(
"url" => rest::url("item_tags", $album2),
@@ -178,24 +178,11 @@ class Items_Rest_Helper_Test extends Gallery_Unit_Test_Case {
"members" => array(
rest::url("item", $photo2))),
array("url" => rest::url("item", $photo2),
- "entity" => $photo2->as_restful_array(false),
+ "entity" => $photo2->as_restful_array(),
"relationships" => array(
"tags" => array(
"url" => rest::url("item_tags", $photo2),
"members" => array())))),
items_rest::get($request));
}
-
- public function get_ancestor_with_ids_test() {
- $album1 = test::random_album();
- $photo1 = test::random_photo($album1);
-
- $request = new stdClass();
- $request->params = new stdClass();
- $request->params->ancestors_for = rest::url("item", $photo1);
- $request->params->preserve_ids = 1;
-
- $response = items_rest::get($request);
- $this->assert_same(item::root()->id, $response[1]["entity"]["parent_id"]); // Spot check
- }
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 07:07:45 +0000