Merge pull request #35562 from owncloud/accceptance-tests-for-release…

…-10-2-1

Acceptance tests for release 10.2.1

.drone.yml

@@ -825,6 +825,17 @@ matrix:
       OWNCLOUD_LOG: true
       INSTALL_TESTING_APP: true
 
+    - PHP_VERSION: 7.1
+      TEST_SUITE: api
+      BEHAT_SUITE: apiAuthOcs
+      DB_TYPE: mariadb
+      USE_SERVER: true
+      SERVER_PROTOCOL: https
+      INSTALL_SERVER: true
+      CHOWN_SERVER: true
+      OWNCLOUD_LOG: true
+      INSTALL_TESTING_APP: true
+
     - PHP_VERSION: 7.1
       TEST_SUITE: api
       BEHAT_SUITE: apiCapabilities
@@ -893,6 +904,28 @@ matrix:
       OWNCLOUD_LOG: true
       INSTALL_TESTING_APP: true
 
+    - PHP_VERSION: 7.1
+      TEST_SUITE: api
+      BEHAT_SUITE: apiProvisioningGroups-v1
+      DB_TYPE: mariadb
+      USE_SERVER: true
+      SERVER_PROTOCOL: https
+      INSTALL_SERVER: true
+      CHOWN_SERVER: true
+      OWNCLOUD_LOG: true
+      INSTALL_TESTING_APP: true
+
+    - PHP_VERSION: 7.1
+      TEST_SUITE: api
+      BEHAT_SUITE: apiProvisioningGroups-v2
+      DB_TYPE: mariadb
+      USE_SERVER: true
+      SERVER_PROTOCOL: https
+      INSTALL_SERVER: true
+      CHOWN_SERVER: true
+      OWNCLOUD_LOG: true
+      INSTALL_TESTING_APP: true
+
     - PHP_VERSION: 7.1
       TEST_SUITE: api
       BEHAT_SUITE: apiSharees
@@ -915,6 +948,17 @@ matrix:
       OWNCLOUD_LOG: true
       INSTALL_TESTING_APP: true
 
+    - PHP_VERSION: 7.1
+      TEST_SUITE: api
+      BEHAT_SUITE: apiShareManagementBasic
+      DB_TYPE: mariadb
+      USE_SERVER: true
+      SERVER_PROTOCOL: https
+      INSTALL_SERVER: true
+      CHOWN_SERVER: true
+      OWNCLOUD_LOG: true
+      INSTALL_TESTING_APP: true
+
     - PHP_VERSION: 7.1
       TEST_SUITE: api
       BEHAT_SUITE: apiShareOperations
@@ -982,6 +1026,17 @@ matrix:
       OWNCLOUD_LOG: true
       INSTALL_TESTING_APP: true
 
+    - PHP_VERSION: 7.1
+      TEST_SUITE: api
+      BEHAT_SUITE: apiWebdavLocks2
+      DB_TYPE: mariadb
+      USE_SERVER: true
+      SERVER_PROTOCOL: https
+      INSTALL_SERVER: true
+      CHOWN_SERVER: true
+      OWNCLOUD_LOG: true
+      INSTALL_TESTING_APP: true
+
     - PHP_VERSION: 7.1
       TEST_SUITE: api
       BEHAT_SUITE: apiWebdavMove
@@ -1117,7 +1172,7 @@ matrix:
     - PHP_VERSION: 7.1
       TEST_SUITE: selenium
       BROWSER: chrome
-      BEHAT_SUITE: webUIEncryptionUserKeysType
+      BEHAT_SUITE: webUIUserKeysType
       DB_TYPE: mariadb
       USE_SERVER: true
       SERVER_PROTOCOL: https
@@ -1236,6 +1291,18 @@ matrix:
       OWNCLOUD_LOG: true
       INSTALL_TESTING_APP: true
 
+    - PHP_VERSION: 7.1
+      TEST_SUITE: selenium
+      BROWSER: chrome
+      BEHAT_SUITE: webUISharingAutocompletion
+      DB_TYPE: mariadb
+      USE_SERVER: true
+      SERVER_PROTOCOL: https
+      INSTALL_SERVER: true
+      CHOWN_SERVER: true
+      OWNCLOUD_LOG: true
+      INSTALL_TESTING_APP: true
+
     - PHP_VERSION: 7.1
       TEST_SUITE: selenium
       BROWSER: chrome
@@ -1340,6 +1407,20 @@ matrix:
       OWNCLOUD_LOG: true
       INSTALL_TESTING_APP: true
 
+    # This suite is part of the user_management app in later core versions
+    - PHP_VERSION: 7.1
+      TEST_SUITE: selenium
+      BROWSER: chrome
+      BEHAT_SUITE: webUIAddUsers
+      DB_TYPE: mariadb
+      USE_SERVER: true
+      SERVER_PROTOCOL: https
+      INSTALL_SERVER: true
+      CHOWN_SERVER: true
+      USE_EMAIL: true
+      OWNCLOUD_LOG: true
+      INSTALL_TESTING_APP: true
+
     # This suite is part of the user_management app in later core versions
     - PHP_VERSION: 7.1
       TEST_SUITE: selenium
@@ -1526,3 +1607,17 @@ matrix:
       CONFIGURE_ENCRYPTION: true
       ENCRYPTION_TYPE: masterkey
       INSTALL_TESTING_APP: true
+
+    ## encryption WebUI acceptance tests master-keys encryption
+    - PHP_VERSION: 7.1
+      TEST_SUITE: webui
+      BEHAT_SUITE: webUIMasterKeyType
+      DB_TYPE: mariadb
+      USE_SERVER: true
+      SERVER_PROTOCOL: https
+      INSTALL_SERVER: true
+      CHOWN_SERVER: true
+      OWNCLOUD_LOG: true
+      CONFIGURE_ENCRYPTION: true
+      ENCRYPTION_TYPE: masterkey
+      INSTALL_TESTING_APP: true

Makefile

@@ -56,6 +56,14 @@ TEST_DATABASE=sqlite
 TEST_EXTERNAL_ENV=smb-silvershell
 TEST_PHP_SUITE=
 
+# Acceptance test flags (for shells supporting autocompletion of makefiles, eg: zsh)
+TEST_SERVER_URL?=
+TEST_SERVER_FED_URL?=
+TEST_EXTERNAL_USER_BACKENDS?=
+BEHAT_FEATURE?=
+NORERUN?=
+BEHAT_RERUN_TIMES?=
+
 RELEASE_CHANNEL=git
 
 # internal aliases

tests/TestHelpers/HttpRequestHelper.php

@@ -29,6 +29,8 @@
 use SimpleXMLElement;
 use Sabre\Xml\LibXMLException;
 use Sabre\Xml\Reader;
+use GuzzleHttp\BatchResults;
+use GuzzleHttp\Pool;
 
 /**
  * Helper for HTTP requests
@@ -68,6 +70,90 @@ public static function sendRequest(
 		if ($client === null) {
 			$client = new Client();
 		}
+		$request = self::createRequest(
+			$url,
+			$method,
+			$user,
+			$password,
+			$headers,
+			$body,
+			$config,
+			$cookies,
+			$stream,
+			$timeout,
+			$client
+		);
+
+		try {
+			$response = $client->send($request);
+		} catch (BadResponseException $ex) {
+			$response = $ex->getResponse();
+
+			//if the response was null for some reason do not return it but re-throw
+			if ($response === null) {
+				throw $ex;
+			}
+		}
+		return $response;
+	}
+
+	/**
+	 * Send the requests to the server in parallel.
+	 * This function takes an array of requests and an optional client.
+	 * It will send all the requests to the server using the Pool object in guzzle.
+	 *
+	 * @param array $requests
+	 * @param Client|null $client
+	 *
+	 * @return BatchResults
+	 */
+	public static function sendBatchRequest(
+		$requests,
+		$client = null
+	) {
+		if (!isset($client)) {
+			$client = new Client();
+		}
+		$results = Pool::batch($client, $requests);
+		return $results;
+	}
+
+	/**
+	 * Create an http request based on given parameters.
+	 * This creates an RequestInterface object before sending it to the server.
+	 * This also enables to create multiple requests in advance so that we can send them to the server at once in parallel.
+	 *
+	 * @param string $url
+	 * @param string $method
+	 * @param string $user
+	 * @param string $password
+	 * @param array $headers ['X-MyHeader' => 'value']
+	 * @param mixed $body
+	 * @param array $config
+	 * @param CookieJar $cookies
+	 * @param bool $stream Set to true to stream a response rather
+	 *                     than download it all up-front.
+	 * @param int $timeout
+	 * @param Client|null $client
+	 *
+	 * @return RequestInterface
+	 */
+	public static function createRequest(
+		$url,
+		$method = 'GET',
+		$user = null,
+		$password = null,
+		$headers = null,
+		$body = null,
+		$config = null,
+		$cookies = null,
+		$stream = false,
+		$timeout = 0,
+		$client = null
+	) {
+		if ($client === null) {
+			$client = new Client();
+		}
 
 		$options = [];
 		if ($user !== null) {
@@ -95,18 +181,7 @@ public static function sendRequest(
 				}
 			}
 		}
-
-		try {
-			$response = $client->send($request);
-		} catch (BadResponseException $ex) {
-			$response = $ex->getResponse();
-
-			//if the response was null for some reason do not return it but re-throw
-			if ($response === null) {
-				throw $ex;
-			}
-		}
-		return $response;
+		return $request;
 	}
 
 	/**

tests/TestHelpers/OcsApiHelper.php

@@ -21,7 +21,10 @@
  */
 namespace TestHelpers;
 
+use GuzzleHttp\BatchResults;
 use GuzzleHttp\Message\ResponseInterface;
+use GuzzleHttp\Client;
+use GuzzleHttp\Pool;
 
 /**
  * Helper to make requests to the OCS API
@@ -53,4 +56,41 @@ public static function sendRequest(
 
 		return HttpRequestHelper::sendRequest($fullUrl, $method, $user, $password, $headers, $body);
 	}
+
+	/**
+	 *
+	 * @param string $baseUrl
+	 * @param string $user if set to null no authentication header will be sent
+	 * @param string $password
+	 * @param string $method HTTP Method
+	 * @param string $path
+	 * @param array $body array of key, value pairs e.g ['value' => 'yes']
+	 * @param Client|null $client
+	 * @param int $ocsApiVersion (1|2) default 2
+	 * @param array $headers
+	 *
+	 * @return RequestInterface
+	 */
+	public static function createOcsRequest(
+		$baseUrl, $user, $password, $method, $path, $body = [], $client = null, $ocsApiVersion = 2, $headers = []
+	) {
+		$fullUrl = $baseUrl;
+		if (\substr($fullUrl, -1) !== '/') {
+			$fullUrl .= '/';
+		}
+		$fullUrl .= "ocs/v{$ocsApiVersion}.php" . $path;
+		return HttpRequestHelper::createRequest(
+			$fullUrl,
+			$method,
+			$user,
+			$password,
+			$headers,
+			$body,
+			null,
+			null,
+			null,
+			null,
+			$client
+		);
+	}
 }

tests/TestHelpers/SetupHelper.php

@@ -470,6 +470,46 @@ public static function deleteFileOnServer(
 		}
 	}
 
+	/**
+	 * @param string $fileInCore e.g. 'app2/myapp/appinfo/info.xml'
+	 * @param string|null $baseUrl
+	 * @param string|null $adminUsername
+	 * @param string|null $adminPassword
+	 *
+	 * @return string
+	 * @throws Exception
+	 */
+	public static function readFileFromServer(
+		$fileInCore,
+		$baseUrl  = null,
+		$adminUsername = null,
+		$adminPassword = null
+	) {
+		$baseUrl = self::checkBaseUrl($baseUrl, "readFile");
+		$adminUsername = self::checkAdminUsername(
+			$adminUsername, "readFile"
+		);
+		$adminPassword = self::checkAdminPassword(
+			$adminPassword, "readFile"
+		);
+
+		$response = OcsApiHelper::sendRequest(
+			$baseUrl,
+			$adminUsername,
+			$adminPassword,
+			'GET',
+			"/apps/testing/api/v1/file?file={$fileInCore}"
+		);
+		self::assertSame(
+			200,
+			$response->getStatusCode(),
+			"Failed to read the file {$fileInCore}"
+		);
+		$localContent = HttpRequestHelper::getResponseXml($response);
+		$localContent = (string)$localContent->data->element->contentUrlEncoded;
+		return \urldecode($localContent);
+	}
+
 	/**
 	 * returns the content of a file in a skeleton folder
 	 *