Skip to content

Use authType BASIC for Sabre client in integration tests #27421

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
PVince81 merged 1 commit into from
Mar 20, 2017
Merged

Use authType BASIC for Sabre client in integration tests #27421

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions tests/integration/features/bootstrap/WebDav.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ public function downloadFileWithRange($fileSource, $range){
public function downloadPublicFileWithRange($range){
$token = $this->lastShareData->data->token;
$fullUrl = substr($this->baseUrl, 0, -4) . "public.php/webdav";
$headers['Range'] = $range;

@DeepDiver1975 DeepDiver1975 Mar 20, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

really removing the range?

@PVince81 PVince81 Mar 20, 2017

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, unused


$client = new GClient();
$options = [];
Expand All @@ -160,7 +159,6 @@ public function downloadPublicFileWithRange($range){
public function downloadPublicFileInsideAFolderWithRange($path, $range){
$token = $this->lastShareData->data->token;
$fullUrl = substr($this->baseUrl, 0, -4) . "public.php/webdav" . "$path";
$headers['Range'] = $range;

@DeepDiver1975 DeepDiver1975 Mar 20, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here

@PVince81 PVince81 Mar 20, 2017

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, my "IDE" told me it was unused when passing by so I removed it 😉

@SergioBertolinSG SergioBertolinSG Mar 20, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How can that be unused?

https://github.com/owncloud/core/blob/master/tests/integration/features/webdav-related.feature#L228-L235

@DeepDiver1975 DeepDiver1975 Mar 20, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

core/tests/integration/features/bootstrap/WebDav.php

Line 168 in cc97923

$request->addHeader('Range', $range);

@SergioBertolinSG SergioBertolinSG Mar 20, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok


$client = new GClient();
$options = [];
Expand Down Expand Up @@ -429,6 +427,7 @@ public function getSabreClient($user) {
} else {
$settings['password'] = $this->regularUser;
}
$settings['authType'] = SClient::AUTH_BASIC;

return new SClient($settings);
}
Expand Down Expand Up @@ -686,6 +685,8 @@ public function changeFavStateOfAnElement($user, $path, $favOrUnfav, $folderDept
} else {
$settings['password'] = $this->regularUser;
}
$settings['authType'] = SClient::AUTH_BASIC;

$client = new SClient($settings);
if (!$properties) {
$properties = [
Expand Down