diff --git a/core/modules/user/tests/src/Unit/PermissionAccessCheckTest.php b/core/modules/user/tests/src/Unit/PermissionAccessCheckTest.php index dca13e3..29b6247 100644 --- a/core/modules/user/tests/src/Unit/PermissionAccessCheckTest.php +++ b/core/modules/user/tests/src/Unit/PermissionAccessCheckTest.php @@ -55,15 +55,13 @@ protected function setUp() { * @return array */ public function providerTestAccess() { - $allowed = AccessResult::allowedIf(TRUE)->addCacheContexts(['user.permissions']); - $neutral = AccessResult::allowedIf(FALSE)->addCacheContexts(['user.permissions']); return [ - [[], AccessResult::allowedIf(FALSE)], - [['_permission' => 'allowed'], $allowed], - [['_permission' => 'denied'], $neutral], - [['_permission' => 'allowed+denied'], $allowed], - [['_permission' => 'allowed+denied+other'], $allowed], - [['_permission' => 'allowed,denied'], $neutral], + [[], FALSE], + [['_permission' => 'allowed'], TRUE, ['user.permissions']], + [['_permission' => 'denied'], FALSE, ['user.permissions']], + [['_permission' => 'allowed+denied'], TRUE, ['user.permissions']], + [['_permission' => 'allowed+denied+other'], TRUE, ['user.permissions']], + [['_permission' => 'allowed,denied'], FALSE, ['user.permissions']], ]; } @@ -73,7 +71,8 @@ public function providerTestAccess() { * @dataProvider providerTestAccess * @covers ::access */ - public function testAccess($requirements, $access) { + public function testAccess($requirements, $access, array $contexts = []) { + $access_result = AccessResult::allowedIf($access)->addCacheContexts($contexts); $user = $this->getMock('Drupal\Core\Session\AccountInterface'); $user->expects($this->any()) ->method('hasPermission') @@ -85,7 +84,7 @@ public function testAccess($requirements, $access) { )); $route = new Route('', [], $requirements); - $this->assertEquals($access, $this->accessCheck->access($route, $user)); + $this->assertEquals($access_result, $this->accessCheck->access($route, $user)); } }