sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4037 from nextcloud/downstream-27421 

Use authType BASIC for Sabre client in integration tests
pull/4049/head
Morris Jobke 2017-03-24 17:30:24 +07:00 committed by GitHub
parent 2f7669179e c54091d43b
commit ea8b61b61c
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
build/integration/features/bootstrap/WebDav.php
Unescape Escape View File

@ -170,7 +170,6 @@ trait WebDav {
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 = [];
@ -189,7 +188,6 @@ trait WebDav {
public function downloadPublicFileInsideAFolderWithRange($path, $range){
$token = $this->lastShareData->data->token;
$fullUrl = substr($this->baseUrl, 0, -4) . "public.php/webdav" . "$path";
$headers['Range'] = $range;
$client = new GClient();
$options = [];
@ -437,16 +435,17 @@ trait WebDav {
public function getSabreClient($user) {
$fullUrl = substr($this->baseUrl, 0, -4);
$settings = array(
$settings = [
'baseUri' => $fullUrl,
'userName' => $user,
);
];
if ($user === 'admin') {
$settings['password'] = $this->adminUser[1];
} else {
$settings['password'] = $this->regularUser;
}
$settings['authType'] = SClient::AUTH_BASIC;
return new SClient($settings);
}
@ -634,15 +633,17 @@ trait WebDav {
/*Set the elements of a proppatch, $folderDepth requires 1 to see elements without children*/
public function changeFavStateOfAnElement($user, $path, $favOrUnfav, $folderDepth, $properties = null){
$fullUrl = substr($this->baseUrl, 0, -4);
$settings = array(
$settings = [
'baseUri' => $fullUrl,
'userName' => $user,
);
];
if ($user === 'admin') {
$settings['password'] = $this->adminUser[1];
} else {
$settings['password'] = $this->regularUser;
}
$settings['authType'] = SClient::AUTH_BASIC;
$client = new SClient($settings);
if (!$properties) {
$properties = [