mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #24838 from owncloud/fix-failing-updatenotifications-tests 

Fix failing update notifications tests
This commit is contained in:
Vincent Petry 2016-05-25 15:14:29 +02:00
parent eddc222369 338106124f
commit e1b89f0957
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/updatenotification/tests/Controller/AdminControllerTest.php
View File

@ -95,10 +95,12 @@ class AdminControllerTest extends TestCase {
} }
$this->config $this->config
->expects($this->once()) ->expects($this->exactly(2))
->method('getAppValue') ->method('getAppValue')
->with('core', 'lastupdatedat') ->willReturnMap([
->willReturn('12345'); ['core', 'lastupdatedat', '', '12345'],
['updatenotification', 'notify_groups', '["admin"]', '["admin"]'],
]);
$this->dateTimeFormatter $this->dateTimeFormatter
->expects($this->once()) ->expects($this->once())
->method('formatDateTime') ->method('formatDateTime')
@ -115,6 +117,7 @@ class AdminControllerTest extends TestCase {
'currentChannel' => \OCP\Util::getChannel(), 'currentChannel' => \OCP\Util::getChannel(),
'channels' => $channels, 'channels' => $channels,
'newVersionString' => '8.1.2', 'newVersionString' => '8.1.2',
'notify_groups' => 'admin',
]; ];
$expected = new TemplateResponse('updatenotification', 'admin', $params, ''); $expected = new TemplateResponse('updatenotification', 'admin', $params, '');
@ -136,10 +139,12 @@ class AdminControllerTest extends TestCase {
} }
$this->config $this->config
->expects($this->once()) ->expects($this->exactly(2))
->method('getAppValue') ->method('getAppValue')
->with('core', 'lastupdatedat') ->willReturnMap([
->willReturn('12345'); ['core', 'lastupdatedat', '', '12345'],
['updatenotification', 'notify_groups', '["admin"]', '["admin"]'],
]);
$this->dateTimeFormatter $this->dateTimeFormatter
->expects($this->once()) ->expects($this->once())
->method('formatDateTime') ->method('formatDateTime')
@ -156,6 +161,7 @@ class AdminControllerTest extends TestCase {
'currentChannel' => \OCP\Util::getChannel(), 'currentChannel' => \OCP\Util::getChannel(),
'channels' => $channels, 'channels' => $channels,
'newVersionString' => '', 'newVersionString' => '',
'notify_groups' => 'admin',
]; ];
$expected = new TemplateResponse('updatenotification', 'admin', $params, ''); $expected = new TemplateResponse('updatenotification', 'admin', $params, '');