mirror of
https://github.com/Pathduck/gallery3.git
synced 2026-06-10 20:39:09 -04:00
Rename "access_token" to "access_key" in the code for consistency.
This commit is contained in:
@@ -21,7 +21,7 @@ class Rest_Controller_Test extends Gallery_Unit_Test_Case {
|
||||
public function setup() {
|
||||
$this->_save = array($_GET, $_POST, $_SERVER);
|
||||
|
||||
$key = rest::get_access_token(1); // admin user
|
||||
$key = rest::get_access_key(1); // admin user
|
||||
$_SERVER["HTTP_X_GALLERY_REQUEST_KEY"] = $key->access_key;
|
||||
}
|
||||
|
||||
@@ -82,11 +82,11 @@ class Rest_Controller_Test extends Gallery_Unit_Test_Case {
|
||||
$_SERVER["REQUEST_METHOD"] = "GET";
|
||||
$_GET["key"] = "value";
|
||||
|
||||
$key = rest::get_access_token(1); // admin user
|
||||
$key = rest::get_access_key(1); // admin user
|
||||
$this->assert_array_equal_to_json(
|
||||
array("params" => array("key" => "value"),
|
||||
"method" => "get",
|
||||
"access_token" => $key->access_key,
|
||||
"access_key" => $key->access_key,
|
||||
"url" => "http://./index.php/gallery_unit_test"),
|
||||
test::call_and_capture(array(new Rest_Controller(), "mock")));
|
||||
}
|
||||
@@ -95,11 +95,11 @@ class Rest_Controller_Test extends Gallery_Unit_Test_Case {
|
||||
$_SERVER["REQUEST_METHOD"] = "POST";
|
||||
$_POST["key"] = "value";
|
||||
|
||||
$key = rest::get_access_token(1); // admin user
|
||||
$key = rest::get_access_key(1); // admin user
|
||||
$this->assert_array_equal_to_json(
|
||||
array("params" => array("key" => "value"),
|
||||
"method" => "post",
|
||||
"access_token" => $key->access_key,
|
||||
"access_key" => $key->access_key,
|
||||
"url" => "http://./index.php/gallery_unit_test"),
|
||||
test::call_and_capture(array(new Rest_Controller(), "mock")));
|
||||
}
|
||||
@@ -109,11 +109,11 @@ class Rest_Controller_Test extends Gallery_Unit_Test_Case {
|
||||
$_SERVER["HTTP_X_GALLERY_REQUEST_METHOD"] = "put";
|
||||
$_POST["key"] = "value";
|
||||
|
||||
$key = rest::get_access_token(1); // admin user
|
||||
$key = rest::get_access_key(1); // admin user
|
||||
$this->assert_array_equal_to_json(
|
||||
array("params" => array("key" => "value"),
|
||||
"method" => "put",
|
||||
"access_token" => $key->access_key,
|
||||
"access_key" => $key->access_key,
|
||||
"url" => "http://./index.php/gallery_unit_test"),
|
||||
test::call_and_capture(array(new Rest_Controller(), "mock")));
|
||||
}
|
||||
@@ -123,11 +123,11 @@ class Rest_Controller_Test extends Gallery_Unit_Test_Case {
|
||||
$_SERVER["HTTP_X_GALLERY_REQUEST_METHOD"] = "delete";
|
||||
$_POST["key"] = "value";
|
||||
|
||||
$key = rest::get_access_token(1); // admin user
|
||||
$key = rest::get_access_key(1); // admin user
|
||||
$this->assert_array_equal_to_json(
|
||||
array("params" => array("key" => "value"),
|
||||
"method" => "delete",
|
||||
"access_token" => $key->access_key,
|
||||
"access_key" => $key->access_key,
|
||||
"url" => "http://./index.php/gallery_unit_test"),
|
||||
test::call_and_capture(array(new Rest_Controller(), "mock")));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user