diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-03-24 17:30:24 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-24 17:30:24 -0600 |
| commit | ea8b61b61c9db8d7dfcae31026fecebcee47be9c (patch) | |
| tree | 1cbb5cd1ea5218c325f27a126c69d7eb42e323fa | |
| parent | 2f7669179e8d8d0469803940097302cf255a9cdf (diff) | |
| parent | c54091d43bc94728970479ea745c993f99f9b056 (diff) | |
| download | nextcloud-server-ea8b61b61c9db8d7dfcae31026fecebcee47be9c.tar.gz nextcloud-server-ea8b61b61c9db8d7dfcae31026fecebcee47be9c.zip | |
Merge pull request #4037 from nextcloud/downstream-27421
Use authType BASIC for Sabre client in integration tests
| -rw-r--r-- | build/integration/features/bootstrap/WebDav.php | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/build/integration/features/bootstrap/WebDav.php b/build/integration/features/bootstrap/WebDav.php index 0a75ff96732..3a018a2d0fa 100644 --- a/build/integration/features/bootstrap/WebDav.php +++ b/build/integration/features/bootstrap/WebDav.php @@ -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 = [ |