From 0306ddec3de436b683bc784574d5bf41584f2e14 Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Fri, 30 Sep 2016 12:01:01 +0200
Subject: tests: Fix testing of username/pw with unsupported endpoint

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 application/test/tests/test_api_v1.php | 8 ++++----
 application/test/tests/test_api_v2.php | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'application')

diff --git a/application/test/tests/test_api_v1.php b/application/test/tests/test_api_v1.php
index 4d50d4796..d78b189f2 100644
--- a/application/test/tests/test_api_v1.php
+++ b/application/test/tests/test_api_v1.php
@@ -137,9 +137,9 @@ class test_api_v1 extends \test\Test {
 	{
 		$userid = $this->createUser(2);
 		$apikey = $this->createApikey($userid);
+		$apikey_full = $this->createApikey($userid, "full");
 		$ret = $this->CallEndpoint("POST", "user/apikeys", array(
-			"username" => "apiv1testuser2",
-			"password" => "testpass2",
+			"apikey" => $apikey_full,
 		));
 		$this->expectSuccess("get apikeys", $ret);
 
@@ -180,7 +180,7 @@ class test_api_v1 extends \test\Test {
 	public function test_authentication_invalidPassword()
 	{
 		$userid = $this->createUser(3);
-		$ret = $this->CallEndpoint("POST", "user/apikeys", array(
+		$ret = $this->CallEndpoint("POST", "user/create_apikey", array(
 			"username" => "apiv1testuser3",
 			"password" => "wrongpass",
 		));
@@ -196,7 +196,7 @@ class test_api_v1 extends \test\Test {
 	public function test_authentication_invalidUser()
 	{
 		$userid = $this->createUser(4);
-		$ret = $this->CallEndpoint("POST", "user/apikeys", array(
+		$ret = $this->CallEndpoint("POST", "user/create_apikey", array(
 			"username" => "apiv1testuserinvalid",
 			"password" => "testpass4",
 		));
diff --git a/application/test/tests/test_api_v2.php b/application/test/tests/test_api_v2.php
index 0e52de50b..05d7952c6 100644
--- a/application/test/tests/test_api_v2.php
+++ b/application/test/tests/test_api_v2.php
@@ -137,9 +137,9 @@ class test_api_v2 extends \test\Test {
 	{
 		$userid = $this->createUser(2);
 		$apikey = $this->createApikey($userid);
+		$apikey_full = $this->createApikey($userid, "full");
 		$ret = $this->CallEndpoint("POST", "user/apikeys", array(
-			"username" => "apiv2testuser2",
-			"password" => "testpass2",
+			"apikey" => $apikey_full,
 		));
 		$this->expectSuccess("get apikeys", $ret);
 
@@ -180,7 +180,7 @@ class test_api_v2 extends \test\Test {
 	public function test_authentication_invalidPassword()
 	{
 		$userid = $this->createUser(3);
-		$ret = $this->CallEndpoint("POST", "user/apikeys", array(
+		$ret = $this->CallEndpoint("POST", "user/create_apikey", array(
 			"username" => "apiv2testuser3",
 			"password" => "wrongpass",
 		));
@@ -196,7 +196,7 @@ class test_api_v2 extends \test\Test {
 	public function test_authentication_invalidUser()
 	{
 		$userid = $this->createUser(4);
-		$ret = $this->CallEndpoint("POST", "user/apikeys", array(
+		$ret = $this->CallEndpoint("POST", "user/create_apikey", array(
 			"username" => "apiv2testuserinvalid",
 			"password" => "testpass4",
 		));
-- 
cgit v1.2.3-24-g4f1b