From 97eb4137942f90f379106b756073e5543072c031 Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Sat, 13 Aug 2022 16:15:33 +0900
Subject: [PATCH] Issue #3303278 by smustgrave, longwave: Decouple
NodeDisplayConfigurableTest from RDF module
---
.../config/install/rdf.mapping.node.page.yml | 40 -------------------
.../NodeDisplayConfigurableTest.php | 13 +++---
2 files changed, 6 insertions(+), 47 deletions(-)
delete mode 100644 core/modules/node/tests/modules/node_display_configurable_test/config/install/rdf.mapping.node.page.yml
diff --git a/core/modules/node/tests/modules/node_display_configurable_test/config/install/rdf.mapping.node.page.yml b/core/modules/node/tests/modules/node_display_configurable_test/config/install/rdf.mapping.node.page.yml
deleted file mode 100644
index dd6535c30446..000000000000
--- a/core/modules/node/tests/modules/node_display_configurable_test/config/install/rdf.mapping.node.page.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-langcode: en
-status: true
-dependencies:
- config:
- - node.type.page
- module:
- - node
-id: node.page
-targetEntityType: node
-bundle: page
-types:
- - 'schema:WebPage'
-fieldMappings:
- title:
- properties:
- - 'schema:name'
- created:
- properties:
- - 'schema:dateCreated'
- datatype_callback:
- callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
- changed:
- properties:
- - 'schema:dateModified'
- datatype_callback:
- callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
- body:
- properties:
- - 'schema:text'
- uid:
- properties:
- - 'schema:author'
- mapping_type: rel
- comment_count:
- properties:
- - 'schema:interactionCount'
- datatype_callback:
- callable: 'Drupal\rdf\SchemaOrgDataConverter::interactionCount'
- arguments:
- interaction_type: UserComments
diff --git a/core/modules/node/tests/src/Functional/NodeDisplayConfigurableTest.php b/core/modules/node/tests/src/Functional/NodeDisplayConfigurableTest.php
index 5aedefeb8e0d..9bec874fb1a3 100644
--- a/core/modules/node/tests/src/Functional/NodeDisplayConfigurableTest.php
+++ b/core/modules/node/tests/src/Functional/NodeDisplayConfigurableTest.php
@@ -18,7 +18,7 @@ class NodeDisplayConfigurableTest extends NodeTestBase {
*
* @var array
*/
- protected static $modules = ['rdf', 'block'];
+ protected static $modules = ['block'];
/**
* {@inheritdoc}
@@ -90,15 +90,12 @@ public function testDisplayConfigurable(string $theme, string $metadata_region,
$this->assertNodeHtml($node, $user, FALSE, $metadata_region, $field_classes, FALSE);
- $assert->elementExists('css', 'div[rel="schema:author"]');
-
// Remove from display.
$display->removeComponent('uid')
->removeComponent('created')
->save();
$this->drupalGet($node->toUrl());
- $assert->elementNotExists('css', 'div[rel="schema:author"]');
$assert->elementTextNotContains('css', 'article', $user->getAccountName());
}
@@ -148,12 +145,14 @@ protected function assertNodeHtml(NodeInterface $node, UserInterface $user, bool
if (!$is_inline) {
$field_classes_selector = $field_classes ? "[contains(concat(' ', normalize-space(@class), ' '), ' field--name-uid ')]" : '';
$assert->elementExists('xpath', sprintf('//article//%s//*%s//%s[text()="Authored by"]', $html_element, $field_classes_selector, $html_element));
- $assert->elementTextContains('css', "$uid_selector $html_element" . '[rel="schema:author"]', $user->getAccountName());
+ $assert->elementTextContains('css', $uid_selector, $user->getAccountName());
$assert->elementNotExists('css', "$uid_selector a");
- $assert->elementExists('css', 'span[property="schema:dateCreated"]');
+ if ($field_classes) {
+ $assert->elementExists('css', $created_selector);
+ }
}
else {
- $assert->elementTextContains('css', $uid_selector . ' a[property="schema:name"]', $user->getAccountName());
+ $assert->elementTextContains('css', $uid_selector . ' a', $user->getAccountName());
$assert->elementTextContains('css', 'article ' . $metadata_region, 'Submitted by');
}
}
--
GitLab