1 files changed, 103 insertions, 6 deletions

diff --git a/build/integration/features/bootstrap/WebDav.php b/build/integration/features/bootstrap/WebDav.php
index 1bda8175eeb..a682467f52d 100644
--- a/build/integration/features/bootstrap/WebDav.php
+++ b/build/integration/features/bootstrap/WebDav.php
@@ -2,8 +2,9 @@
 
 use Behat\Behat\Context\Context;
 use Behat\Behat\Context\SnippetAcceptingContext;
-use GuzzleHttp\Client;
+use GuzzleHttp\Client as GClient;
 use GuzzleHttp\Message\ResponseInterface;
+use Sabre\DAV\Client as SClient;
 
 require __DIR__ . '/../../vendor/autoload.php';
 
@@ -20,9 +21,9 @@ trait WebDav{
 		$this->davPath = $davPath;
 	}	
 
-	public function makeDavRequest($user, $method, $path, $headers){
+	public function makeDavRequest($user, $method, $path, $headers, $body = null){
 		$fullUrl = substr($this->baseUrl, 0, -4) . $this->davPath . "$path";
-		$client = new Client();
+		$client = new GClient();
 		$options = [];
 		if ($user === 'admin') {
 			$options['auth'] = $this->adminUser;
@@ -30,10 +31,16 @@ trait WebDav{
 			$options['auth'] = [$user, $this->regularUser];
 		}
 		$request = $client->createRequest($method, $fullUrl, $options);
-		foreach ($headers as $key => $value) {
-			$request->addHeader($key, $value);	
+		if (!is_null($headers)){
+			foreach ($headers as $key => $value) {
+				$request->addHeader($key, $value);	
+			}
 		}
-		//$this->response = $client->send($request);
+
+		if (!is_null($body)) {
+			$request->setBody($body);
+		}
+
 		return $client->send($request);
 	}
 
@@ -56,5 +63,95 @@ trait WebDav{
 		$this->response = $this->makeDavRequest($user, "MOVE", $fileSource, $headers);
 	}
 
+	/**
+	 * @When /^Downloading file "([^"]*)" with range "([^"]*)"$/
+	 */
+	public function downloadFileWithRange($fileSource, $range){
+		$fullUrl = substr($this->baseUrl, 0, -4) . $this->davPath;
+		$headers['Range'] = $range;
+		$this->response = $this->makeDavRequest($this->currentUser, "GET", $fileSource, $headers);
+	}
+
+	/**
+	 * @When /^Downloading last public shared file with range "([^"]*)"$/
+	 */
+	public function downloadPublicFileWithRange($range){
+		$token = $this->lastShareData->data->token;
+		$fullUrl = substr($this->baseUrl, 0, -4) . "public.php/webdav";
+		$headers['Range'] = $range;
+
+		$client = new GClient();
+		$options = [];
+		$options['auth'] = [$token, ""];
+		
+		$request = $client->createRequest("GET", $fullUrl, $options);
+		$request->addHeader('Range', $range);
+
+		$this->response = $client->send($request);
+	}
+
+	/**
+	 * @Then /^Downloaded content should be "([^"]*)"$/
+	 */
+	public function downloadedContentShouldBe($content){
+		PHPUnit_Framework_Assert::assertEquals($content, (string)$this->response->getBody());
+	}
+
+	/*Returns the elements of a propfind, $folderDepth requires 1 to see elements without children*/
+	public function listFolder($user, $path, $folderDepth){
+		$fullUrl = substr($this->baseUrl, 0, -4);
+
+		$settings = array(
+			'baseUri' => $fullUrl,
+			'userName' => $user,
+		);
+
+		if ($user === 'admin') {
+			$settings['password'] = $this->adminUser[1];
+		} else {
+			$settings['password'] = $this->regularUser;
+		}
+
+		$client = new SClient($settings);
+
+		$response = $client->propfind($this->davPath . "/", array(
+			'{DAV:}getetag'
+		), $folderDepth);
+
+		return $response;
+	}
+
+	/**
+	 * @Then /^user "([^"]*)" should see following elements$/
+	 * @param \Behat\Gherkin\Node\TableNode|null $expectedElements
+	 */
+	public function checkElementList($user, $expectedElements){
+		$elementList = $this->listFolder($user, '/', 2);
+		if ($expectedElements instanceof \Behat\Gherkin\Node\TableNode) {
+			$elementRows = $expectedElements->getRows();
+			$elementsSimplified = $this->simplifyArray($elementRows);
+			foreach($elementsSimplified as $expectedElement) {
+				$webdavPath = "/" . $this->davPath . $expectedElement;
+				if (!array_key_exists($webdavPath,$elementList)){
+					PHPUnit_Framework_Assert::fail("$webdavPath" . " is not in propfind answer");
+				}
+			}
+		}
+	}
+
+	/**
+	 * @When User :user uploads file :source to :destination
+	 */
+	public function userUploadsAFileTo($user, $source, $destination)
+	{
+		$file = \GuzzleHttp\Stream\Stream::factory(fopen($source, 'r'));
+		try {
+			$this->response = $this->makeDavRequest($user, "PUT", $destination, [], $file);
+		} catch (\GuzzleHttp\Exception\ServerException $e) {
+			// 4xx and 5xx responses cause an exception
+			$this->response = $e->getResponse();
+		}
+	}
+
 }