Issue #3267170 by idebr: [8.x-1.x] Automated tests are failing with Drupal 9.3+ (5275106a) · Commits · project / group

tests/src/Kernel/ChainGroupPermissionCalculatorTest.php

+10 −10

Original line number	Diff line number	Diff line
		@@ -69,7 +69,7 @@ class ChainGroupPermissionCalculatorTest extends GroupKernelTestBase {
		$this->assertEqualsCanonicalizing($permissions, $converted, 'Anonymous permissions are returned per group type.');
		$this->assertSame([], $calculated_permissions->getCacheContexts(), 'Anonymous permissions have the right cache contexts.');
		$this->assertSame(-1, $calculated_permissions->getCacheMaxAge(), 'Anonymous permissions have the right max cache age.');
		$this->assertSame($cache_tags, $calculated_permissions->getCacheTags(), 'Anonymous permissions have the right cache tags.');
		$this->assertEqualsCanonicalizing($cache_tags, $calculated_permissions->getCacheTags(), 'Anonymous permissions have the right cache tags.');

		$group_role = $this->entityTypeManager->getStorage('group_role')->load('default-anonymous');
		$group_role->grantPermission('view group')->save();
		@@ -80,7 +80,7 @@ class ChainGroupPermissionCalculatorTest extends GroupKernelTestBase {
		$this->assertEqualsCanonicalizing($permissions, $converted, 'Updated anonymous permissions are returned per group type.');
		$this->assertSame([], $calculated_permissions->getCacheContexts(), 'Updated anonymous permissions have the right cache contexts.');
		$this->assertSame(-1, $calculated_permissions->getCacheMaxAge(), 'Updated anonymous permissions have the right max cache age.');
		$this->assertSame($cache_tags, $calculated_permissions->getCacheTags(), 'Updated anonymous permissions have the right cache tags.');
		$this->assertEqualsCanonicalizing($cache_tags, $calculated_permissions->getCacheTags(), 'Updated anonymous permissions have the right cache tags.');

		$this->createGroupType(['id' => 'test']);
		$permissions['test'] = [];
		@@ -92,7 +92,7 @@ class ChainGroupPermissionCalculatorTest extends GroupKernelTestBase {
		$this->assertEqualsCanonicalizing($permissions, $converted, 'Anonymous permissions are updated after introducing a new group type.');
		$this->assertSame([], $calculated_permissions->getCacheContexts(), 'Anonymous permissions have the right cache contexts after introducing a new group type.');
		$this->assertSame(-1, $calculated_permissions->getCacheMaxAge(), 'Anonymous permissions have the right max cache age after introducing a new group type.');
		$this->assertSame($cache_tags, $calculated_permissions->getCacheTags(), 'Anonymous permissions have the right cache tags after introducing a new group type.');
		$this->assertEqualsCanonicalizing($cache_tags, $calculated_permissions->getCacheTags(), 'Anonymous permissions have the right cache tags after introducing a new group type.');
		}

		/**
		@@ -123,7 +123,7 @@ class ChainGroupPermissionCalculatorTest extends GroupKernelTestBase {
		$converted = $this->convertCalculatedPermissionsToArray($calculated_permissions);
		$this->assertEqualsCanonicalizing($permissions, $converted, 'Outsider permissions are returned per group type.');
		$this->assertSame(-1, $calculated_permissions->getCacheMaxAge(), 'Outsider permissions have the right max cache age.');
		$this->assertSame($cache_tags, $calculated_permissions->getCacheTags(), 'Outsider permissions have the right cache tags.');
		$this->assertEqualsCanonicalizing($cache_tags, $calculated_permissions->getCacheTags(), 'Outsider permissions have the right cache tags.');

		$group_role = $this->entityTypeManager->getStorage('group_role')->load('other-outsider');
		$group_role->grantPermission('view group')->save();
		@@ -133,7 +133,7 @@ class ChainGroupPermissionCalculatorTest extends GroupKernelTestBase {
		$converted = $this->convertCalculatedPermissionsToArray($calculated_permissions);
		$this->assertEqualsCanonicalizing($permissions, $converted, 'Updated outsider permissions are returned per group type.');
		$this->assertSame(-1, $calculated_permissions->getCacheMaxAge(), 'Updated outsider permissions have the right max cache age.');
		$this->assertSame($cache_tags, $calculated_permissions->getCacheTags(), 'Updated outsider permissions have the right cache tags.');
		$this->assertEqualsCanonicalizing($cache_tags, $calculated_permissions->getCacheTags(), 'Updated outsider permissions have the right cache tags.');

		$group_role = $this->entityTypeManager->getStorage('group_role')->load($group_role_id);
		$group_role->grantPermission('edit group')->save();
		@@ -143,7 +143,7 @@ class ChainGroupPermissionCalculatorTest extends GroupKernelTestBase {
		$converted = $this->convertCalculatedPermissionsToArray($calculated_permissions);
		$this->assertEqualsCanonicalizing($permissions, $converted, 'Updated synchronized outsider permissions are returned per group type.');
		$this->assertSame(-1, $calculated_permissions->getCacheMaxAge(), 'Updated synchronized outsider permissions have the right max cache age.');
		$this->assertSame($cache_tags, $calculated_permissions->getCacheTags(), 'Updated synchronized outsider permissions have the right cache tags.');
		$this->assertEqualsCanonicalizing($cache_tags, $calculated_permissions->getCacheTags(), 'Updated synchronized outsider permissions have the right cache tags.');

		$this->createGroupType(['id' => 'test']);
		$permissions['test'] = [];
		@@ -155,7 +155,7 @@ class ChainGroupPermissionCalculatorTest extends GroupKernelTestBase {
		$converted = $this->convertCalculatedPermissionsToArray($calculated_permissions);
		$this->assertEqualsCanonicalizing($permissions, $converted, 'Outsider permissions are updated after introducing a new group type.');
		$this->assertSame(-1, $calculated_permissions->getCacheMaxAge(), 'Outsider permissions have the right max cache age after introducing a new group type.');
		$this->assertSame($cache_tags, $calculated_permissions->getCacheTags(), 'Outsider permissions have the right cache tags after introducing a new group type.');
		$this->assertEqualsCanonicalizing($cache_tags, $calculated_permissions->getCacheTags(), 'Outsider permissions have the right cache tags after introducing a new group type.');
		}

		/**
		@@ -176,7 +176,7 @@ class ChainGroupPermissionCalculatorTest extends GroupKernelTestBase {
		$converted = $this->convertCalculatedPermissionsToArray($calculated_permissions);
		$this->assertEqualsCanonicalizing($permissions, $converted, 'Member permissions are returned per group ID.');
		$this->assertSame(-1, $calculated_permissions->getCacheMaxAge(), 'Member permissions have the right max cache age.');
		$this->assertSame($cache_tags, $calculated_permissions->getCacheTags(), 'Member permissions have the right cache tags.');
		$this->assertEqualsCanonicalizing($cache_tags, $calculated_permissions->getCacheTags(), 'Member permissions have the right cache tags.');

		$group->addMember($account);
		$member = $group->getMember($account);
		@@ -190,7 +190,7 @@ class ChainGroupPermissionCalculatorTest extends GroupKernelTestBase {
		$converted = $this->convertCalculatedPermissionsToArray($calculated_permissions);
		$this->assertEqualsCanonicalizing($permissions, $converted, 'Member permissions are returned per group ID after joining a group.');
		$this->assertSame(-1, $calculated_permissions->getCacheMaxAge(), 'Member permissions have the right max cache age after joining a group.');
		$this->assertSame($cache_tags, $calculated_permissions->getCacheTags(), 'Member permissions have the right cache tags after joining a group.');
		$this->assertEqualsCanonicalizing($cache_tags, $calculated_permissions->getCacheTags(), 'Member permissions have the right cache tags after joining a group.');

		// @todo This displays a desperate need for addRole() and removeRole().
		$membership = $member->getGroupContent();
		@@ -204,7 +204,7 @@ class ChainGroupPermissionCalculatorTest extends GroupKernelTestBase {
		$converted = $this->convertCalculatedPermissionsToArray($calculated_permissions);
		$this->assertEqualsCanonicalizing($permissions, $converted, 'Updated member permissions are returned per group ID.');
		$this->assertSame(-1, $calculated_permissions->getCacheMaxAge(), 'Updated member permissions have the right max cache age.');
		$this->assertSame($cache_tags, $calculated_permissions->getCacheTags(), 'Updated member permissions have the right cache tags.');
		$this->assertEqualsCanonicalizing($cache_tags, $calculated_permissions->getCacheTags(), 'Updated member permissions have the right cache tags.');
		}

		/**

tests/src/Kernel/EntityQueryAlterCacheabilityTest.php

+1 −1

Original line number	Diff line number	Diff line
		@@ -85,7 +85,7 @@ class EntityQueryAlterCacheabilityTest extends GroupKernelTestBase {
		});
		$this->assertFalse($render_context->isEmpty(), 'Cacheability was bubbled');
		$this->assertCount(1, $render_context);
		$this->assertEquals(['group_content_list:plugin:node_as_content:article', 'group_content_list:plugin:node_as_content:page'], $render_context[0]->getCacheTags());
		$this->assertEqualsCanonicalizing(['group_content_list:plugin:node_as_content:article', 'group_content_list:plugin:node_as_content:page'], $render_context[0]->getCacheTags());
		}

		/**

tests/src/Kernel/GroupContentQueryAccessHandlerTest.php

+13 −13

Original line number	Diff line number	Diff line
		@@ -74,7 +74,7 @@ class GroupContentQueryAccessHandlerTest extends GroupKernelTestBase {
		foreach (['view', 'update', 'delete'] as $operation) {
		$conditions = $this->handler->getConditions($operation, $user);
		$this->assertEquals(0, $conditions->count());
		$this->assertEquals(['user.permissions'], $conditions->getCacheContexts());
		$this->assertEqualsCanonicalizing(['user.permissions'], $conditions->getCacheContexts());
		$this->assertFalse($conditions->isAlwaysFalse());
		}
		}
		@@ -89,7 +89,7 @@ class GroupContentQueryAccessHandlerTest extends GroupKernelTestBase {
		foreach (['view', 'update', 'delete'] as $operation) {
		$conditions = $this->handler->getConditions($operation, $user);
		$this->assertEquals(0, $conditions->count());
		$this->assertEquals(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertEqualsCanonicalizing(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertTrue($conditions->isAlwaysFalse());
		}
		}
		@@ -116,13 +116,13 @@ class GroupContentQueryAccessHandlerTest extends GroupKernelTestBase {
		];
		$this->assertEquals(1, $conditions->count());
		$this->assertEquals($expected_conditions, $conditions->getConditions());
		$this->assertEquals(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertEqualsCanonicalizing(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertFalse($conditions->isAlwaysFalse());

		foreach (['update', 'delete'] as $operation) {
		$conditions = $this->handler->getConditions($operation, $user);
		$this->assertEquals(0, $conditions->count());
		$this->assertEquals(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertEqualsCanonicalizing(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertTrue($conditions->isAlwaysFalse());
		}
		}
		@@ -147,13 +147,13 @@ class GroupContentQueryAccessHandlerTest extends GroupKernelTestBase {
		];
		$this->assertEquals(1, $conditions->count());
		$this->assertEquals($expected_conditions, $conditions->getConditions());
		$this->assertEquals(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertEqualsCanonicalizing(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertFalse($conditions->isAlwaysFalse());

		foreach (['view', 'delete'] as $operation) {
		$conditions = $this->handler->getConditions($operation, $user);
		$this->assertEquals(0, $conditions->count());
		$this->assertEquals(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertEqualsCanonicalizing(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertTrue($conditions->isAlwaysFalse());
		}
		}
		@@ -187,13 +187,13 @@ class GroupContentQueryAccessHandlerTest extends GroupKernelTestBase {
		$this->assertEquals(2, $conditions->count());
		$this->assertEquals('OR', $conditions->getConjunction());
		$this->assertEquals($expected_conditions, $conditions->getConditions());
		$this->assertEquals(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertEqualsCanonicalizing(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertFalse($conditions->isAlwaysFalse());

		foreach (['update', 'delete'] as $operation) {
		$conditions = $this->handler->getConditions($operation, $user);
		$this->assertEquals(0, $conditions->count());
		$this->assertEquals(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertEqualsCanonicalizing(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertTrue($conditions->isAlwaysFalse());
		}
		}
		@@ -224,13 +224,13 @@ class GroupContentQueryAccessHandlerTest extends GroupKernelTestBase {
		$this->assertEquals(1, $conditions->count());
		$this->assertEquals('OR', $conditions->getConjunction());
		$this->assertEquals($expected_conditions, $conditions->getConditions());
		$this->assertEquals(['user', 'user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertEqualsCanonicalizing(['user', 'user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertFalse($conditions->isAlwaysFalse());

		foreach (['view', 'delete'] as $operation) {
		$conditions = $this->handler->getConditions($operation, $user);
		$this->assertEquals(0, $conditions->count());
		$this->assertEquals(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertEqualsCanonicalizing(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertTrue($conditions->isAlwaysFalse());
		}
		}
		@@ -260,13 +260,13 @@ class GroupContentQueryAccessHandlerTest extends GroupKernelTestBase {
		$this->assertEquals(1, $conditions->count());
		$this->assertEquals('OR', $conditions->getConjunction());
		$this->assertEquals($expected_conditions, $conditions->getConditions());
		$this->assertEquals(['user', 'user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertEqualsCanonicalizing(['user', 'user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertFalse($conditions->isAlwaysFalse());

		foreach (['view', 'delete'] as $operation) {
		$conditions = $this->handler->getConditions($operation, $user);
		$this->assertEquals(0, $conditions->count());
		$this->assertEquals(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertEqualsCanonicalizing(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertTrue($conditions->isAlwaysFalse());
		}
		}
		@@ -294,7 +294,7 @@ class GroupContentQueryAccessHandlerTest extends GroupKernelTestBase {
		$this->assertEquals(1, $conditions->count());
		$this->assertEquals('OR', $conditions->getConjunction());
		$this->assertEquals($expected_conditions, $conditions->getConditions());
		$this->assertEquals(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertEqualsCanonicalizing(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertFalse($conditions->isAlwaysFalse());
		}
		}

tests/src/Kernel/GroupQueryAccessHandlerTest.php

+22 −22

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@ class GroupQueryAccessHandlerTest extends GroupKernelTestBase {
		foreach (['view', 'update', 'delete'] as $operation) {
		$conditions = $this->handler->getConditions($operation, $user);
		$this->assertEquals(0, $conditions->count());
		$this->assertEquals(['user.permissions'], $conditions->getCacheContexts());
		$this->assertEqualsCanonicalizing(['user.permissions'], $conditions->getCacheContexts());
		$this->assertFalse($conditions->isAlwaysFalse());
		}
		}
		@@ -56,7 +56,7 @@ class GroupQueryAccessHandlerTest extends GroupKernelTestBase {
		foreach (['view', 'update', 'delete'] as $operation) {
		$conditions = $this->handler->getConditions($operation, $user);
		$this->assertEquals(0, $conditions->count());
		$this->assertEquals(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertEqualsCanonicalizing(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertTrue($conditions->isAlwaysFalse());
		}
		}
		@@ -77,13 +77,13 @@ class GroupQueryAccessHandlerTest extends GroupKernelTestBase {
		];
		$this->assertEquals(1, $conditions->count());
		$this->assertEquals($expected_conditions, $conditions->getConditions());
		$this->assertEquals(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertEqualsCanonicalizing(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertFalse($conditions->isAlwaysFalse());

		foreach (['update', 'delete'] as $operation) {
		$conditions = $this->handler->getConditions($operation, $user);
		$this->assertEquals(0, $conditions->count());
		$this->assertEquals(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertEqualsCanonicalizing(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertTrue($conditions->isAlwaysFalse());
		}
		}
		@@ -107,13 +107,13 @@ class GroupQueryAccessHandlerTest extends GroupKernelTestBase {
		];
		$this->assertEquals(1, $conditions->count());
		$this->assertEquals($expected_conditions, $conditions->getConditions());
		$this->assertEquals(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertEqualsCanonicalizing(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertFalse($conditions->isAlwaysFalse());

		foreach (['view', 'delete'] as $operation) {
		$conditions = $this->handler->getConditions($operation, $user);
		$this->assertEquals(0, $conditions->count());
		$this->assertEquals(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertEqualsCanonicalizing(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertTrue($conditions->isAlwaysFalse());
		}
		}
		@@ -137,13 +137,13 @@ class GroupQueryAccessHandlerTest extends GroupKernelTestBase {
		];
		$this->assertEquals(1, $conditions->count());
		$this->assertEquals($expected_conditions, $conditions->getConditions());
		$this->assertEquals(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertEqualsCanonicalizing(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertFalse($conditions->isAlwaysFalse());

		foreach (['view', 'update'] as $operation) {
		$conditions = $this->handler->getConditions($operation, $user);
		$this->assertEquals(0, $conditions->count());
		$this->assertEquals(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertEqualsCanonicalizing(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertTrue($conditions->isAlwaysFalse());
		}
		}
		@@ -173,13 +173,13 @@ class GroupQueryAccessHandlerTest extends GroupKernelTestBase {
		];
		$this->assertEquals(1, $conditions->count());
		$this->assertEquals($expected_conditions, $conditions->getConditions());
		$this->assertEquals(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertEqualsCanonicalizing(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertFalse($conditions->isAlwaysFalse());

		foreach (['update', 'delete'] as $operation) {
		$conditions = $this->handler->getConditions($operation, $user);
		$this->assertEquals(0, $conditions->count());
		$this->assertEquals(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertEqualsCanonicalizing(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertTrue($conditions->isAlwaysFalse());
		}
		}
		@@ -214,13 +214,13 @@ class GroupQueryAccessHandlerTest extends GroupKernelTestBase {
		];
		$this->assertEquals(1, $conditions->count());
		$this->assertEquals($expected_conditions, $conditions->getConditions());
		$this->assertEquals(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertEqualsCanonicalizing(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertFalse($conditions->isAlwaysFalse());

		foreach (['view', 'delete'] as $operation) {
		$conditions = $this->handler->getConditions($operation, $user);
		$this->assertEquals(0, $conditions->count());
		$this->assertEquals(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertEqualsCanonicalizing(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertTrue($conditions->isAlwaysFalse());
		}
		}
		@@ -255,13 +255,13 @@ class GroupQueryAccessHandlerTest extends GroupKernelTestBase {
		];
		$this->assertEquals(1, $conditions->count());
		$this->assertEquals($expected_conditions, $conditions->getConditions());
		$this->assertEquals(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertEqualsCanonicalizing(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertFalse($conditions->isAlwaysFalse());

		foreach (['view', 'update'] as $operation) {
		$conditions = $this->handler->getConditions($operation, $user);
		$this->assertEquals(0, $conditions->count());
		$this->assertEquals(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertEqualsCanonicalizing(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertTrue($conditions->isAlwaysFalse());
		}
		}
		@@ -293,13 +293,13 @@ class GroupQueryAccessHandlerTest extends GroupKernelTestBase {
		$this->assertEquals(1, $conditions->count());
		$this->assertEquals('OR', $conditions->getConjunction());
		$this->assertEquals($expected_conditions, $conditions->getConditions());
		$this->assertEquals(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertEqualsCanonicalizing(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertFalse($conditions->isAlwaysFalse());

		foreach (['update', 'delete'] as $operation) {
		$conditions = $this->handler->getConditions($operation, $user);
		$this->assertEquals(0, $conditions->count());
		$this->assertEquals(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertEqualsCanonicalizing(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertTrue($conditions->isAlwaysFalse());
		}
		}
		@@ -336,13 +336,13 @@ class GroupQueryAccessHandlerTest extends GroupKernelTestBase {
		$this->assertEquals(2, $conditions->count());
		$this->assertEquals('OR', $conditions->getConjunction());
		$this->assertEquals($expected_conditions, $conditions->getConditions());
		$this->assertEquals(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertEqualsCanonicalizing(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertFalse($conditions->isAlwaysFalse());

		foreach (['view', 'delete'] as $operation) {
		$conditions = $this->handler->getConditions($operation, $user);
		$this->assertEquals(0, $conditions->count());
		$this->assertEquals(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertEqualsCanonicalizing(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertTrue($conditions->isAlwaysFalse());
		}
		}
		@@ -379,13 +379,13 @@ class GroupQueryAccessHandlerTest extends GroupKernelTestBase {
		$this->assertEquals(2, $conditions->count());
		$this->assertEquals('OR', $conditions->getConjunction());
		$this->assertEquals($expected_conditions, $conditions->getConditions());
		$this->assertEquals(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertEqualsCanonicalizing(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertFalse($conditions->isAlwaysFalse());

		foreach (['view', 'update'] as $operation) {
		$conditions = $this->handler->getConditions($operation, $user);
		$this->assertEquals(0, $conditions->count());
		$this->assertEquals(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertEqualsCanonicalizing(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertTrue($conditions->isAlwaysFalse());
		}
		}
		@@ -457,7 +457,7 @@ class GroupQueryAccessHandlerTest extends GroupKernelTestBase {
		$this->assertEquals(2, $conditions->count());
		$this->assertEquals('OR', $conditions->getConjunction());
		$this->assertEquals($expected_conditions, $conditions->getConditions());
		$this->assertEquals(['user', 'user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertEqualsCanonicalizing(['user', 'user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertFalse($conditions->isAlwaysFalse());

		// Verify that having the admin permission simplifies things.
		@@ -492,7 +492,7 @@ class GroupQueryAccessHandlerTest extends GroupKernelTestBase {
		$this->assertEquals('OR', $conditions->getConjunction());
		$this->assertEquals($expected_conditions, $conditions->getConditions());
		// Notice how the user cache context is missing now.
		$this->assertEquals(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertEqualsCanonicalizing(['user.group_permissions', 'user.permissions'], $conditions->getCacheContexts());
		$this->assertFalse($conditions->isAlwaysFalse());
		}

tests/src/Kernel/GroupRoleStorageTest.php

+3 −1

Original line number	Diff line number	Diff line
		@@ -63,7 +63,9 @@ class GroupRoleStorageTest extends GroupKernelTestBase {
		$this->compareMemberRoles(['default-outsider'], TRUE, 'User initially has implicit outsider role.');

		// Grant the user a new site role and check the storage.
		$this->entityTypeManager->getStorage('user_role')->create(['id' => 'publisher'])->save();
		$this->entityTypeManager->getStorage('user_role')
		->create(['id' => 'publisher', 'label' => 'Publisher'])
		->save();
		$this->account->addRole('publisher');
		$this->account->save();
		$group_role_id = $this->groupRoleSynchronizer->getGroupRoleId('default', 'publisher');