Skip to content

Commit 29a1ac7

Browse files
committed
adjust tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
1 parent 0f5cc52 commit 29a1ac7

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

tests/lib/Http/Client/ClientTest.php

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,27 +49,22 @@ public function testGetProxyUri() {
4949
$this->config
5050
->expects($this->at(0))
5151
->method('getSystemValue')
52-
->with('proxy', null)
53-
->willReturn(null);
54-
$this->config
55-
->expects($this->at(1))
56-
->method('getSystemValue')
57-
->with('proxyuserpwd', null)
58-
->willReturn(null);
59-
$this->assertSame('', self::invokePrivate($this->client, 'getProxyUri'));
52+
->with('proxy', '')
53+
->willReturn('');
54+
$this->assertNull(self::invokePrivate($this->client, 'getProxyUri'));
6055
}
6156

6257
public function testGetProxyUriProxyHostEmptyPassword() {
6358
$this->config
6459
->expects($this->at(0))
6560
->method('getSystemValue')
66-
->with('proxy', null)
61+
->with('proxy', '')
6762
->willReturn('foo');
6863
$this->config
6964
->expects($this->at(1))
7065
->method('getSystemValue')
71-
->with('proxyuserpwd', null)
72-
->willReturn(null);
66+
->with('proxyuserpwd', '')
67+
->willReturn('');
7368
$this->assertSame('foo', self::invokePrivate($this->client, 'getProxyUri'));
7469
}
7570

@@ -270,7 +265,8 @@ public function testSetDefaultOptionsWithNotInstalled() {
270265
->willReturn([]);
271266

272267
$this->assertEquals([
273-
'verify' => \OC::$SERVERROOT . '/resources/config/ca-bundle.crt'
268+
'verify' => \OC::$SERVERROOT . '/resources/config/ca-bundle.crt',
269+
'proxy' => null,
274270
], self::invokePrivate($this->client, 'getRequestOptions'));
275271
}
276272

0 commit comments

Comments
 (0)