From 6958d8005ae3b86759f49746564bf7238456be52 Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Thu, 22 Jul 2021 11:41:29 +0200 Subject: Add admin privilege delegation for admin settings This makes it possible for selected groups to access some settings pages. Signed-off-by: Carl Schwan --- apps/settings/tests/Middleware/SubadminMiddlewareTest.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'apps/settings/tests/Middleware') diff --git a/apps/settings/tests/Middleware/SubadminMiddlewareTest.php b/apps/settings/tests/Middleware/SubadminMiddlewareTest.php index d943e8ad752..a6317173439 100644 --- a/apps/settings/tests/Middleware/SubadminMiddlewareTest.php +++ b/apps/settings/tests/Middleware/SubadminMiddlewareTest.php @@ -68,10 +68,15 @@ class SubadminMiddlewareTest extends \Test\TestCase { $this->expectException(\OC\AppFramework\Middleware\Security\Exceptions\NotAdminException::class); $this->reflector - ->expects($this->once()) + ->expects($this->at(0)) ->method('hasAnnotation') ->with('NoSubAdminRequired') ->willReturn(false); + $this->reflector + ->expects($this->at(1)) + ->method('hasAnnotation') + ->with('AuthorizedAdminSetting') + ->willReturn(false); $this->subadminMiddleware->beforeController($this->controller, 'foo'); } @@ -87,10 +92,15 @@ class SubadminMiddlewareTest extends \Test\TestCase { public function testBeforeControllerAsSubAdminWithoutExemption() { $this->reflector - ->expects($this->once()) + ->expects($this->at(0)) ->method('hasAnnotation') ->with('NoSubAdminRequired') ->willReturn(false); + $this->reflector + ->expects($this->at(1)) + ->method('hasAnnotation') + ->with('AuthorizedAdminSetting') + ->willReturn(false); $this->subadminMiddlewareAsSubAdmin->beforeController($this->controller, 'foo'); } -- cgit v1.2.3