Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@arthur-schiwon.de>2019-10-15 19:40:14 +0300
committerArthur Schiwon <blizzz@arthur-schiwon.de>2019-10-15 19:40:14 +0300
commit29a1ac7799ea1af20a3635db6f240422e19b495b (patch)
treefce947001443389e56089e39d75c509c4bab2d9c /tests
parent0f5cc5249c47e8672774c66671842b56a0941547 (diff)
adjust tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Diffstat (limited to 'tests')
-rw-r--r--tests/lib/Http/Client/ClientTest.php20
1 files changed, 8 insertions, 12 deletions
diff --git a/tests/lib/Http/Client/ClientTest.php b/tests/lib/Http/Client/ClientTest.php
index 3dae622a0b8..ea825266198 100644
--- a/tests/lib/Http/Client/ClientTest.php
+++ b/tests/lib/Http/Client/ClientTest.php
@@ -49,27 +49,22 @@ class ClientTest extends \Test\TestCase {
$this->config
->expects($this->at(0))
->method('getSystemValue')
- ->with('proxy', null)
- ->willReturn(null);
- $this->config
- ->expects($this->at(1))
- ->method('getSystemValue')
- ->with('proxyuserpwd', null)
- ->willReturn(null);
- $this->assertSame('', self::invokePrivate($this->client, 'getProxyUri'));
+ ->with('proxy', '')
+ ->willReturn('');
+ $this->assertNull(self::invokePrivate($this->client, 'getProxyUri'));
}
public function testGetProxyUriProxyHostEmptyPassword() {
$this->config
->expects($this->at(0))
->method('getSystemValue')
- ->with('proxy', null)
+ ->with('proxy', '')
->willReturn('foo');
$this->config
->expects($this->at(1))
->method('getSystemValue')
- ->with('proxyuserpwd', null)
- ->willReturn(null);
+ ->with('proxyuserpwd', '')
+ ->willReturn('');
$this->assertSame('foo', self::invokePrivate($this->client, 'getProxyUri'));
}
@@ -270,7 +265,8 @@ class ClientTest extends \Test\TestCase {
->willReturn([]);
$this->assertEquals([
- 'verify' => \OC::$SERVERROOT . '/resources/config/ca-bundle.crt'
+ 'verify' => \OC::$SERVERROOT . '/resources/config/ca-bundle.crt',
+ 'proxy' => null,
], self::invokePrivate($this->client, 'getRequestOptions'));
}