diff options
author | Roeland Jago Douma <roeland@famdouma.nl> | 2020-07-06 17:08:05 +0300 |
---|---|---|
committer | Roeland Jago Douma <roeland@famdouma.nl> | 2020-07-06 22:08:56 +0300 |
commit | 9c9c6961c2d43d3fffe50e36a02753a509056d72 (patch) | |
tree | 6a93097a17248ee6634b86c85cc9854e16a98776 /apps/sharebymail/tests | |
parent | 08bfd634068cd11166abb82bbb1c0da235da6cec (diff) |
Fix sharebymail tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'apps/sharebymail/tests')
-rw-r--r-- | apps/sharebymail/tests/CapabilitiesTest.php | 13 | ||||
-rw-r--r-- | apps/sharebymail/tests/SettingsTest.php | 97 | ||||
-rw-r--r-- | apps/sharebymail/tests/ShareByMailProviderTest.php | 2 |
3 files changed, 13 insertions, 99 deletions
diff --git a/apps/sharebymail/tests/CapabilitiesTest.php b/apps/sharebymail/tests/CapabilitiesTest.php index dc642a16ec5..2bf05f188b6 100644 --- a/apps/sharebymail/tests/CapabilitiesTest.php +++ b/apps/sharebymail/tests/CapabilitiesTest.php @@ -26,19 +26,28 @@ namespace OCA\ShareByMail\Tests; use OCA\ShareByMail\Capabilities; +use OCA\ShareByMail\Settings\SettingsManager; use Test\TestCase; class CapabilitiesTest extends TestCase { /** @var Capabilities */ private $capabilities; + /** @var SettingsManager */ + private $settingsManager; + protected function setUp(): void { parent::setUp(); - $this->capabilities = new Capabilities(); + + $this->settingsManager = $this::createMock(SettingsManager::class); + $this->capabilities = new Capabilities($this->settingsManager); } public function testGetCapabilities() { + $this->settingsManager->method('enforcePasswordProtection') + ->willReturn(false); + $capabilities = [ 'files_sharing' => [ @@ -46,7 +55,7 @@ class CapabilitiesTest extends TestCase { [ 'enabled' => true, 'upload_files_drop' => ['enabled' => true], - 'password' => ['enabled' => true], + 'password' => ['enabled' => true, 'enforced' => false], 'expire_date' => ['enabled' => true] ] ] diff --git a/apps/sharebymail/tests/SettingsTest.php b/apps/sharebymail/tests/SettingsTest.php deleted file mode 100644 index 427dc256d60..00000000000 --- a/apps/sharebymail/tests/SettingsTest.php +++ /dev/null @@ -1,97 +0,0 @@ -<?php -/** - * @copyright Copyright (c) 2016 Bjoern Schiessle <bjoern@schiessle.org> - * - * @author Bjoern Schiessle <bjoern@schiessle.org> - * @author Christoph Wurst <christoph@winzerhof-wurst.at> - * @author Roeland Jago Douma <roeland@famdouma.nl> - * - * @license GNU AGPL version 3 or any later version - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ - -namespace OCA\ShareByMail\Tests; - -use OCA\ShareByMail\Settings; -use OCA\ShareByMail\Settings\SettingsManager; -use Test\TestCase; - -class SettingsTest extends TestCase { - - /** @var Settings */ - private $instance; - - /** @var SettingsManager | \PHPUnit_Framework_MockObject_MockObject */ - private $settingsManager; - - protected function setUp(): void { - parent::setUp(); - - $this->settingsManager = $this->getMockBuilder(SettingsManager::class) - ->disableOriginalConstructor()->getMock(); - $this->instance = new Settings($this->settingsManager); - } - - public function testAnnounceShareProvider() { - $before = [ - 'oc_appconfig' => - json_encode([ - 'key1' => 'value1', - 'key2' => 'value2' - ]), - 'oc_foo' => 'oc_bar' - ]; - - $after = [ - 'oc_appconfig' => - json_encode([ - 'key1' => 'value1', - 'key2' => 'value2', - 'shareByMailEnabled' => true - ]), - 'oc_foo' => 'oc_bar' - ]; - - $this->instance->announceShareProvider(['array' => &$before]); - $this->assertSame($after, $before); - } - - - public function testAnnounceShareByMailSettings() { - $this->settingsManager->expects($this->once())->method('enforcePasswordProtection')->willReturn(true); - $before = [ - 'oc_appconfig' => - json_encode([ - 'key1' => 'value1', - 'key2' => 'value2' - ]), - 'oc_foo' => 'oc_bar' - ]; - - $after = [ - 'oc_appconfig' => - json_encode([ - 'key1' => 'value1', - 'key2' => 'value2', - 'shareByMail' => ['enforcePasswordProtection' => true] - ]), - 'oc_foo' => 'oc_bar' - ]; - - $this->instance->announceShareByMailSettings(['array' => &$before]); - $this->assertSame($after, $before); - } -} diff --git a/apps/sharebymail/tests/ShareByMailProviderTest.php b/apps/sharebymail/tests/ShareByMailProviderTest.php index 61c76ea1f39..aeafc86c509 100644 --- a/apps/sharebymail/tests/ShareByMailProviderTest.php +++ b/apps/sharebymail/tests/ShareByMailProviderTest.php @@ -624,6 +624,8 @@ class ShareByMailProviderTest extends TestCase { $node = $this->getMockBuilder(File::class)->getMock(); $node->expects($this->any())->method('getName')->willReturn('filename'); + $this->settingsManager->method('sendPasswordByMail')->willReturn(true); + $originalShare = $this->getMockBuilder(IShare::class)->getMock(); $originalShare->expects($this->any())->method('getSharedWith')->willReturn('receiver@example.com'); $originalShare->expects($this->any())->method('getNode')->willReturn($node); |