add test for dynamic user id and thus run against master

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

Author: blizzz

.drone.yml

@@ -60,13 +60,13 @@ trigger:
     - push
 ---
 kind: pipeline
-name: integration-stable16
+name: integration-master
 steps:
   - name: integration
     image: nextcloudci/php7.1:php7.1-16
     environment:
       APP_NAME: ldap_write_support
-      CORE_BRANCH: stable16
+      CORE_BRANCH: master
       DB: sqlite
     commands:
       # Pre-setup steps

tests/integration/features/bootstrap/FeatureContext.php

@@ -25,4 +25,11 @@
 use Behat\Behat\Context\Context;
 
 class FeatureContext extends LDAPContext implements Context {
+
+	/**
+	 * @BeforeScenario
+	 */
+	public function ensureNoBrandNewUser() {
+		$this->deleteUser('brand-new-user');
+	}
 }

tests/integration/features/user.feature

@@ -3,11 +3,11 @@ Feature: user
   Background:
     Given using api version "2"
     And having a valid LDAP configuration
+    And modify LDAP configuration
+      | ldapBaseUsers  | ou=PagingTest,dc=nextcloud,dc=ci |
 
   Scenario: create a new user
     Given As an "admin"
-    And modify LDAP configuration
-      | ldapBaseUsers  | ou=PagingTest,dc=nextcloud,dc=ci |
     And user "brand-new-user" does not exist
     When sending "POST" to "/cloud/users" with
       | userid | brand-new-user |
@@ -17,4 +17,15 @@ Feature: user
     And user "brand-new-user" exists
     And invoking occ with "user:info brand-new-user"
     And the command output contains the text "backend: LDAP"
+
+  # requires NC 17
+  Scenario: create a new user with dynamic user id
+    Given As an "admin"
+    And parameter "newUser.generateUserID" of app "core" is set to "yes"
+    When sending "POST" to "/cloud/users" with
+      | userid |  |
+      | password | 123456 |
+    Then the OCS status code should be "200"
+    And the HTTP status code should be "200"
+
 

tests/integration/run.sh

@@ -12,7 +12,10 @@ HIDE_OC_LOGS=$2
 )
 INSTALLED=$($OCC status | grep installed: | cut -d " " -f 5)
 
-if [ "$INSTALLED" != "true" ]; then
+if [ "$INSTALLED" == "true" ]; then
+    $OCC app:enable user_ldap
+    $OCC app:enable ldap_write_support
+else
     echo "Nextcloud instance needs to be installed" >&2
     exit 1
 fi