diff --git a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter.yml b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter.yml index df7ccf613b..0c7ad3c145 100644 --- a/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter.yml +++ b/core/modules/content_moderation/tests/modules/content_moderation_test_views/config/install/views.view.test_content_moderation_state_filter.yml @@ -250,20 +250,6 @@ display: group_items: { } entity_type: node plugin_id: moderation_state_filter - is_grouped: false - group_info: - label: '' - description: '' - identifier: '' - optional: true - widget: select - multiple: false - remember: false - default_group: All - default_group_multiple: { } - group_items: { } - entity_type: node - plugin_id: moderation_state_filter sorts: { } header: { } footer: { } diff --git a/core/modules/content_moderation/tests/src/Kernel/ViewsModerationStateFilterTest.php b/core/modules/content_moderation/tests/src/Kernel/ViewsModerationStateFilterTest.php index a1a299cef1..9e6dd3d205 100644 --- a/core/modules/content_moderation/tests/src/Kernel/ViewsModerationStateFilterTest.php +++ b/core/modules/content_moderation/tests/src/Kernel/ViewsModerationStateFilterTest.php @@ -50,6 +50,11 @@ protected function setUp($import_test_views = TRUE) { ]); $node_type->save(); + $node_type = NodeType::create([ + 'type' => 'example_non_moderated', + ]); + $node_type->save(); + ConfigurableLanguage::createFromLangcode('fr')->save(); } @@ -95,6 +100,13 @@ public function testStateFilterViewsRelationship() { ]); $third_node->save(); + // Add a non-moderated node. + $fourth_node = Node::create([ + 'type' => 'example_non_moderated', + 'title' => 'Fourth node', + ]); + $fourth_node->save(); + // Create a translated published revision. $translated_forward_revision = $third_node->addTranslation('fr'); $translated_forward_revision->title = 'Translated Node'; @@ -102,6 +114,9 @@ public function testStateFilterViewsRelationship() { $translated_forward_revision->moderation_state = 'translated_draft'; $translated_forward_revision->save(); + // Four revisions for the nodes when no filter. + $this->assertNodesWithFilters([$node, $second_node, $third_node, $third_node], []); + // The latest revision for both nodes is a draft status. $this->assertNodesWithFilters([$node, $second_node], [ 'latest_revision_state' => 'draft',