summaryrefslogtreecommitdiff
path: root/modules/rest/tests
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2010-03-30 13:53:14 -0700
committerBharat Mediratta <bharat@menalto.com>2010-03-30 13:53:14 -0700
commit59b6cd30e621ffeba55f23012e3ede42a4905e78 (patch)
tree97b78844e8b7db3f82f4e14b350a3ad32436d442 /modules/rest/tests
parent7f175ea87e9567817d34729dec83f7f36509b894 (diff)
Rename "user_access_tokens" table to "user_access_keys" as step 1 of a
multi step process to refer to REST access keys as "access_key" everywhere. Bump the rest module to version 2.
Diffstat (limited to 'modules/rest/tests')
-rw-r--r--modules/rest/tests/Rest_Controller_Test.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/rest/tests/Rest_Controller_Test.php b/modules/rest/tests/Rest_Controller_Test.php
index 21be8300..e8b9dbd0 100644
--- a/modules/rest/tests/Rest_Controller_Test.php
+++ b/modules/rest/tests/Rest_Controller_Test.php
@@ -34,14 +34,14 @@ class Rest_Controller_Test extends Gallery_Unit_Test_Case {
// There's no access key at first
$this->assert_false(
- ORM::factory("user_access_token")->where("user_id", "=", $user->id)->find()->loaded());
+ ORM::factory("user_access_key")->where("user_id", "=", $user->id)->find()->loaded());
$_POST["user"] = $user->name;
$_POST["password"] = "password";
$response = test::call_and_capture(array(new Rest_Controller(), "index"));
$expected =
- ORM::factory("user_access_token")->where("user_id", "=", $user->id)->find()->access_key;
+ ORM::factory("user_access_key")->where("user_id", "=", $user->id)->find()->access_key;
// Now there is an access key, and it was returned
$this->assert_equal(json_encode($expected), $response);