From 773778dd8ce6a483539414add1d0a440233e5cad Mon Sep 17 00:00:00 2001
From: Daniel Kesselberg <mail@danielkesselberg.de>
Date: Tue, 3 Sep 2019 09:14:08 +0200
Subject: [PATCH] Add default timeout to expected request options

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
---
 tests/lib/Http/Client/ClientTest.php | 53 ++++++++++------------------
 1 file changed, 19 insertions(+), 34 deletions(-)

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