nextcloud / server

apps/updatenotification/composer/autoload.php

Spacing +1 added lines, -1 removed lines

@@ -17,6 +17,6 @@
     throw new RuntimeException($err);
 }
 
-require_once __DIR__ . '/composer/autoload_real.php';
+require_once __DIR__.'/composer/autoload_real.php';
 
 return ComposerAutoloaderInitUpdateNotification::getLoader();

apps/updatenotification/tests/Settings/AdminTest.php

Indentation +438 added lines, -438 removed lines

@@ -30,442 +30,442 @@
 
 class AdminTest extends TestCase {
 
-	private Admin $admin;
-
-	private IFactory&MockObject $l10nFactory;
-	private IConfig&MockObject $config;
-	private IAppConfig&MockObject $appConfig;
-	private UpdateChecker&MockObject $updateChecker;
-	private IGroupManager&MockObject $groupManager;
-	private IDateTimeFormatter&MockObject $dateTimeFormatter;
-	private IRegistry&MockObject $subscriptionRegistry;
-	private IUserManager&MockObject $userManager;
-	private LoggerInterface&MockObject $logger;
-	private IInitialState&MockObject $initialState;
-	private ServerVersion&MockObject $serverVersion;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->config = $this->createMock(IConfig::class);
-		$this->appConfig = $this->createMock(IAppConfig::class);
-		$this->updateChecker = $this->createMock(UpdateChecker::class);
-		$this->groupManager = $this->createMock(IGroupManager::class);
-		$this->dateTimeFormatter = $this->createMock(IDateTimeFormatter::class);
-		$this->l10nFactory = $this->createMock(IFactory::class);
-		$this->subscriptionRegistry = $this->createMock(IRegistry::class);
-		$this->userManager = $this->createMock(IUserManager::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->initialState = $this->createMock(IInitialState::class);
-		$this->serverVersion = $this->createMock(ServerVersion::class);
-
-		$this->admin = new Admin(
-			$this->config,
-			$this->appConfig,
-			$this->updateChecker,
-			$this->groupManager,
-			$this->dateTimeFormatter,
-			$this->l10nFactory,
-			$this->subscriptionRegistry,
-			$this->userManager,
-			$this->logger,
-			$this->initialState,
-			$this->serverVersion,
-		);
-	}
-
-	public function testGetFormWithUpdate(): void {
-		$this->serverVersion->expects(self::atLeastOnce())
-			->method('getChannel')
-			->willReturn('daily');
-		$this->userManager
-			->expects($this->once())
-			->method('countUsersTotal')
-			->willReturn(5);
-		$channels = [
-			'daily',
-			'beta',
-			'stable',
-			'production',
-		];
-		$this->appConfig
-			->expects($this->once())
-			->method('getValueInt')
-			->with('core', 'lastupdatedat', 0)
-			->willReturn(12345);
-		$this->appConfig
-			->expects($this->once())
-			->method('getValueArray')
-			->with(Application::APP_NAME, 'notify_groups', ['admin'])
-			->willReturn(['admin']);
-		$this->config
-			->method('getSystemValue')
-			->willReturnMap([
-				['updater.server.url', 'https://updates.nextcloud.com/updater_server/', 'https://updates.nextcloud.com/updater_server/'],
-				['upgrade.disable-web', false, false],
-			]);
-		$this->config
-			->expects(self::any())
-			->method('getSystemValueBool')
-			->with('updatechecker', true)
-			->willReturn(true);
-		$this->dateTimeFormatter
-			->expects($this->once())
-			->method('formatDateTime')
-			->with(12345)
-			->willReturn('LastCheckedReturnValue');
-		$this->updateChecker
-			->expects($this->once())
-			->method('getUpdateState')
-			->willReturn([
-				'updateAvailable' => true,
-				'updateVersion' => '8.1.2',
-				'updateVersionString' => 'Nextcloud 8.1.2',
-				'downloadLink' => 'https://downloads.nextcloud.org/server',
-				'changes' => [],
-				'updaterEnabled' => true,
-				'versionIsEol' => false,
-			]);
-
-		$group = $this->createMock(IGroup::class);
-		$group->expects($this->any())
-			->method('getDisplayName')
-			->willReturn('Administrators');
-		$group->expects($this->any())
-			->method('getGID')
-			->willReturn('admin');
-		$this->groupManager->expects($this->once())
-			->method('get')
-			->with('admin')
-			->willReturn($group);
-
-		$this->subscriptionRegistry
-			->expects($this->once())
-			->method('delegateHasValidSubscription')
-			->willReturn(true);
-
-		$this->initialState->expects($this->once())
-			->method('provideInitialState')
-			->with('data', [
-				'isNewVersionAvailable' => true,
-				'isUpdateChecked' => true,
-				'lastChecked' => 'LastCheckedReturnValue',
-				'currentChannel' => 'daily',
-				'channels' => $channels,
-				'newVersion' => '8.1.2',
-				'newVersionString' => 'Nextcloud 8.1.2',
-				'downloadLink' => 'https://downloads.nextcloud.org/server',
-				'changes' => [],
-				'webUpdaterEnabled' => true,
-				'isWebUpdaterRecommended' => true,
-				'updaterEnabled' => true,
-				'versionIsEol' => false,
-				'isDefaultUpdateServerURL' => true,
-				'updateServerURL' => 'https://updates.nextcloud.com/updater_server/',
-				'notifyGroups' => [
-					['id' => 'admin', 'displayname' => 'Administrators'],
-				],
-				'hasValidSubscription' => true,
-			]);
-
-		$expected = new TemplateResponse(Application::APP_NAME, 'admin', [], '');
-		$this->assertEquals($expected, $this->admin->getForm());
-	}
-
-	public function testGetFormWithUpdateAndChangedUpdateServer(): void {
-		$this->serverVersion->expects(self::atLeastOnce())
-			->method('getChannel')
-			->willReturn('beta');
-		$this->userManager
-			->expects($this->once())
-			->method('countUsersTotal')
-			->willReturn(5);
-		$channels = [
-			'daily',
-			'beta',
-			'stable',
-			'production',
-		];
-
-		$this->appConfig
-			->expects($this->once())
-			->method('getValueInt')
-			->with('core', 'lastupdatedat', 0)
-			->willReturn(12345);
-		$this->config
-			->expects(self::any())
-			->method('getSystemValueBool')
-			->with('updatechecker', true)
-			->willReturn(true);
-		$this->appConfig
-			->expects($this->once())
-			->method('getValueArray')
-			->with(Application::APP_NAME, 'notify_groups', ['admin'])
-			->willReturn(['admin']);
-		$this->config
-			->method('getSystemValue')
-			->willReturnMap([
-				['updater.server.url', 'https://updates.nextcloud.com/updater_server/', 'https://updates.nextcloud.com/updater_server_changed/'],
-				['upgrade.disable-web', false, true],
-			]);
-		$this->dateTimeFormatter
-			->expects($this->once())
-			->method('formatDateTime')
-			->with('12345')
-			->willReturn('LastCheckedReturnValue');
-		$this->updateChecker
-			->expects($this->once())
-			->method('getUpdateState')
-			->willReturn([
-				'updateAvailable' => true,
-				'updateVersion' => '8.1.2',
-				'updateVersionString' => 'Nextcloud 8.1.2',
-				'downloadLink' => 'https://downloads.nextcloud.org/server',
-				'changes' => [],
-				'updaterEnabled' => true,
-				'versionIsEol' => false,
-			]);
-
-		$group = $this->createMock(IGroup::class);
-		$group->expects($this->any())
-			->method('getDisplayName')
-			->willReturn('Administrators');
-		$group->expects($this->any())
-			->method('getGID')
-			->willReturn('admin');
-		$this->groupManager->expects($this->once())
-			->method('get')
-			->with('admin')
-			->willReturn($group);
-
-		$this->subscriptionRegistry
-			->expects($this->once())
-			->method('delegateHasValidSubscription')
-			->willReturn(true);
-
-		$this->initialState->expects($this->once())
-			->method('provideInitialState')
-			->with('data', [
-				'isNewVersionAvailable' => true,
-				'isUpdateChecked' => true,
-				'lastChecked' => 'LastCheckedReturnValue',
-				'currentChannel' => 'beta',
-				'channels' => $channels,
-				'newVersion' => '8.1.2',
-				'newVersionString' => 'Nextcloud 8.1.2',
-				'downloadLink' => 'https://downloads.nextcloud.org/server',
-				'changes' => [],
-				'webUpdaterEnabled' => false,
-				'isWebUpdaterRecommended' => true,
-				'updaterEnabled' => true,
-				'versionIsEol' => false,
-				'isDefaultUpdateServerURL' => false,
-				'updateServerURL' => 'https://updates.nextcloud.com/updater_server_changed/',
-				'notifyGroups' => [
-					['id' => 'admin', 'displayname' => 'Administrators'],
-				],
-				'hasValidSubscription' => true,
-			]);
-
-		$expected = new TemplateResponse(Application::APP_NAME, 'admin', [], '');
-		$this->assertEquals($expected, $this->admin->getForm());
-	}
-
-	public function testGetFormWithUpdateAndCustomersUpdateServer(): void {
-		$this->serverVersion->expects(self::atLeastOnce())
-			->method('getChannel')
-			->willReturn('production');
-		$this->userManager
-			->expects($this->once())
-			->method('countUsersTotal')
-			->willReturn(5);
-		$channels = [
-			'daily',
-			'beta',
-			'stable',
-			'production',
-		];
-
-		$this->appConfig
-			->expects($this->once())
-			->method('getValueInt')
-			->with('core', 'lastupdatedat', 0)
-			->willReturn(12345);
-		$this->config
-			->expects(self::any())
-			->method('getSystemValueBool')
-			->with('updatechecker', true)
-			->willReturn(true);
-		$this->appConfig
-			->expects(self::once())
-			->method('getValueArray')
-			->with(Application::APP_NAME, 'notify_groups', ['admin'])
-			->willReturn(['admin']);
-		$this->config
-			->method('getSystemValue')
-			->willReturnMap([
-				['updater.server.url', 'https://updates.nextcloud.com/updater_server/', 'https://updates.nextcloud.com/customers/ABC-DEF/'],
-				['upgrade.disable-web', false, false],
-			]);
-		$this->dateTimeFormatter
-			->expects($this->once())
-			->method('formatDateTime')
-			->with('12345')
-			->willReturn('LastCheckedReturnValue');
-		$this->updateChecker
-			->expects($this->once())
-			->method('getUpdateState')
-			->willReturn([
-				'updateAvailable' => true,
-				'updateVersion' => '8.1.2',
-				'updateVersionString' => 'Nextcloud 8.1.2',
-				'downloadLink' => 'https://downloads.nextcloud.org/server',
-				'changes' => [],
-				'updaterEnabled' => true,
-				'versionIsEol' => false,
-			]);
-
-		$group = $this->createMock(IGroup::class);
-		$group->expects($this->any())
-			->method('getDisplayName')
-			->willReturn('Administrators');
-		$group->expects($this->any())
-			->method('getGID')
-			->willReturn('admin');
-		$this->groupManager->expects($this->once())
-			->method('get')
-			->with('admin')
-			->willReturn($group);
-
-		$this->subscriptionRegistry
-			->expects($this->once())
-			->method('delegateHasValidSubscription')
-			->willReturn(true);
-
-		$this->initialState->expects($this->once())
-			->method('provideInitialState')
-			->with('data', [
-				'isNewVersionAvailable' => true,
-				'isUpdateChecked' => true,
-				'lastChecked' => 'LastCheckedReturnValue',
-				'currentChannel' => 'production',
-				'channels' => $channels,
-				'newVersion' => '8.1.2',
-				'newVersionString' => 'Nextcloud 8.1.2',
-				'downloadLink' => 'https://downloads.nextcloud.org/server',
-				'changes' => [],
-				'webUpdaterEnabled' => true,
-				'isWebUpdaterRecommended' => true,
-				'updaterEnabled' => true,
-				'versionIsEol' => false,
-				'isDefaultUpdateServerURL' => true,
-				'updateServerURL' => 'https://updates.nextcloud.com/customers/ABC-DEF/',
-				'notifyGroups' => [
-					['id' => 'admin', 'displayname' => 'Administrators'],
-				],
-				'hasValidSubscription' => true,
-			]);
-
-		$expected = new TemplateResponse(Application::APP_NAME, 'admin', [], '');
-		$this->assertEquals($expected, $this->admin->getForm());
-	}
-
-
-	public function testGetSection(): void {
-		$this->config
-			->expects(self::atLeastOnce())
-			->method('getSystemValueBool')
-			->with('updatechecker', true)
-			->willReturn(true);
-
-		$this->assertSame('overview', $this->admin->getSection());
-	}
-
-	public function testGetSectionDisabled(): void {
-		$this->config
-			->expects(self::atLeastOnce())
-			->method('getSystemValueBool')
-			->with('updatechecker', true)
-			->willReturn(false);
-
-		$this->assertNull($this->admin->getSection());
-	}
-
-	public function testGetPriority(): void {
-		$this->assertSame(11, $this->admin->getPriority());
-	}
-
-	public function changesProvider() {
-		return [
-			[ #0, all info, en
-				[
-					'changelogURL' => 'https://go.to.changelog',
-					'whatsNew' => [
-						'en' => [
-							'regular' => ['content'],
-						],
-						'de' => [
-							'regular' => ['inhalt'],
-						]
-					],
-				],
-				'en',
-				[
-					'changelogURL' => 'https://go.to.changelog',
-					'whatsNew' => [
-						'regular' => ['content'],
-					],
-				]
-			],
-			[ #1, all info, de
-				[
-					'changelogURL' => 'https://go.to.changelog',
-					'whatsNew' => [
-						'en' => [
-							'regular' => ['content'],
-						],
-						'de' => [
-							'regular' => ['inhalt'],
-						]
-					],
-				],
-				'de',
-				[
-					'changelogURL' => 'https://go.to.changelog',
-					'whatsNew' => [
-						'regular' => ['inhalt'],
-					]
-				],
-			],
-			[ #2, just changelog
-				[ 'changelogURL' => 'https://go.to.changelog' ],
-				'en',
-				[ 'changelogURL' => 'https://go.to.changelog' ],
-			],
-			[ #3 nothing
-				[],
-				'ru',
-				[]
-			]
-		];
-	}
-
-	/**
-	 * @dataProvider changesProvider
-	 */
-	public function testFilterChanges($changes, $userLang, $expectation): void {
-		$iterator = $this->createMock(ILanguageIterator::class);
-		$iterator->expects($this->any())
-			->method('current')
-			->willReturnOnConsecutiveCalls('es', $userLang, 'it', 'en');
-		$iterator->expects($this->any())
-			->method('valid')
-			->willReturn(true);
-
-		$this->l10nFactory->expects($this->atMost(1))
-			->method('getLanguageIterator')
-			->willReturn($iterator);
-		$result = $this->invokePrivate($this->admin, 'filterChanges', [$changes]);
-		$this->assertSame($expectation, $result);
-	}
+    private Admin $admin;
+
+    private IFactory&MockObject $l10nFactory;
+    private IConfig&MockObject $config;
+    private IAppConfig&MockObject $appConfig;
+    private UpdateChecker&MockObject $updateChecker;
+    private IGroupManager&MockObject $groupManager;
+    private IDateTimeFormatter&MockObject $dateTimeFormatter;
+    private IRegistry&MockObject $subscriptionRegistry;
+    private IUserManager&MockObject $userManager;
+    private LoggerInterface&MockObject $logger;
+    private IInitialState&MockObject $initialState;
+    private ServerVersion&MockObject $serverVersion;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->config = $this->createMock(IConfig::class);
+        $this->appConfig = $this->createMock(IAppConfig::class);
+        $this->updateChecker = $this->createMock(UpdateChecker::class);
+        $this->groupManager = $this->createMock(IGroupManager::class);
+        $this->dateTimeFormatter = $this->createMock(IDateTimeFormatter::class);
+        $this->l10nFactory = $this->createMock(IFactory::class);
+        $this->subscriptionRegistry = $this->createMock(IRegistry::class);
+        $this->userManager = $this->createMock(IUserManager::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->initialState = $this->createMock(IInitialState::class);
+        $this->serverVersion = $this->createMock(ServerVersion::class);
+
+        $this->admin = new Admin(
+            $this->config,
+            $this->appConfig,
+            $this->updateChecker,
+            $this->groupManager,
+            $this->dateTimeFormatter,
+            $this->l10nFactory,
+            $this->subscriptionRegistry,
+            $this->userManager,
+            $this->logger,
+            $this->initialState,
+            $this->serverVersion,
+        );
+    }
+
+    public function testGetFormWithUpdate(): void {
+        $this->serverVersion->expects(self::atLeastOnce())
+            ->method('getChannel')
+            ->willReturn('daily');
+        $this->userManager
+            ->expects($this->once())
+            ->method('countUsersTotal')
+            ->willReturn(5);
+        $channels = [
+            'daily',
+            'beta',
+            'stable',
+            'production',
+        ];
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getValueInt')
+            ->with('core', 'lastupdatedat', 0)
+            ->willReturn(12345);
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getValueArray')
+            ->with(Application::APP_NAME, 'notify_groups', ['admin'])
+            ->willReturn(['admin']);
+        $this->config
+            ->method('getSystemValue')
+            ->willReturnMap([
+                ['updater.server.url', 'https://updates.nextcloud.com/updater_server/', 'https://updates.nextcloud.com/updater_server/'],
+                ['upgrade.disable-web', false, false],
+            ]);
+        $this->config
+            ->expects(self::any())
+            ->method('getSystemValueBool')
+            ->with('updatechecker', true)
+            ->willReturn(true);
+        $this->dateTimeFormatter
+            ->expects($this->once())
+            ->method('formatDateTime')
+            ->with(12345)
+            ->willReturn('LastCheckedReturnValue');
+        $this->updateChecker
+            ->expects($this->once())
+            ->method('getUpdateState')
+            ->willReturn([
+                'updateAvailable' => true,
+                'updateVersion' => '8.1.2',
+                'updateVersionString' => 'Nextcloud 8.1.2',
+                'downloadLink' => 'https://downloads.nextcloud.org/server',
+                'changes' => [],
+                'updaterEnabled' => true,
+                'versionIsEol' => false,
+            ]);
+
+        $group = $this->createMock(IGroup::class);
+        $group->expects($this->any())
+            ->method('getDisplayName')
+            ->willReturn('Administrators');
+        $group->expects($this->any())
+            ->method('getGID')
+            ->willReturn('admin');
+        $this->groupManager->expects($this->once())
+            ->method('get')
+            ->with('admin')
+            ->willReturn($group);
+
+        $this->subscriptionRegistry
+            ->expects($this->once())
+            ->method('delegateHasValidSubscription')
+            ->willReturn(true);
+
+        $this->initialState->expects($this->once())
+            ->method('provideInitialState')
+            ->with('data', [
+                'isNewVersionAvailable' => true,
+                'isUpdateChecked' => true,
+                'lastChecked' => 'LastCheckedReturnValue',
+                'currentChannel' => 'daily',
+                'channels' => $channels,
+                'newVersion' => '8.1.2',
+                'newVersionString' => 'Nextcloud 8.1.2',
+                'downloadLink' => 'https://downloads.nextcloud.org/server',
+                'changes' => [],
+                'webUpdaterEnabled' => true,
+                'isWebUpdaterRecommended' => true,
+                'updaterEnabled' => true,
+                'versionIsEol' => false,
+                'isDefaultUpdateServerURL' => true,
+                'updateServerURL' => 'https://updates.nextcloud.com/updater_server/',
+                'notifyGroups' => [
+                    ['id' => 'admin', 'displayname' => 'Administrators'],
+                ],
+                'hasValidSubscription' => true,
+            ]);
+
+        $expected = new TemplateResponse(Application::APP_NAME, 'admin', [], '');
+        $this->assertEquals($expected, $this->admin->getForm());
+    }
+
+    public function testGetFormWithUpdateAndChangedUpdateServer(): void {
+        $this->serverVersion->expects(self::atLeastOnce())
+            ->method('getChannel')
+            ->willReturn('beta');
+        $this->userManager
+            ->expects($this->once())
+            ->method('countUsersTotal')
+            ->willReturn(5);
+        $channels = [
+            'daily',
+            'beta',
+            'stable',
+            'production',
+        ];
+
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getValueInt')
+            ->with('core', 'lastupdatedat', 0)
+            ->willReturn(12345);
+        $this->config
+            ->expects(self::any())
+            ->method('getSystemValueBool')
+            ->with('updatechecker', true)
+            ->willReturn(true);
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getValueArray')
+            ->with(Application::APP_NAME, 'notify_groups', ['admin'])
+            ->willReturn(['admin']);
+        $this->config
+            ->method('getSystemValue')
+            ->willReturnMap([
+                ['updater.server.url', 'https://updates.nextcloud.com/updater_server/', 'https://updates.nextcloud.com/updater_server_changed/'],
+                ['upgrade.disable-web', false, true],
+            ]);
+        $this->dateTimeFormatter
+            ->expects($this->once())
+            ->method('formatDateTime')
+            ->with('12345')
+            ->willReturn('LastCheckedReturnValue');
+        $this->updateChecker
+            ->expects($this->once())
+            ->method('getUpdateState')
+            ->willReturn([
+                'updateAvailable' => true,
+                'updateVersion' => '8.1.2',
+                'updateVersionString' => 'Nextcloud 8.1.2',
+                'downloadLink' => 'https://downloads.nextcloud.org/server',
+                'changes' => [],
+                'updaterEnabled' => true,
+                'versionIsEol' => false,
+            ]);
+
+        $group = $this->createMock(IGroup::class);
+        $group->expects($this->any())
+            ->method('getDisplayName')
+            ->willReturn('Administrators');
+        $group->expects($this->any())
+            ->method('getGID')
+            ->willReturn('admin');
+        $this->groupManager->expects($this->once())
+            ->method('get')
+            ->with('admin')
+            ->willReturn($group);
+
+        $this->subscriptionRegistry
+            ->expects($this->once())
+            ->method('delegateHasValidSubscription')
+            ->willReturn(true);
+
+        $this->initialState->expects($this->once())
+            ->method('provideInitialState')
+            ->with('data', [
+                'isNewVersionAvailable' => true,
+                'isUpdateChecked' => true,
+                'lastChecked' => 'LastCheckedReturnValue',
+                'currentChannel' => 'beta',
+                'channels' => $channels,
+                'newVersion' => '8.1.2',
+                'newVersionString' => 'Nextcloud 8.1.2',
+                'downloadLink' => 'https://downloads.nextcloud.org/server',
+                'changes' => [],
+                'webUpdaterEnabled' => false,
+                'isWebUpdaterRecommended' => true,
+                'updaterEnabled' => true,
+                'versionIsEol' => false,
+                'isDefaultUpdateServerURL' => false,
+                'updateServerURL' => 'https://updates.nextcloud.com/updater_server_changed/',
+                'notifyGroups' => [
+                    ['id' => 'admin', 'displayname' => 'Administrators'],
+                ],
+                'hasValidSubscription' => true,
+            ]);
+
+        $expected = new TemplateResponse(Application::APP_NAME, 'admin', [], '');
+        $this->assertEquals($expected, $this->admin->getForm());
+    }
+
+    public function testGetFormWithUpdateAndCustomersUpdateServer(): void {
+        $this->serverVersion->expects(self::atLeastOnce())
+            ->method('getChannel')
+            ->willReturn('production');
+        $this->userManager
+            ->expects($this->once())
+            ->method('countUsersTotal')
+            ->willReturn(5);
+        $channels = [
+            'daily',
+            'beta',
+            'stable',
+            'production',
+        ];
+
+        $this->appConfig
+            ->expects($this->once())
+            ->method('getValueInt')
+            ->with('core', 'lastupdatedat', 0)
+            ->willReturn(12345);
+        $this->config
+            ->expects(self::any())
+            ->method('getSystemValueBool')
+            ->with('updatechecker', true)
+            ->willReturn(true);
+        $this->appConfig
+            ->expects(self::once())
+            ->method('getValueArray')
+            ->with(Application::APP_NAME, 'notify_groups', ['admin'])
+            ->willReturn(['admin']);
+        $this->config
+            ->method('getSystemValue')
+            ->willReturnMap([
+                ['updater.server.url', 'https://updates.nextcloud.com/updater_server/', 'https://updates.nextcloud.com/customers/ABC-DEF/'],
+                ['upgrade.disable-web', false, false],
+            ]);
+        $this->dateTimeFormatter
+            ->expects($this->once())
+            ->method('formatDateTime')
+            ->with('12345')
+            ->willReturn('LastCheckedReturnValue');
+        $this->updateChecker
+            ->expects($this->once())
+            ->method('getUpdateState')
+            ->willReturn([
+                'updateAvailable' => true,
+                'updateVersion' => '8.1.2',
+                'updateVersionString' => 'Nextcloud 8.1.2',
+                'downloadLink' => 'https://downloads.nextcloud.org/server',
+                'changes' => [],
+                'updaterEnabled' => true,
+                'versionIsEol' => false,
+            ]);
+
+        $group = $this->createMock(IGroup::class);
+        $group->expects($this->any())
+            ->method('getDisplayName')
+            ->willReturn('Administrators');
+        $group->expects($this->any())
+            ->method('getGID')
+            ->willReturn('admin');
+        $this->groupManager->expects($this->once())
+            ->method('get')
+            ->with('admin')
+            ->willReturn($group);
+
+        $this->subscriptionRegistry
+            ->expects($this->once())
+            ->method('delegateHasValidSubscription')
+            ->willReturn(true);
+
+        $this->initialState->expects($this->once())
+            ->method('provideInitialState')
+            ->with('data', [
+                'isNewVersionAvailable' => true,
+                'isUpdateChecked' => true,
+                'lastChecked' => 'LastCheckedReturnValue',
+                'currentChannel' => 'production',
+                'channels' => $channels,
+                'newVersion' => '8.1.2',
+                'newVersionString' => 'Nextcloud 8.1.2',
+                'downloadLink' => 'https://downloads.nextcloud.org/server',
+                'changes' => [],
+                'webUpdaterEnabled' => true,
+                'isWebUpdaterRecommended' => true,
+                'updaterEnabled' => true,
+                'versionIsEol' => false,
+                'isDefaultUpdateServerURL' => true,
+                'updateServerURL' => 'https://updates.nextcloud.com/customers/ABC-DEF/',
+                'notifyGroups' => [
+                    ['id' => 'admin', 'displayname' => 'Administrators'],
+                ],
+                'hasValidSubscription' => true,
+            ]);
+
+        $expected = new TemplateResponse(Application::APP_NAME, 'admin', [], '');
+        $this->assertEquals($expected, $this->admin->getForm());
+    }
+
+
+    public function testGetSection(): void {
+        $this->config
+            ->expects(self::atLeastOnce())
+            ->method('getSystemValueBool')
+            ->with('updatechecker', true)
+            ->willReturn(true);
+
+        $this->assertSame('overview', $this->admin->getSection());
+    }
+
+    public function testGetSectionDisabled(): void {
+        $this->config
+            ->expects(self::atLeastOnce())
+            ->method('getSystemValueBool')
+            ->with('updatechecker', true)
+            ->willReturn(false);
+
+        $this->assertNull($this->admin->getSection());
+    }
+
+    public function testGetPriority(): void {
+        $this->assertSame(11, $this->admin->getPriority());
+    }
+
+    public function changesProvider() {
+        return [
+            [ #0, all info, en
+                [
+                    'changelogURL' => 'https://go.to.changelog',
+                    'whatsNew' => [
+                        'en' => [
+                            'regular' => ['content'],
+                        ],
+                        'de' => [
+                            'regular' => ['inhalt'],
+                        ]
+                    ],
+                ],
+                'en',
+                [
+                    'changelogURL' => 'https://go.to.changelog',
+                    'whatsNew' => [
+                        'regular' => ['content'],
+                    ],
+                ]
+            ],
+            [ #1, all info, de
+                [
+                    'changelogURL' => 'https://go.to.changelog',
+                    'whatsNew' => [
+                        'en' => [
+                            'regular' => ['content'],
+                        ],
+                        'de' => [
+                            'regular' => ['inhalt'],
+                        ]
+                    ],
+                ],
+                'de',
+                [
+                    'changelogURL' => 'https://go.to.changelog',
+                    'whatsNew' => [
+                        'regular' => ['inhalt'],
+                    ]
+                ],
+            ],
+            [ #2, just changelog
+                [ 'changelogURL' => 'https://go.to.changelog' ],
+                'en',
+                [ 'changelogURL' => 'https://go.to.changelog' ],
+            ],
+            [ #3 nothing
+                [],
+                'ru',
+                []
+            ]
+        ];
+    }
+
+    /**
+     * @dataProvider changesProvider
+     */
+    public function testFilterChanges($changes, $userLang, $expectation): void {
+        $iterator = $this->createMock(ILanguageIterator::class);
+        $iterator->expects($this->any())
+            ->method('current')
+            ->willReturnOnConsecutiveCalls('es', $userLang, 'it', 'en');
+        $iterator->expects($this->any())
+            ->method('valid')
+            ->willReturn(true);
+
+        $this->l10nFactory->expects($this->atMost(1))
+            ->method('getLanguageIterator')
+            ->willReturn($iterator);
+        $result = $this->invokePrivate($this->admin, 'filterChanges', [$changes]);
+        $this->assertSame($expectation, $result);
+    }
 }

apps/updatenotification/tests/Notification/NotifierTest.php

Indentation +80 added lines, -80 removed lines

@@ -25,91 +25,91 @@
 
 class NotifierTest extends TestCase {
 
-	protected IURLGenerator&MockObject $urlGenerator;
-	protected IAppConfig&MockObject $appConfig;
-	protected IManager&MockObject $notificationManager;
-	protected IFactory&MockObject $l10nFactory;
-	protected IUserSession&MockObject $userSession;
-	protected IGroupManager&MockObject $groupManager;
-	protected IAppManager&MockObject $appManager;
-	protected ServerVersion&MockObject $serverVersion;
+    protected IURLGenerator&MockObject $urlGenerator;
+    protected IAppConfig&MockObject $appConfig;
+    protected IManager&MockObject $notificationManager;
+    protected IFactory&MockObject $l10nFactory;
+    protected IUserSession&MockObject $userSession;
+    protected IGroupManager&MockObject $groupManager;
+    protected IAppManager&MockObject $appManager;
+    protected ServerVersion&MockObject $serverVersion;
 
-	protected function setUp(): void {
-		parent::setUp();
+    protected function setUp(): void {
+        parent::setUp();
 
-		$this->urlGenerator = $this->createMock(IURLGenerator::class);
-		$this->appConfig = $this->createMock(IAppConfig::class);
-		$this->notificationManager = $this->createMock(IManager::class);
-		$this->l10nFactory = $this->createMock(IFactory::class);
-		$this->userSession = $this->createMock(IUserSession::class);
-		$this->groupManager = $this->createMock(IGroupManager::class);
-		$this->appManager = $this->createMock(IAppManager::class);
-		$this->serverVersion = $this->createMock(ServerVersion::class);
-	}
+        $this->urlGenerator = $this->createMock(IURLGenerator::class);
+        $this->appConfig = $this->createMock(IAppConfig::class);
+        $this->notificationManager = $this->createMock(IManager::class);
+        $this->l10nFactory = $this->createMock(IFactory::class);
+        $this->userSession = $this->createMock(IUserSession::class);
+        $this->groupManager = $this->createMock(IGroupManager::class);
+        $this->appManager = $this->createMock(IAppManager::class);
+        $this->serverVersion = $this->createMock(ServerVersion::class);
+    }
 
-	/**
-	 * @param array $methods
-	 * @return Notifier|\PHPUnit\Framework\MockObject\MockObject
-	 */
-	protected function getNotifier(array $methods = []) {
-		if (empty($methods)) {
-			return new Notifier(
-				$this->urlGenerator,
-				$this->appConfig,
-				$this->notificationManager,
-				$this->l10nFactory,
-				$this->userSession,
-				$this->groupManager,
-				$this->appManager,
-				$this->serverVersion,
-			);
-		}
-		{
-			return $this->getMockBuilder(Notifier::class)
-				->setConstructorArgs([
-					$this->urlGenerator,
-					$this->appConfig,
-					$this->notificationManager,
-					$this->l10nFactory,
-					$this->userSession,
-					$this->groupManager,
-					$this->appManager,
-					$this->serverVersion,
-				])
-				->onlyMethods($methods)
-				->getMock();
-		}
-	}
+    /**
+     * @param array $methods
+     * @return Notifier|\PHPUnit\Framework\MockObject\MockObject
+     */
+    protected function getNotifier(array $methods = []) {
+        if (empty($methods)) {
+            return new Notifier(
+                $this->urlGenerator,
+                $this->appConfig,
+                $this->notificationManager,
+                $this->l10nFactory,
+                $this->userSession,
+                $this->groupManager,
+                $this->appManager,
+                $this->serverVersion,
+            );
+        }
+        {
+            return $this->getMockBuilder(Notifier::class)
+                ->setConstructorArgs([
+                    $this->urlGenerator,
+                    $this->appConfig,
+                    $this->notificationManager,
+                    $this->l10nFactory,
+                    $this->userSession,
+                    $this->groupManager,
+                    $this->appManager,
+                    $this->serverVersion,
+                ])
+                ->onlyMethods($methods)
+                ->getMock();
+        }
+    }
 
-	public function dataUpdateAlreadyInstalledCheck(): array {
-		return [
-			['1.1.0', '1.0.0', false],
-			['1.1.0', '1.1.0', true],
-			['1.1.0', '1.2.0', true],
-		];
-	}
+    public function dataUpdateAlreadyInstalledCheck(): array {
+        return [
+            ['1.1.0', '1.0.0', false],
+            ['1.1.0', '1.1.0', true],
+            ['1.1.0', '1.2.0', true],
+        ];
+    }
 
-	/**
-	 * @dataProvider dataUpdateAlreadyInstalledCheck
-	 *
-	 * @param string $versionNotification
-	 * @param string $versionInstalled
-	 * @param bool $exception
-	 */
-	public function testUpdateAlreadyInstalledCheck(string $versionNotification, string $versionInstalled, bool $exception): void {
-		$notifier = $this->getNotifier();
+    /**
+     * @dataProvider dataUpdateAlreadyInstalledCheck
+     *
+     * @param string $versionNotification
+     * @param string $versionInstalled
+     * @param bool $exception
+     */
+    public function testUpdateAlreadyInstalledCheck(string $versionNotification, string $versionInstalled, bool $exception): void {
+        $notifier = $this->getNotifier();
 
-		$notification = $this->createMock(INotification::class);
-		$notification->expects($this->once())
-			->method('getObjectId')
-			->willReturn($versionNotification);
+        $notification = $this->createMock(INotification::class);
+        $notification->expects($this->once())
+            ->method('getObjectId')
+            ->willReturn($versionNotification);
 
-		try {
-			self::invokePrivate($notifier, 'updateAlreadyInstalledCheck', [$notification, $versionInstalled]);
-			$this->assertFalse($exception);
-		} catch (\Exception $e) {
-			$this->assertTrue($exception);
-			$this->assertInstanceOf(AlreadyProcessedException::class, $e);
-		}
-	}
+        try {
+            self::invokePrivate($notifier, 'updateAlreadyInstalledCheck', [$notification, $versionInstalled]);
+            $this->assertFalse($exception);
+        } catch (\Exception $e) {
+            $this->assertTrue($exception);
+            $this->assertInstanceOf(AlreadyProcessedException::class, $e);
+        }
+    }
 }