mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add default timeout to expected request options 

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
This commit is contained in:
Daniel Kesselberg 2019-09-03 09:14:08 +02:00
parent ca2623e6ad
commit 773778dd8c
No known key found for this signature in database
GPG Key ID: 36E3664E099D0614
1 changed files with 19 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
tests/lib/Http/Client/ClientTest.php
View File

@ -111,8 +111,9 @@ class ClientTest extends \Test\TestCase {
'verify' => '/my/path.crt', 'verify' => '/my/path.crt',
'proxy' => 'foo', 'proxy' => 'foo',
'headers' => [ 'headers' => [
'User-Agent' => 'Nextcloud Server Crawler' 'User-Agent' => 'Nextcloud Server Crawler',
] ],
'timeout' => 30,
]; ];
} }
@ -128,13 +129,10 @@ class ClientTest extends \Test\TestCase {
public function testGetWithOptions(): void { public function testGetWithOptions(): void {
$this->setUpDefaultRequestOptions(); $this->setUpDefaultRequestOptions();
$options = [ $options = array_merge($this->defaultRequestOptions, [
'verify' => false, 'verify' => false,
'proxy' => 'bar', 'proxy' => 'bar',
'headers' => [ ]);
'User-Agent' => 'Nextcloud Server Crawler'
]
];
$this->guzzleClient->method('request') $this->guzzleClient->method('request')
->with('get', 'http://localhost/', $options) ->with('get', 'http://localhost/', $options)
@ -154,13 +152,10 @@ class ClientTest extends \Test\TestCase {
public function testPostWithOptions(): void { public function testPostWithOptions(): void {
$this->setUpDefaultRequestOptions(); $this->setUpDefaultRequestOptions();
$options = [ $options = array_merge($this->defaultRequestOptions, [
'verify' => false, 'verify' => false,
'proxy' => 'bar', 'proxy' => 'bar',
'headers' => [ ]);
'User-Agent' => 'Nextcloud Server Crawler'
]
];
$this->guzzleClient->method('request') $this->guzzleClient->method('request')
->with('post', 'http://localhost/', $options) ->with('post', 'http://localhost/', $options)
@ -180,13 +175,10 @@ class ClientTest extends \Test\TestCase {
public function testPutWithOptions(): void { public function testPutWithOptions(): void {
$this->setUpDefaultRequestOptions(); $this->setUpDefaultRequestOptions();
$options = [ $options = array_merge($this->defaultRequestOptions, [
'verify' => false, 'verify' => false,
'proxy' => 'bar', 'proxy' => 'bar',
'headers' => [ ]);
'User-Agent' => 'Nextcloud Server Crawler'
]
];
$this->guzzleClient->method('request') $this->guzzleClient->method('request')
->with('put', 'http://localhost/', $options) ->with('put', 'http://localhost/', $options)
@ -206,13 +198,10 @@ class ClientTest extends \Test\TestCase {
public function testDeleteWithOptions(): void { public function testDeleteWithOptions(): void {
$this->setUpDefaultRequestOptions(); $this->setUpDefaultRequestOptions();
$options = [ $options = array_merge($this->defaultRequestOptions, [
'verify' => false, 'verify' => false,
'proxy' => 'bar', 'proxy' => 'bar',
'headers' => [ ]);
'User-Agent' => 'Nextcloud Server Crawler'
]
];
$this->guzzleClient->method('request') $this->guzzleClient->method('request')
->with('delete', 'http://localhost/', $options) ->with('delete', 'http://localhost/', $options)
@ -232,13 +221,10 @@ class ClientTest extends \Test\TestCase {
public function testOptionsWithOptions(): void { public function testOptionsWithOptions(): void {
$this->setUpDefaultRequestOptions(); $this->setUpDefaultRequestOptions();
$options = [ $options = array_merge($this->defaultRequestOptions, [
'verify' => false, 'verify' => false,
'proxy' => 'bar', 'proxy' => 'bar',
'headers' => [ ]);
'User-Agent' => 'Nextcloud Server Crawler'
]
];
$this->guzzleClient->method('request') $this->guzzleClient->method('request')
->with('options', 'http://localhost/', $options) ->with('options', 'http://localhost/', $options)
@ -258,13 +244,10 @@ class ClientTest extends \Test\TestCase {
public function testHeadWithOptions(): void { public function testHeadWithOptions(): void {
$this->setUpDefaultRequestOptions(); $this->setUpDefaultRequestOptions();
$options = [ $options = array_merge($this->defaultRequestOptions, [
'verify' => false, 'verify' => false,
'proxy' => 'bar', 'proxy' => 'bar',
'headers' => [ ]);
'User-Agent' => 'Nextcloud Server Crawler'
]
];
$this->guzzleClient->method('request') $this->guzzleClient->method('request')
->with('head', 'http://localhost/', $options) ->with('head', 'http://localhost/', $options)
@ -288,7 +271,8 @@ class ClientTest extends \Test\TestCase {
'proxy' => null, 'proxy' => null,
'headers' => [ 'headers' => [
'User-Agent' => 'Nextcloud Server Crawler' 'User-Agent' => 'Nextcloud Server Crawler'
] ],
'timeout' => 30,
], self::invokePrivate($this->client, 'buildRequestOptions', [[]])); ], self::invokePrivate($this->client, 'buildRequestOptions', [[]]));
} }
@ -314,7 +298,8 @@ class ClientTest extends \Test\TestCase {
'proxy' => 'foo', 'proxy' => 'foo',
'headers' => [ 'headers' => [
'User-Agent' => 'Nextcloud Server Crawler' 'User-Agent' => 'Nextcloud Server Crawler'
] ],
'timeout' => 30,
], self::invokePrivate($this->client, 'buildRequestOptions', [[]])); ], self::invokePrivate($this->client, 'buildRequestOptions', [[]]));
} }
} }