From: Joas Schilling <nickvergessen@owncloud.com>
Date: Wed, 25 May 2016 10:11:51 +0000 (+0200)
Subject: Fix failing update notifications tests
X-Git-Tag: v9.1.0beta1~8^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=338106124f249965d67c26b292e61e2113e304c1;p=nextcloud-server.git

Fix failing update notifications tests
---

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