From f2c9d04eac7c0875040b3e46cc1dccc7d290789f Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@arthur-schiwon.de>
Date: Thu, 19 Jan 2017 12:48:50 +0100
Subject: [PATCH] test against OCS v2 instead

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
---
 .../lib/Controller/ConfigAPIController.php       | 16 ++++------------
 build/integration/ldap_features/ldap-ocs.feature | 16 +++++++++-------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/apps/user_ldap/lib/Controller/ConfigAPIController.php b/apps/user_ldap/lib/Controller/ConfigAPIController.php
index 8aeb771608..371ca899c2 100644
--- a/apps/user_ldap/lib/Controller/ConfigAPIController.php
+++ b/apps/user_ldap/lib/Controller/ConfigAPIController.php
@@ -76,7 +76,7 @@ class ConfigAPIController extends OCSController {
 	 * creates a new (empty) configuration and returns the resulting prefix
 	 *
 	 * Example: curl -X POST -H "OCS-APIREQUEST: true"  -u $admin:$password \
-	 *   https://nextcloud.server/ocs/v1.php/apps/user_ldap/api/v1/config
+	 *   https://nextcloud.server/ocs/v2.php/apps/user_ldap/api/v1/config
 	 *
 	 * results in:
 	 *
@@ -84,10 +84,8 @@ class ConfigAPIController extends OCSController {
 	 * <ocs>
 	 *   <meta>
 	 *     <status>ok</status>
-	 *     <statuscode>100</statuscode>
+	 *     <statuscode>200</statuscode>
 	 *     <message>OK</message>
-	 *     <totalitems></totalitems>
-	 *     <itemsperpage></itemsperpage>
 	 *   </meta>
 	 *   <data>
 	 *     <configID>s40</configID>
@@ -103,8 +101,6 @@ class ConfigAPIController extends OCSController {
 	 *     <status>failure</status>
 	 *     <statuscode>999</statuscode>
 	 *     <message>An issue occurred when creating the new config.</message>
-	 *     <totalitems></totalitems>
-	 *     <itemsperpage></itemsperpage>
 	 *   </meta>
 	 *   <data/>
 	 * </ocs>
@@ -131,7 +127,7 @@ class ConfigAPIController extends OCSController {
 	 *
 	 * Example:
 	 *   curl -X DELETE -H "OCS-APIREQUEST: true" -u $admin:$password \
-	 *    https://nextcloud.server/ocs/v1.php/apps/user_ldap/api/v1/config/s60
+	 *    https://nextcloud.server/ocs/v2.php/apps/user_ldap/api/v1/config/s60
 	 *
 	 * <?xml version="1.0"?>
 	 * <ocs>
@@ -139,8 +135,6 @@ class ConfigAPIController extends OCSController {
 	 *     <status>ok</status>
 	 *     <statuscode>100</statuscode>
 	 *     <message>OK</message>
-	 *     <totalitems></totalitems>
-	 *     <itemsperpage></itemsperpage>
 	 *   </meta>
 	 *   <data/>
 	 * </ocs>
@@ -178,7 +172,7 @@ class ConfigAPIController extends OCSController {
 	 * Example:
 	 *   curl -X PUT -d "key=ldapHost&value=ldaps://my.ldap.server" \
 	 *    -H "OCS-APIREQUEST: true" -u $admin:$password \
-	 *    https://nextcloud.server/ocs/v1.php/apps/user_ldap/api/v1/config/s60
+	 *    https://nextcloud.server/ocs/v2.php/apps/user_ldap/api/v1/config/s60
 	 *
 	 * <?xml version="1.0"?>
 	 * <ocs>
@@ -186,8 +180,6 @@ class ConfigAPIController extends OCSController {
 	 *     <status>ok</status>
 	 *     <statuscode>100</statuscode>
 	 *     <message>OK</message>
-	 *     <totalitems></totalitems>
-	 *     <itemsperpage></itemsperpage>
 	 *   </meta>
 	 *   <data/>
 	 * </ocs>
diff --git a/build/integration/ldap_features/ldap-ocs.feature b/build/integration/ldap_features/ldap-ocs.feature
index 7d3a4fd949..d925df3256 100644
--- a/build/integration/ldap_features/ldap-ocs.feature
+++ b/build/integration/ldap_features/ldap-ocs.feature
@@ -1,9 +1,11 @@
 Feature: LDAP
+  Background:
+    Given using api version "2"
 
   Scenario: Creating an new, empty configuration
     Given As an "admin"
     When sending "POST" to "/apps/user_ldap/api/v1/config"
-    Then the OCS status code should be "100"
+    Then the OCS status code should be "200"
     And the HTTP status code should be "200"
     And the response should contain a tag "configID"
 
@@ -11,31 +13,31 @@ Feature: LDAP
     Given As an "admin"
     When sending "DELETE" to "/apps/user_ldap/api/v1/config/s666"
     Then the OCS status code should be "404"
-    And the HTTP status code should be "200"
+    And the HTTP status code should be "404"
 
   Scenario: Delete an invalid configuration
     Given As an "admin"
     When sending "DELETE" to "/apps/user_ldap/api/v1/config/hack0r"
     Then the OCS status code should be "400"
-    And the HTTP status code should be "200"
+    And the HTTP status code should be "400"
 
   Scenario: Create and delete a configuration
     Given As an "admin"
     And creating an LDAP configuration at "/apps/user_ldap/api/v1/config"
     When deleting the LDAP configuration
-    Then the OCS status code should be "100"
+    Then the OCS status code should be "200"
     And the HTTP status code should be "200"
 
   Scenario: Create and modify a configuration
     Given As an "admin"
     And creating an LDAP configuration at "/apps/user_ldap/api/v1/config"
     When setting "ldapHost" of the LDAP configuration to "ldaps://my.ldap.server"
-    Then the OCS status code should be "100"
+    Then the OCS status code should be "200"
     And the HTTP status code should be "200"
     # Testing an invalid config key
     When setting "crack0r" of the LDAP configuration to "foobar"
     Then the OCS status code should be "400"
-    And the HTTP status code should be "200"
+    And the HTTP status code should be "400"
 
   Scenario: Modiying a non-existing configuration
     Given As an "admin"
@@ -43,4 +45,4 @@ Feature: LDAP
       | key | ldapHost |
       | value | ldaps://my.ldap.server |
     Then the OCS status code should be "404"
-    And the HTTP status code should be "200"
+    And the HTTP status code should be "404"