Skip to content

substitute complete dav path in acceptance test steps #34979

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
Apr 8, 2019
Merged

substitute complete dav path in acceptance test steps #34979

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
17 changes: 17 additions & 0 deletions tests/acceptance/features/bootstrap/BasicStructure.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,15 @@ public function getOCSPath($ocsApiVersion) {
return \ltrim($this->getBasePath() . "/ocs/v{$ocsApiVersion}.php", "/");
}

/**
* returns the complete DAV path including the base path e.g. owncloud-core/remote.php/dav

* @return string
*/
public function getDAVPathIncludingBasePath() {
return \ltrim($this->getBasePath() . "/" . $this->getDavPath(), "/");
}

/**
* returns the base URL but without "http(s)://" in front of it
*
Expand Down Expand Up @@ -1909,6 +1918,14 @@ public function substituteInLineCodes(
],
"parameter" => []
],
[
"code" => "%dav_path%",
"function" => [
$this,
"getDAVPathIncludingBasePath"
],
"parameter" => []
],
[
"code" => "%ocs_path_v1%",
"function" => [
Expand Down