Skip to content

Integration tests allowing md5 home #2841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LukasReschke merged 4 commits into from
Dec 23, 2016
Merged

Integration tests allowing md5 home #2841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4480dca
Added support for homes which doesn't have user's name
SergioBertolinSG Dec 22, 2016
456d4fc
Changed data directory for work one
SergioBertolinSG Dec 22, 2016
d1b8e58
Using propfind instead of accessing the file system
SergioBertolinSG Dec 22, 2016
aad088f
Added phpdoc for getUserHome
SergioBertolinSG Dec 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build/integration/features/bootstrap/BasicStructure.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,8 +343,8 @@ public function modifyTextOfFile($user, $filename, $text) {
file_put_contents("../../data/$user/files" . "$filename", "$text");
}

public function createFileSpecificSize($name, $size){
$file = fopen("data/" . "$name", 'w');
public function createFileSpecificSize($name, $size) {
$file = fopen("work/" . "$name", 'w');
fseek($file, $size - 1 ,SEEK_CUR);
fwrite($file,'a'); // write a dummy char at SIZE position
fclose($file);
Expand Down
13 changes: 13 additions & 0 deletions build/integration/features/bootstrap/Provisioning.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,6 +704,19 @@ public function userHasUnlimitedQuota($user)
$this->userHasAQuotaOf($user, 'none');
}

/**
* Returns home path of the given user
* @param string $user
*/
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
Expand Down
9 changes: 5 additions & 4 deletions build/integration/features/bootstrap/WebDav.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,10 +496,11 @@ public function userUploadsAFileTo($user, $source, $destination)
public function userAddsAFileTo($user, $bytes, $destination){
$filename = "filespecificSize.txt";
$this->createFileSpecificSize($filename, $bytes);
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"));
PHPUnit_Framework_Assert::assertEquals(1, file_exists("work/$filename"));
$this->userUploadsAFileTo($user, "work/$filename", $destination);
$this->removeFile("work/", $filename);
$expectedElements = new \Behat\Gherkin\Node\TableNode([["$destination"]]);
$this->checkElementList($user, $expectedElements);
}

/**
Expand Down