diff options
| author | Sergio Bertolin <sbertolin@solidgear.es> | 2016-12-22 10:07:01 +0000 |
|---|---|---|
| committer | Lukas Reschke <lukas@statuscode.ch> | 2016-12-23 12:25:19 +0100 |
| commit | 4480dca3e36b975a3d321a24798c8738aa45cf95 (patch) | |
| tree | 3ed48f6b1a6b808467fc23867e16958524e20476 | |
| parent | 91c87d3a7a219101abdb14c096a15587b79e5bea (diff) | |
| download | nextcloud-server-4480dca3e36b975a3d321a24798c8738aa45cf95.tar.gz nextcloud-server-4480dca3e36b975a3d321a24798c8738aa45cf95.zip | |
Added support for homes which doesn't have user's name
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| -rw-r--r-- | build/integration/features/bootstrap/Provisioning.php | 9 | ||||
| -rw-r--r-- | build/integration/features/bootstrap/WebDav.php | 3 |
2 files changed, 11 insertions, 1 deletions
diff --git a/build/integration/features/bootstrap/Provisioning.php b/build/integration/features/bootstrap/Provisioning.php index dbdfafcecdc..8a0472f81ec 100644 --- a/build/integration/features/bootstrap/Provisioning.php +++ b/build/integration/features/bootstrap/Provisioning.php @@ -704,6 +704,15 @@ trait Provisioning { $this->userHasAQuotaOf($user, 'none'); } + public function getUserHome($user) { + $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user"; + $client = new Client(); + $options = []; + $options['auth'] = $this->adminUser; + $this->response = $client->get($fullUrl, $options); + return $this->response->xml()->data[0]->home; + } + /** * @BeforeScenario * @AfterScenario diff --git a/build/integration/features/bootstrap/WebDav.php b/build/integration/features/bootstrap/WebDav.php index 57ca638ec7f..fb1a078fd94 100644 --- a/build/integration/features/bootstrap/WebDav.php +++ b/build/integration/features/bootstrap/WebDav.php @@ -499,7 +499,8 @@ trait WebDav { PHPUnit_Framework_Assert::assertEquals(1, file_exists("data/$filename")); $this->userUploadsAFileTo($user, "data/$filename", $destination); $this->removeFile("data/", $filename); - PHPUnit_Framework_Assert::assertEquals(1, file_exists("../../data/$user/files$destination")); + $userHome = $this->getUserHome($user); + PHPUnit_Framework_Assert::assertEquals(1, file_exists($userHome . "/files$destination")); } /** |