diff options
author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-04-12 14:42:29 +0200 |
---|---|---|
committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-04-12 14:42:29 +0200 |
commit | 68a92d36ec108ce6f630bc1f20ef492aace47f5d (patch) | |
tree | 12a54e3b40716f76a1664c3560b05f1d8e15faaf /build | |
parent | 276b8a583112203b9b71e4ac2b372e50ca62df9b (diff) | |
download | nextcloud-server-68a92d36ec108ce6f630bc1f20ef492aace47f5d.tar.gz nextcloud-server-68a92d36ec108ce6f630bc1f20ef492aace47f5d.zip |
Use baseUrl as provided
Diffstat (limited to 'build')
-rw-r--r-- | build/integration/features/bootstrap/BasicStructure.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/build/integration/features/bootstrap/BasicStructure.php b/build/integration/features/bootstrap/BasicStructure.php index d2aed82055a..31be33165e6 100644 --- a/build/integration/features/bootstrap/BasicStructure.php +++ b/build/integration/features/bootstrap/BasicStructure.php @@ -25,7 +25,7 @@ trait BasicStructure { private $cookieJar; /** @var string */ - private $requesttoken; + private $requestToken; public function __construct($baseUrl, $admin, $regular_user_password) { @@ -33,8 +33,8 @@ trait BasicStructure { $this->baseUrl = $baseUrl; $this->adminUser = $admin; $this->regularUser = $regular_user_password; - $this->localBaseUrl = substr($this->baseUrl, 0, -4); - $this->remoteBaseUrl = substr($this->baseUrl, 0, -4); + $this->localBaseUrl = $this->baseUrl; + $this->remoteBaseUrl = $this->baseUrl; $this->currentServer = 'LOCAL'; $this->cookieJar = new \GuzzleHttp\Cookie\CookieJar(); @@ -168,7 +168,7 @@ trait BasicStructure { * @param ResponseInterface $response */ private function extracRequestTokenFromResponse(ResponseInterface $response) { - $this->requesttoken = substr(preg_replace('/(.*)data-requesttoken="(.*)">(.*)/sm', '\2', $response->getBody()->getContents()), 0, 89); + $this->requestToken = substr(preg_replace('/(.*)data-requesttoken="(.*)">(.*)/sm', '\2', $response->getBody()->getContents()), 0, 89); } /** @@ -196,7 +196,7 @@ trait BasicStructure { 'body' => [ 'user' => $user, 'password' => $password, - 'requesttoken' => $this->requesttoken, + 'requesttoken' => $this->requestToken, ], 'cookies' => $this->cookieJar, ] @@ -220,7 +220,7 @@ trait BasicStructure { 'cookies' => $this->cookieJar, ] ); - $request->addHeader('requesttoken', $this->requesttoken); + $request->addHeader('requesttoken', $this->requestToken); try { $this->response = $client->send($request); } catch (\GuzzleHttp\Exception\ClientException $e) { |