diff options
| author | skjnldsv <skjnldsv@protonmail.com> | 2024-12-26 18:52:20 +0100 |
|---|---|---|
| committer | skjnldsv <skjnldsv@protonmail.com> | 2024-12-26 18:52:42 +0100 |
| commit | 1d3b6a3ccb484f2440df7bfa0045df5e2d2d8e27 (patch) | |
| tree | 7f49dfe46206ca209329406fe36253f17d9664ea | |
| parent | c78d1fe908f638203ec6e5c977f8df394842dafe (diff) | |
| download | nextcloud-server-feat/auto-accept-trusted-server.tar.gz nextcloud-server-feat/auto-accept-trusted-server.zip | |
fixup! fix(federation): comply to `sharing.federation.allowSelfSignedCertificates`feat/auto-accept-trusted-server
Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
| -rw-r--r-- | apps/federatedfilesharing/tests/Settings/AdminTest.php | 7 | ||||
| -rw-r--r-- | apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/apps/federatedfilesharing/tests/Settings/AdminTest.php b/apps/federatedfilesharing/tests/Settings/AdminTest.php index d821eee55b0..efbe763c633 100644 --- a/apps/federatedfilesharing/tests/Settings/AdminTest.php +++ b/apps/federatedfilesharing/tests/Settings/AdminTest.php @@ -91,10 +91,14 @@ class AdminTest extends TestCase { ->expects($this->once()) ->method('isIncomingServer2serverGroupShareEnabled') ->willReturn($state); + $this->federatedShareProvider + ->expects($this->once()) + ->method('isFederatedTrustedShareAutoAccept') + ->willReturn($state); $this->gsConfig->expects($this->once())->method('onlyInternalFederation') ->willReturn($state); - $this->initialState->expects($this->exactly(9)) + $this->initialState->expects($this->exactly(10)) ->method('provideInitialState') ->withConsecutive( ['internalOnly', $state], @@ -106,6 +110,7 @@ class AdminTest extends TestCase { ['incomingServer2serverGroupShareEnabled', $state], ['lookupServerEnabled', $state], ['lookupServerUploadEnabled', $state], + ['federatedTrustedShareAutoAccept', $state] ); $expected = new TemplateResponse('federatedfilesharing', 'settings-admin', [], ''); diff --git a/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php b/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php index 7ab3cb15fe2..119f462b57b 100644 --- a/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php +++ b/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php @@ -176,6 +176,7 @@ class RequestSharedSecretTest extends TestCase { ], 'timeout' => 3, 'connect_timeout' => 3, + 'verify' => true, ] )->willReturn($this->response); @@ -261,6 +262,7 @@ class RequestSharedSecretTest extends TestCase { ], 'timeout' => 3, 'connect_timeout' => 3, + 'verify' => true, ] )->willThrowException($this->createMock(ConnectException::class)); |