stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-08-22 23:05:18 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change "resource" to "entity" in REST responses. They're all

Browse Source 
resources, but we differentiate resources as collections and entities.
This commit is contained in:
Bharat Mediratta
2010-01-27 21:40:48 -08:00
parent 4ca91bf618
commit ec0f89f10a
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gallery/tests/Item_Rest_Helper_Test.php
+6 -5
View File
@@ -36,7 +36,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),
"resource" => $album1->as_array(),
"entity" => $album1->as_array(),
"members" => array(
rest::url("item", $photo1),
rest::url("item", $album2)),
@@ -50,7 +50,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),
"resource" => $album1->as_array(),
"entity" => $album1->as_array(),
"members" => array(
rest::url("item", $photo1),
rest::url("item", $album2)),
@@ -64,7 +64,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),
"resource" => $album1->as_array(),
"entity" => $album1->as_array(),
"members" => array(
rest::url("item", $photo1),
rest::url("item", $album2),
@@ -88,7 +88,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),
"resource" => $album1->as_array(),
"entity" => $album1->as_array(),
"members" => array(
rest::url("item", $photo2)),
"relationships" => array(
@@ -108,7 +108,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),
"resource" => $album1->as_array(),
"entity" => $album1->as_array(),
"members" => array(
rest::url("item", $album2)),
"relationships" => array(
@@ -210,6 +210,7 @@ class Item_Rest_Helper_Test extends Gallery_Unit_Test_Case {
public function delete_album_fails_without_permission_test() {
$album1 = test::random_album();
access::deny(identity::everybody(), "edit", $album1);
identity::set_active_user(identity::guest());
$request->url = rest::url("item", $album1);
try {