nextcloud
/
spreed
зеркало из https://github.com/nextcloud/spreed.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Also update SharingContext 

Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2020-03-03 11:58:06 +01:00
Родитель 95dcc39d44
Коммит ccd244a3d9
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 7076EA9751AACDDA
1 изменённых файлов: 22 добавлений и 22 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

44
tests/integration/features/bootstrap/SharingContext.php
Просмотреть файл

@ -426,7 +426,7 @@ class SharingContext implements Context {
$this->sendingTo('GET', $url); $this->sendingTo('GET', $url);
PHPUnit_Framework_Assert::assertEquals(200, $this->response->getStatusCode()); \PHPUnit\Framework\Assert::assertEquals(200, $this->response->getStatusCode());
} }
/** /**
@ -513,7 +513,7 @@ class SharingContext implements Context {
$client = new GuzzleHttp\Client(); $client = new GuzzleHttp\Client();
$client->send($client->createRequest('GET', $this->baseUrl . '/apps/testing/clean_opcode_cache.php')); $client->send($client->createRequest('GET', $this->baseUrl . '/apps/testing/clean_opcode_cache.php'));
PHPUnit_Framework_Assert::assertEquals(0, $lastCode); \PHPUnit\Framework\Assert::assertEquals(0, $lastCode);
} }
/** /**
@ -524,7 +524,7 @@ class SharingContext implements Context {
public function theOCSStatusCodeShouldBe(int $statusCode) { public function theOCSStatusCodeShouldBe(int $statusCode) {
$meta = $this->getXmlResponse()->meta[0]; $meta = $this->getXmlResponse()->meta[0];
PHPUnit_Framework_Assert::assertEquals($statusCode, (int)$meta->statuscode, 'Response message: ' . (string)$meta->message); \PHPUnit\Framework\Assert::assertEquals($statusCode, (int)$meta->statuscode, 'Response message: ' . (string)$meta->message);
} }
/** /**
@ -533,7 +533,7 @@ class SharingContext implements Context {
* @param int $statusCode * @param int $statusCode
*/ */
public function theHTTPStatusCodeShouldBe(int $statusCode) { public function theHTTPStatusCodeShouldBe(int $statusCode) {
PHPUnit_Framework_Assert::assertEquals($statusCode, $this->response->getStatusCode()); \PHPUnit\Framework\Assert::assertEquals($statusCode, $this->response->getStatusCode());
} }
/** /**
@ -545,7 +545,7 @@ class SharingContext implements Context {
$returnedShares = $this->getXmlResponse()->data[0]; $returnedShares = $this->getXmlResponse()->data[0];
PHPUnit_Framework_Assert::assertEquals($count, count($returnedShares->element)); \PHPUnit\Framework\Assert::assertEquals($count, count($returnedShares->element));
} }
/** /**
@ -639,10 +639,10 @@ class SharingContext implements Context {
$sharees[] = $expectedSharee; $sharees[] = $expectedSharee;
} }
$respondedArray = $this->getArrayOfShareesResponded($this->response, $shareeType); $respondedArray = $this->getArrayOfShareesResponded($this->response, $shareeType);
PHPUnit_Framework_Assert::assertEquals($sharees, $respondedArray); \PHPUnit\Framework\Assert::assertEquals($sharees, $respondedArray);
} else { } else {
$respondedArray = $this->getArrayOfShareesResponded($this->response, $shareeType); $respondedArray = $this->getArrayOfShareesResponded($this->response, $shareeType);
PHPUnit_Framework_Assert::assertEmpty($respondedArray); \PHPUnit\Framework\Assert::assertEmpty($respondedArray);
} }
} }
@ -668,7 +668,7 @@ class SharingContext implements Context {
} }
} }
PHPUnit_Framework_Assert::assertEquals($expectedHrefs, $hrefs); \PHPUnit\Framework\Assert::assertEquals($expectedHrefs, $hrefs);
} }
/** /**
@ -692,7 +692,7 @@ class SharingContext implements Context {
} }
} }
PHPUnit_Framework_Assert::assertEquals($expectedShareTypes, $shareTypes); \PHPUnit\Framework\Assert::assertEquals($expectedShareTypes, $shareTypes);
} }
/** /**
@ -710,7 +710,7 @@ class SharingContext implements Context {
}); });
if (empty($fileForPath)) { if (empty($fileForPath)) {
PHPUnit_Framework_Assert::fail("$path not found in the response"); \PHPUnit\Framework\Assert::fail("$path not found in the response");
} }
$fileForPath = array_shift($fileForPath); $fileForPath = array_shift($fileForPath);
@ -729,7 +729,7 @@ class SharingContext implements Context {
} }
} }
PHPUnit_Framework_Assert::assertEquals($expectedShareTypes, $shareTypes); \PHPUnit\Framework\Assert::assertEquals($expectedShareTypes, $shareTypes);
} }
/** /**
@ -787,11 +787,11 @@ class SharingContext implements Context {
if (array_key_exists('expireDate', $fd)){ if (array_key_exists('expireDate', $fd)){
$fd['expireDate'] = date('Y-m-d', strtotime($fd['expireDate'])); $fd['expireDate'] = date('Y-m-d', strtotime($fd['expireDate']));
} }
$options['body'] = $fd; $options['form_params'] = $fd;
} }
try { try {
$this->response = $client->send($client->createRequest($verb, $fullUrl, $options)); $this->response = $client->request($verb, $fullUrl, $options);
} catch (GuzzleHttp\Exception\ClientException $ex) { } catch (GuzzleHttp\Exception\ClientException $ex) {
$this->response = $ex->getResponse(); $this->response = $ex->getResponse();
} }
@ -823,7 +823,7 @@ class SharingContext implements Context {
} }
try { try {
$this->response = $client->send($client->createRequest($verb, $fullUrl, $options)); $this->response = $client->request($verb, $fullUrl, $options);
} catch (GuzzleHttp\Exception\ClientException $ex) { } catch (GuzzleHttp\Exception\ClientException $ex) {
$this->response = $ex->getResponse(); $this->response = $ex->getResponse();
} }
@ -840,7 +840,7 @@ class SharingContext implements Context {
$client = new Client(); $client = new Client();
try { try {
$this->response = $client->send($client->createRequest( $this->response = $client->request(
$verb, $verb,
$fullUrl, $fullUrl,
[ [
@ -849,7 +849,7 @@ class SharingContext implements Context {
'requesttoken' => $requestToken 'requesttoken' => $requestToken
] ]
] ]
)); );
} catch (GuzzleHttp\Exception\ClientException $e) { } catch (GuzzleHttp\Exception\ClientException $e) {
$this->response = $e->getResponse(); $this->response = $e->getResponse();
} }
@ -887,7 +887,7 @@ class SharingContext implements Context {
$response = $client->post( $response = $client->post(
$loginUrl, $loginUrl,
[ [
'body' => [ 'form_params' => [
'user' => $user, 'user' => $user,
'password' => $password, 'password' => $password,
'requesttoken' => $requestToken, 'requesttoken' => $requestToken,
@ -932,7 +932,7 @@ class SharingContext implements Context {
} }
if (!array_key_exists($field, $returnedShare)) { if (!array_key_exists($field, $returnedShare)) {
PHPUnit_Framework_Assert::fail("$field was not found in response"); \PHPUnit\Framework\Assert::fail("$field was not found in response");
} }
if ($field === 'expiration' && !empty($contentExpected)){ if ($field === 'expiration' && !empty($contentExpected)){
@ -940,15 +940,15 @@ class SharingContext implements Context {
} }
if ($contentExpected === 'A_NUMBER') { if ($contentExpected === 'A_NUMBER') {
PHPUnit_Framework_Assert::assertTrue(is_numeric((string)$returnedShare->$field), "Field '$field' is not a number: " . $returnedShare->$field); \PHPUnit\Framework\Assert::assertTrue(is_numeric((string)$returnedShare->$field), "Field '$field' is not a number: " . $returnedShare->$field);
} else if ($contentExpected === 'A_TOKEN') { } else if ($contentExpected === 'A_TOKEN') {
// A token is composed by 15 characters from // A token is composed by 15 characters from
// ISecureRandom::CHAR_HUMAN_READABLE. // ISecureRandom::CHAR_HUMAN_READABLE.
PHPUnit_Framework_Assert::assertRegExp('/^[abcdefgijkmnopqrstwxyzABCDEFGHJKLMNPQRSTWXYZ23456789]{15}$/', (string)$returnedShare->$field, "Field '$field' is not a token"); \PHPUnit\Framework\Assert::assertRegExp('/^[abcdefgijkmnopqrstwxyzABCDEFGHJKLMNPQRSTWXYZ23456789]{15}$/', (string)$returnedShare->$field, "Field '$field' is not a token");
} else if (strpos($contentExpected, 'REGEXP ') === 0) { } else if (strpos($contentExpected, 'REGEXP ') === 0) {
PHPUnit_Framework_Assert::assertRegExp(substr($contentExpected, strlen('REGEXP ')), (string)$returnedShare->$field, "Field '$field' does not match"); \PHPUnit\Framework\Assert::assertRegExp(substr($contentExpected, strlen('REGEXP ')), (string)$returnedShare->$field, "Field '$field' does not match");
} else { } else {
PHPUnit_Framework_Assert::assertEquals($contentExpected, (string)$returnedShare->$field, "Field '$field' does not match"); \PHPUnit\Framework\Assert::assertEquals($contentExpected, (string)$returnedShare->$field, "Field '$field' does not match");
} }
} }