diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2020-05-25 15:03:52 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2020-05-25 16:57:56 +0200 |
| commit | 18b0d753f2d76da10fefbf9a34e22dfdcbdc93b0 (patch) | |
| tree | b9b756711bcbef39f352cc1ef941afec2fe3f63c /tests | |
| parent | cbde1d102c06f44d9b4f84cb3d72f9fbf0a3beb5 (diff) | |
| download | nextcloud-server-18b0d753f2d76da10fefbf9a34e22dfdcbdc93b0.tar.gz nextcloud-server-18b0d753f2d76da10fefbf9a34e22dfdcbdc93b0.zip | |
Do not read certificate bundle from data dir by default
Before the resources/config/ca-bundle.crt was only used when the list of custom
certificates was empty and the instance was not installed. But it should also
be used when the list is empty and the instance is installed.
This is inverting the logic to stop if the instance is not installed to use the
default bundle. And it also does this when the list is empty.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib/Http/Client/ClientTest.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/lib/Http/Client/ClientTest.php b/tests/lib/Http/Client/ClientTest.php index a0c4d75c1bd..a462a0848ae 100644 --- a/tests/lib/Http/Client/ClientTest.php +++ b/tests/lib/Http/Client/ClientTest.php @@ -461,9 +461,8 @@ class ClientTest extends \Test\TestCase { ->with('installed', false) ->willReturn(false); $this->certificateManager - ->expects($this->once()) - ->method('listCertificates') - ->willReturn([]); + ->expects($this->never()) + ->method('listCertificates'); $this->assertEquals([ 'verify' => \OC::$SERVERROOT . '/resources/config/ca-bundle.crt', |