tests/src/Functional/MenuLinkContentTest.php | 41 +++++++++++++--------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/tests/src/Functional/MenuLinkContentTest.php b/tests/src/Functional/MenuLinkContentTest.php index 637c4b7..0993542 100644 --- a/tests/src/Functional/MenuLinkContentTest.php +++ b/tests/src/Functional/MenuLinkContentTest.php @@ -73,7 +73,7 @@ class MenuLinkContentTest extends ResourceTestBase { */ protected function getExpectedDocument() { $self_url = Url::fromUri('base:/jsonapi/menu_link_content/menu_link_content/' . $this->entity->uuid())->setAbsolute()->toString(TRUE)->getGeneratedUrl(); - $expected_document = [ + return [ 'jsonapi' => [ 'meta' => [ 'links' => [ @@ -111,30 +111,27 @@ class MenuLinkContentTest extends ResourceTestBase { 'title' => 'Llama Gabilondo', 'weight' => 0, 'drupal_internal__id' => 1, + 'drupal_internal__revision_id' => 1, + 'revision_created' => (new \DateTime())->setTimestamp($this->entity->getRevisionCreationTime())->setTimezone(new \DateTimeZone('UTC'))->format(\DateTime::RFC3339), + 'revision_log_message' => NULL, + // @todo Attempt to remove this in https://www.drupal.org/project/drupal/issues/2933518. + 'revision_translation_affected' => TRUE, ], - ], - ]; - - if (floatval(\Drupal::VERSION) >= 8.7) { - $expected_document['data']['attributes']['drupal_internal__revision_id'] = 1; - $expected_document['data']['attributes']['revision_created'] = (new \DateTime())->setTimestamp($this->entity->getRevisionCreationTime())->setTimezone(new \DateTimeZone('UTC'))->format(\DateTime::RFC3339); - $expected_document['data']['attributes']['revision_log_message'] = NULL; - // @todo Attempt to remove this in https://www.drupal.org/project/drupal/issues/2933518. - $expected_document['data']['attributes']['revision_translation_affected'] = TRUE; - $expected_document['data']['relationships']['revision_user'] = [ - 'data' => NULL, - 'links' => [ - 'related' => [ - 'href' => $self_url . '/revision_user', - ], - 'self' => [ - 'href' => $self_url . '/relationships/revision_user', + 'relationships' => [ + 'revision_user' => [ + 'data' => NULL, + 'links' => [ + 'related' => [ + 'href' => $self_url . '/revision_user', + ], + 'self' => [ + 'href' => $self_url . '/relationships/revision_user', + ], + ], ], ], - ]; - } - - return $expected_document; + ], + ]; } /**