Update tests to reflect recent changes to the REST API.

3 files changed, 8 insertions, 34 deletions

diff --git a/modules/tag/tests/Tag_Item_Rest_Helper_Test.php b/modules/tag/tests/Tag_Item_Rest_Helper_Test.php
index e5acab93..533f832d 100644
--- a/modules/tag/tests/Tag_Item_Rest_Helper_Test.php
+++ b/modules/tag/tests/Tag_Item_Rest_Helper_Test.php
@@ -32,7 +32,7 @@ class Tag_Item_Rest_Helper_Test extends Gallery_Unit_Test_Case {
     $request->url = rest::url("tag_item", $tag, item::root());
     $this->assert_equal_array(
       array("url" => rest::url("tag_item", $tag, item::root()),
-            "members" => array(
+            "entity" => array(
               "tag" => rest::url("tag", $tag),
               "item" => rest::url("item", item::root()))),
       tag_item_rest::get($request));
diff --git a/modules/tag/tests/Tag_Rest_Helper_Test.php b/modules/tag/tests/Tag_Rest_Helper_Test.php
index f4d5a14a..a8aa89d4 100644
--- a/modules/tag/tests/Tag_Rest_Helper_Test.php
+++ b/modules/tag/tests/Tag_Rest_Helper_Test.php
@@ -67,41 +67,13 @@ class Tag_Rest_Helper_Test extends Gallery_Unit_Test_Case {
       tag_rest::get($request));
   }
 
-  public function post_test() {
-    $tag = test::random_tag();
-
-    // Create an editable item to be tagged
-    $album = test::random_album();
-    access::allow(identity::everybody(), "edit", $album);
-
-    // Add the album to the tag
-    $request = new stdClass();
-    $request->url = rest::url("tag", $tag);
-    $request->params = new stdClass();
-    $request->params->url = rest::url("item", $album);
-    $this->assert_equal_array(
-      array("url" => rest::url("tag_item", $tag, $album)),
-      tag_rest::post($request));
-  }
-
-  public function post_with_no_item_url_test() {
-    $request = new stdClass();
-    try {
-      tag_rest::post($request);
-    } catch (Rest_Exception $e) {
-      $this->assert_equal(400, $e->getCode());
-      return;
-    }
-
-    $this->assert_true(false, "Shouldn't get here");
-  }
-
   public function put_test() {
     $tag = test::random_tag();
     $request = new stdClass();
     $request->url = rest::url("tag", $tag);
     $request->params = new stdClass();
-    $request->params->name = "new name";
+    $request->params->entity = new stdClass();
+    $request->params->entity->name = "new name";
 
     tag_rest::put($request);
     $this->assert_equal("new name", $tag->reload()->name);
diff --git a/modules/tag/tests/Tags_Rest_Helper_Test.php b/modules/tag/tests/Tags_Rest_Helper_Test.php
index a0ebc8c3..99332c7c 100644
--- a/modules/tag/tests/Tags_Rest_Helper_Test.php
+++ b/modules/tag/tests/Tags_Rest_Helper_Test.php
@@ -45,11 +45,12 @@ class Tags_Rest_Helper_Test extends Gallery_Unit_Test_Case {
   }
 
   public function post_test() {
-    access::allow(identity::everybody(), "edit", item::root());
+    identity::set_active_user(identity::guest());
 
     $request = new stdClass();
     $request->params = new stdClass();
-    $request->params->name = "test tag";
+    $request->params->entity = new stdClass();
+    $request->params->entity->name = "test tag";
     $this->assert_equal(
       array("url" => url::site("rest/tag/1")),
       tags_rest::post($request));
@@ -63,7 +64,8 @@ class Tags_Rest_Helper_Test extends Gallery_Unit_Test_Case {
     try {
       $request = new stdClass();
       $request->params = new stdClass();
-      $request->params->name = "test tag";
+      $request->params->entity = new stdClass();
+      $request->params->entity->name = "test tag";
       tags_rest::post($request);
     } catch (Exception $e) {
       $this->assert_equal(403, $e->getCode());