tests/src/Functional/NodeTest.php | 2 +- tests/src/Functional/ResourceResponseTestTrait.php | 5 ++++- tests/src/Functional/ResourceTestBase.php | 5 +---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/src/Functional/NodeTest.php b/tests/src/Functional/NodeTest.php index 830dc50..5246ba8 100644 --- a/tests/src/Functional/NodeTest.php +++ b/tests/src/Functional/NodeTest.php @@ -346,7 +346,7 @@ class NodeTest extends ResourceTestBase { protected static function getIncludePermissions() { return [ 'uid.type' => ['administer users'], - 'uid.roles' => ['administer permissions'], + 'uid.roles' => ['administer users'], ]; } diff --git a/tests/src/Functional/ResourceResponseTestTrait.php b/tests/src/Functional/ResourceResponseTestTrait.php index 9bcf53e..0ce203d 100644 --- a/tests/src/Functional/ResourceResponseTestTrait.php +++ b/tests/src/Functional/ResourceResponseTestTrait.php @@ -150,7 +150,10 @@ trait ResourceResponseTestTrait { $collected_responses = []; $field_access = static::entityFieldAccess($entity, $field_name, 'view', $this->account); if (!$field_access->isAllowed()) { - $collected_responses[] = static::getAccessDeniedResponse($entity, $field_access, $field_name, 'The current user is not allowed to view this relationship.'); + // @todo remove this in https://www.drupal.org/project/jsonapi/issues/2943176 + $resource_identifier = static::toResourceIdentifier($entity); + $error_id = '/' . $resource_identifier['type'] . '/' . $resource_identifier['id']; + $collected_responses[] = static::getAccessDeniedResponse($entity, $field_access, $field_name, 'The current user is not allowed to view this relationship.', NULL, $error_id); break; } if ($target_entity = $entity->{$field_name}->entity) { diff --git a/tests/src/Functional/ResourceTestBase.php b/tests/src/Functional/ResourceTestBase.php index d764647..ee47980 100644 --- a/tests/src/Functional/ResourceTestBase.php +++ b/tests/src/Functional/ResourceTestBase.php @@ -1525,10 +1525,7 @@ abstract class ResourceTestBase extends BrowserTestBase { } if (!empty($resource_document['meta']['errors'])) { foreach ($resource_document['meta']['errors'] as $error) { - // @todo remove this conditional when inaccessible relationships are able to raise errors. - if ($error['detail'] !== 'The current user is not allowed to view this relationship.') { - $expected_document['meta']['errors'][] = $error; - } + $expected_document['meta']['errors'][] = $error; } } return $expected_response = (new ResourceResponse($expected_document))