tests/src/Functional/ActionTest.php | 10 ++--- tests/src/Functional/BaseFieldOverrideTest.php | 10 ++--- tests/src/Functional/BlockTest.php | 15 +++---- .../src/Functional/ContentLanguageSettingsTest.php | 10 ++--- tests/src/Functional/EntityFormDisplayTest.php | 10 ++--- tests/src/Functional/EntityFormModeTest.php | 10 ++--- tests/src/Functional/EntityViewDisplayTest.php | 13 ++---- tests/src/Functional/EntityViewModeTest.php | 10 ++--- tests/src/Functional/FieldStorageConfigTest.php | 10 ++--- tests/src/Functional/FilterFormatTest.php | 32 +++++---------- tests/src/Functional/ImageStyleTest.php | 26 ++++-------- tests/src/Functional/MediaTypeTest.php | 10 ++--- tests/src/Functional/ResponsiveImageStyleTest.php | 13 ++---- tests/src/Functional/RestResourceConfigTest.php | 39 ++++++------------ tests/src/Functional/SearchPageTest.php | 15 ++----- tests/src/Functional/TourTest.php | 39 ++++++------------ tests/src/Functional/ViewTest.php | 48 +++++++--------------- tests/src/Functional/WorkflowTest.php | 10 ++--- 18 files changed, 104 insertions(+), 226 deletions(-) diff --git a/tests/src/Functional/ActionTest.php b/tests/src/Functional/ActionTest.php index c76f0d6..1dc6a29 100644 --- a/tests/src/Functional/ActionTest.php +++ b/tests/src/Functional/ActionTest.php @@ -84,13 +84,9 @@ class ActionTest extends ResourceTestBase { 'self' => $self_url, ], 'attributes' => [ - // @todo Remove the first 3 lines in favor of the 5 commented lines in https://www.drupal.org/project/jsonapi/issues/2942979 - // @codingStandardsIgnoreStart - 'configuration' => 'anonymous', -// 'configuration' => [ -// 'rid' => 'anonymous', -// ], - // @codingStandardsIgnoreEnd + 'configuration' => [ + 'rid' => 'anonymous', + ], 'dependencies' => [ 'config' => ['user.role.anonymous'], 'module' => ['user'], diff --git a/tests/src/Functional/BaseFieldOverrideTest.php b/tests/src/Functional/BaseFieldOverrideTest.php index 70c8504..c9623ac 100644 --- a/tests/src/Functional/BaseFieldOverrideTest.php +++ b/tests/src/Functional/BaseFieldOverrideTest.php @@ -90,13 +90,9 @@ class BaseFieldOverrideTest extends ResourceTestBase { 'default_value' => [], 'default_value_callback' => '', 'dependencies' => [ - // @todo Remove this first line in favor of the 3 commented lines in https://www.drupal.org/project/jsonapi/issues/2942979 - // @codingStandardsIgnoreStart - 'node.type.camelids', -// 'config' => [ -// 'node.type.camelids', -// ], - // @codingStandardsIgnoreEnd + 'config' => [ + 'node.type.camelids', + ], ], 'description' => '', 'entity_type' => 'node', diff --git a/tests/src/Functional/BlockTest.php b/tests/src/Functional/BlockTest.php index b858dfb..471e788 100644 --- a/tests/src/Functional/BlockTest.php +++ b/tests/src/Functional/BlockTest.php @@ -105,13 +105,9 @@ class BlockTest extends ResourceTestBase { 'langcode' => 'en', 'status' => TRUE, 'dependencies' => [ - // @todo Remove this first line in favor of the 3 commented lines in https://www.drupal.org/project/jsonapi/issues/2942979 - // @codingStandardsIgnoreStart - 'classy', -// 'theme' => [ -// 'classy', -// ], - // @codingStandardsIgnoreEnd + 'theme' => [ + 'classy', + ], ], 'theme' => 'classy', 'region' => 'header', @@ -186,4 +182,9 @@ class BlockTest extends ResourceTestBase { ->setCacheContexts(['user.roles']); } + public function testGetIndividual() { + return parent::testGetIndividual(); // TODO: Change the autogenerated stub + } + + } diff --git a/tests/src/Functional/ContentLanguageSettingsTest.php b/tests/src/Functional/ContentLanguageSettingsTest.php index e461725..b9b7570 100644 --- a/tests/src/Functional/ContentLanguageSettingsTest.php +++ b/tests/src/Functional/ContentLanguageSettingsTest.php @@ -90,13 +90,9 @@ class ContentLanguageSettingsTest extends ResourceTestBase { 'attributes' => [ 'default_langcode' => 'site_default', 'dependencies' => [ - // @todo Remove this first line in favor of the 3 commented lines in https://www.drupal.org/project/jsonapi/issues/2942979 - // @codingStandardsIgnoreStart - 'node.type.camelids', -// 'config' => [ -// 'node.type.camelids', -// ], - // @codingStandardsIgnoreEnd + 'config' => [ + 'node.type.camelids', + ], ], 'id' => 'node.camelids', 'langcode' => 'en', diff --git a/tests/src/Functional/EntityFormDisplayTest.php b/tests/src/Functional/EntityFormDisplayTest.php index e5ccf91..f4618b4 100644 --- a/tests/src/Functional/EntityFormDisplayTest.php +++ b/tests/src/Functional/EntityFormDisplayTest.php @@ -147,13 +147,9 @@ class EntityFormDisplayTest extends ResourceTestBase { ], ], 'dependencies' => [ - // @todo Remove the first line in favor of the 3 commented lines in https://www.drupal.org/project/jsonapi/issues/2942979 - // @codingStandardsIgnoreStart - 'node.type.camelids', -// 'config' => [ -// 'node.type.camelids', -// ], - // @codingStandardsIgnoreEnd + 'config' => [ + 'node.type.camelids', + ], ], 'hidden' => [], 'id' => 'node.camelids.default', diff --git a/tests/src/Functional/EntityFormModeTest.php b/tests/src/Functional/EntityFormModeTest.php index 2979777..6635971 100644 --- a/tests/src/Functional/EntityFormModeTest.php +++ b/tests/src/Functional/EntityFormModeTest.php @@ -82,13 +82,9 @@ class EntityFormModeTest extends ResourceTestBase { 'attributes' => [ 'cache' => TRUE, 'dependencies' => [ - // @todo Remove the first line in favor of the 3 commented lines in https://www.drupal.org/project/jsonapi/issues/2942979 - // @codingStandardsIgnoreStart - 'user', -// 'module' => [ -// 'user', -// ], - // @codingStandardsIgnoreEnd + 'module' => [ + 'user', + ], ], 'id' => 'user.test', 'label' => 'Test', diff --git a/tests/src/Functional/EntityViewDisplayTest.php b/tests/src/Functional/EntityViewDisplayTest.php index 92f1a07..0d28996 100644 --- a/tests/src/Functional/EntityViewDisplayTest.php +++ b/tests/src/Functional/EntityViewDisplayTest.php @@ -91,15 +91,10 @@ class EntityViewDisplayTest extends ResourceTestBase { 'attributes' => [ 'bundle' => 'camelids', 'content' => [ - // @todo Remove the first 2 lines in favor of the 4 commented lines in https://www.drupal.org/project/jsonapi/issues/2942979 - // @codingStandardsIgnoreStart - 'region' => 'content', - 'weight' => 100, -// 'links' => [ -// 'region' => 'content', -// 'weight' => 100, -// ], - // @codingStandardsIgnoreEnd + 'links' => [ + 'region' => 'content', + 'weight' => 100, + ], ], 'dependencies' => [ 'config' => [ diff --git a/tests/src/Functional/EntityViewModeTest.php b/tests/src/Functional/EntityViewModeTest.php index 36697a5..2b90618 100644 --- a/tests/src/Functional/EntityViewModeTest.php +++ b/tests/src/Functional/EntityViewModeTest.php @@ -82,13 +82,9 @@ class EntityViewModeTest extends ResourceTestBase { 'attributes' => [ 'cache' => TRUE, 'dependencies' => [ - // @todo Remove the first line in favor of the 3 commented lines in https://www.drupal.org/project/jsonapi/issues/2942979 - // @codingStandardsIgnoreStart - 'user', -// 'module' => [ -// 'user', -// ], - // @codingStandardsIgnoreEnd + 'module' => [ + 'user', + ], ], 'id' => 'user.test', 'label' => 'Test', diff --git a/tests/src/Functional/FieldStorageConfigTest.php b/tests/src/Functional/FieldStorageConfigTest.php index 7c13452..9c5248e 100644 --- a/tests/src/Functional/FieldStorageConfigTest.php +++ b/tests/src/Functional/FieldStorageConfigTest.php @@ -81,13 +81,9 @@ class FieldStorageConfigTest extends ResourceTestBase { 'cardinality' => 1, 'custom_storage' => FALSE, 'dependencies' => [ - // @todo Remove this first line in favor of the 3 commented lines in https://www.drupal.org/project/jsonapi/issues/2942979 - // @codingStandardsIgnoreStart - 'node', -// 'module' => [ -// 'node', -// ], - // @codingStandardsIgnoreEnd + 'module' => [ + 'node', + ], ], 'entity_type' => 'node', 'field_name' => 'true_llama', diff --git a/tests/src/Functional/FilterFormatTest.php b/tests/src/Functional/FilterFormatTest.php index eab02bb..629317e 100644 --- a/tests/src/Functional/FilterFormatTest.php +++ b/tests/src/Functional/FilterFormatTest.php @@ -88,29 +88,17 @@ class FilterFormatTest extends ResourceTestBase { 'attributes' => [ 'dependencies' => [], 'filters' => [ - // @todo Remove this first 9 lines in favor of the 11 commented lines in https://www.drupal.org/project/jsonapi/issues/2942979 - // @codingStandardsIgnoreStart - 'id' => 'filter_html', - 'provider' => 'filter', - 'status' => TRUE, - 'weight' => -10, - 'settings' => [ - 'allowed_html' => '

', - 'filter_html_help' => TRUE, - 'filter_html_nofollow' => FALSE, + 'filter_html' => [ + 'id' => 'filter_html', + 'provider' => 'filter', + 'status' => TRUE, + 'weight' => -10, + 'settings' => [ + 'allowed_html' => '

', + 'filter_html_help' => TRUE, + 'filter_html_nofollow' => FALSE, + ], ], -// 'filter_html' => [ -// 'id' => 'filter_html', -// 'provider' => 'filter', -// 'status' => TRUE, -// 'weight' => -10, -// 'settings' => [ -// 'allowed_html' => '

', -// 'filter_html_help' => TRUE, -// 'filter_html_nofollow' => FALSE, -// ], -// ], - // @codingStandardsIgnoreEnd ], 'format' => 'pablo', 'langcode' => 'es', diff --git a/tests/src/Functional/ImageStyleTest.php b/tests/src/Functional/ImageStyleTest.php index 104d8ee..80ce98a 100644 --- a/tests/src/Functional/ImageStyleTest.php +++ b/tests/src/Functional/ImageStyleTest.php @@ -100,25 +100,15 @@ class ImageStyleTest extends ResourceTestBase { 'attributes' => [ 'dependencies' => [], 'effects' => [ - // @todo Remove the first 7 lines in favor of the 9 commented lines in https://www.drupal.org/project/jsonapi/issues/2942979 - // @codingStandardsIgnoreStart - 'uuid' => $this->effectUuid, - 'id' => 'image_scale_and_crop', - 'weight' => 0, - 'data' => [ - 'width' => 120, - 'height' => 121, + $this->effectUuid => [ + 'uuid' => $this->effectUuid, + 'id' => 'image_scale_and_crop', + 'weight' => 0, + 'data' => [ + 'width' => 120, + 'height' => 121, + ], ], -// $this->effectUuid => [ -// 'uuid' => $this->effectUuid, -// 'id' => 'image_scale_and_crop', -// 'weight' => 0, -// 'data' => [ -// 'width' => 120, -// 'height' => 121, -// ], -// ], - // @codingStandardsIgnoreEnd ], 'label' => 'Camelids', 'langcode' => 'en', diff --git a/tests/src/Functional/MediaTypeTest.php b/tests/src/Functional/MediaTypeTest.php index 7560872..6da5a35 100644 --- a/tests/src/Functional/MediaTypeTest.php +++ b/tests/src/Functional/MediaTypeTest.php @@ -91,13 +91,9 @@ class MediaTypeTest extends ResourceTestBase { 'new_revision' => FALSE, 'queue_thumbnail_downloads' => FALSE, 'source' => 'file', - // @todo Remove the first line in favor of the 3 commented lines in https://www.drupal.org/project/jsonapi/issues/2942979 - // @codingStandardsIgnoreStart - 'source_configuration' => '', -// 'source_configuration' => [ -// 'source_field' => '', -// ], - // @codingStandardsIgnoreEnd + 'source_configuration' => [ + 'source_field' => '', + ], 'status' => TRUE, 'uuid' => $this->entity->uuid(), ], diff --git a/tests/src/Functional/ResponsiveImageStyleTest.php b/tests/src/Functional/ResponsiveImageStyleTest.php index 9a9d95a..ad9f41e 100644 --- a/tests/src/Functional/ResponsiveImageStyleTest.php +++ b/tests/src/Functional/ResponsiveImageStyleTest.php @@ -97,15 +97,10 @@ class ResponsiveImageStyleTest extends ResourceTestBase { 'attributes' => [ 'breakpoint_group' => 'test_group', 'dependencies' => [ - // @todo Remove this first 2 lines in favor of the 4 commented lines in https://www.drupal.org/project/jsonapi/issues/2942979 - // @codingStandardsIgnoreStart - 'image.style.large', - 'image.style.medium', -// 'config' => [ -// 'image.style.large', -// 'image.style.medium', -// ], - // @codingStandardsIgnoreEnd + 'config' => [ + 'image.style.large', + 'image.style.medium', + ], ], 'fallback_image_style' => 'fallback', 'id' => 'camelids', diff --git a/tests/src/Functional/RestResourceConfigTest.php b/tests/src/Functional/RestResourceConfigTest.php index 067b36c..bc0c602 100644 --- a/tests/src/Functional/RestResourceConfigTest.php +++ b/tests/src/Functional/RestResourceConfigTest.php @@ -93,39 +93,24 @@ class RestResourceConfigTest extends ResourceTestBase { 'langcode' => 'en', 'status' => TRUE, 'dependencies' => [ - // @todo Remove the first 3 lines in favor of the 5 commented lines in https://www.drupal.org/project/jsonapi/issues/2942979 - // @codingStandardsIgnoreStart - 'dblog', - 'serialization', - 'user', -// 'module' => [ -// 'dblog', -// 'serialization', -// 'user', -// ], - // @codingStandardsIgnoreEnd + 'module' => [ + 'dblog', + 'serialization', + 'user', + ], ], 'id' => 'llama', 'plugin_id' => 'dblog', 'granularity' => 'method', 'configuration' => [ - // @todo Remove the first 6 lines in favor of the 8 commented lines in https://www.drupal.org/project/jsonapi/issues/2942979 - // @codingStandardsIgnoreStart - 'supported_formats' => [ - 'json', - ], - 'supported_auth' => [ - 'cookie', + 'GET' => [ + 'supported_formats' => [ + 'json', + ], + 'supported_auth' => [ + 'cookie', + ], ], -// 'GET' => [ -// 'supported_formats' => [ -// 'json', -// ], -// 'supported_auth' => [ -// 'cookie', -// ], -// ], - // @codingStandardsIgnoreEnd ], ], ], diff --git a/tests/src/Functional/SearchPageTest.php b/tests/src/Functional/SearchPageTest.php index 1131d93..99e6777 100644 --- a/tests/src/Functional/SearchPageTest.php +++ b/tests/src/Functional/SearchPageTest.php @@ -90,19 +90,12 @@ class SearchPageTest extends ResourceTestBase { ], 'attributes' => [ 'configuration' => [ - // @todo Uncomment this line in https://www.drupal.org/project/jsonapi/issues/2942979 - // @codingStandardsIgnoreStart -// 'rankings' => [], - // @codingStandardsIgnoreEnd + 'rankings' => [], ], 'dependencies' => [ - // @todo Remove the first line in favor of the 3 commented lines in https://www.drupal.org/project/jsonapi/issues/2942979 - // @codingStandardsIgnoreStart - 'node', -// 'module' => [ -// 'node' -// ], - // @codingStandardsIgnoreEnd + 'module' => [ + 'node' + ], ], 'id' => 'hinode_search', 'label' => 'Search of magnetic activity of the Sun', diff --git a/tests/src/Functional/TourTest.php b/tests/src/Functional/TourTest.php index b6a54ca..496954e 100644 --- a/tests/src/Functional/TourTest.php +++ b/tests/src/Functional/TourTest.php @@ -103,37 +103,22 @@ class TourTest extends ResourceTestBase { 'langcode' => 'en', 'module' => 'tour', 'routes' => [ - // @todo Remove the first line in favor of the 3 commented lines in https://www.drupal.org/project/jsonapi/issues/2942979 - // @codingStandardsIgnoreStart - 'route_name' => '', -// [ -// 'route_name' => '', -// ], - // @codingStandardsIgnoreEnd + [ + 'route_name' => '', + ], ], 'status' => TRUE, 'tips' => [ - // @todo Remove the first 8 lines in favor of the 10 commented lines in https://www.drupal.org/project/jsonapi/issues/2942979 - // @codingStandardsIgnoreStart - 'id' => 'tour-llama-1', - 'plugin' => 'text', - 'label' => 'Llama', - 'body' => 'Who handle the awesomeness of llamas?', - 'weight' => 100, - 'attributes' => [ - 'data-id' => 'tour-llama-1', + 'tour-llama-1' => [ + 'id' => 'tour-llama-1', + 'plugin' => 'text', + 'label' => 'Llama', + 'body' => 'Who handle the awesomeness of llamas?', + 'weight' => 100, + 'attributes' => [ + 'data-id' => 'tour-llama-1', + ], ], -// 'tour-llama-1' => [ -// 'id' => 'tour-llama-1', -// 'plugin' => 'text', -// 'label' => 'Llama', -// 'body' => 'Who handle the awesomeness of llamas?', -// 'weight' => 100, -// 'attributes' => [ -// 'data-id' => 'tour-llama-1', -// ], -// ], - // @codingStandardsIgnoreEnd ], 'uuid' => $this->entity->uuid(), ], diff --git a/tests/src/Functional/ViewTest.php b/tests/src/Functional/ViewTest.php index 94483ea..347451d 100644 --- a/tests/src/Functional/ViewTest.php +++ b/tests/src/Functional/ViewTest.php @@ -83,41 +83,23 @@ class ViewTest extends ResourceTestBase { 'dependencies' => [], 'description' => '', 'display' => [ - // @todo Remove the first 15 lines in favor of the 17 commented lines in https://www.drupal.org/project/jsonapi/issues/2942979 - // @codingStandardsIgnoreStart - 'display_plugin' => 'default', - 'id' => 'default', - 'display_title' => 'Master', - 'position' => 0, - 'display_options' => [ - 'display_extenders' => [], - ], - 'cache_metadata' => [ - 'max-age' => -1, - 'contexts' => [ - 'languages:language_interface', - 'url.query_args', + 'default' => [ + 'display_plugin' => 'default', + 'id' => 'default', + 'display_title' => 'Master', + 'position' => 0, + 'display_options' => [ + 'display_extenders' => [], + ], + 'cache_metadata' => [ + 'max-age' => -1, + 'contexts' => [ + 'languages:language_interface', + 'url.query_args', + ], + 'tags' => [], ], - 'tags' => [], ], -// 'default' => [ -// 'display_plugin' => 'default', -// 'id' => 'default', -// 'display_title' => 'Master', -// 'position' => 0, -// 'display_options' => [ -// 'display_extenders' => [], -// ], -// 'cache_metadata' => [ -// 'max-age' => -1, -// 'contexts' => [ -// 'languages:language_interface', -// 'url.query_args', -// ], -// 'tags' => [], -// ], -// ], - // @codingStandardsIgnoreEnd ], 'id' => 'test_rest', 'label' => 'Test REST', diff --git a/tests/src/Functional/WorkflowTest.php b/tests/src/Functional/WorkflowTest.php index 14e6776..b4c41ab 100644 --- a/tests/src/Functional/WorkflowTest.php +++ b/tests/src/Functional/WorkflowTest.php @@ -87,13 +87,9 @@ class WorkflowTest extends ResourceTestBase { ], 'attributes' => [ 'dependencies' => [ - // @todo Remove the first line in favor of the 3 commented lines in https://www.drupal.org/project/jsonapi/issues/2942979 - // @codingStandardsIgnoreStart - 'workflow_type_test', -// 'module' => [ -// 'workflow_type_test', -// ], - // @codingStandardsIgnoreEnd + 'module' => [ + 'workflow_type_test', + ], ], 'id' => 'rest_workflow', 'label' => 'REST Worklow',