From b016a8c104fb7beebbb939c506999b6c7af054dc Mon Sep 17 00:00:00 2001
From: nod_ <nod_@598310.no-reply.drupal.org>
Date: Wed, 21 Aug 2024 21:44:47 +0200
Subject: [PATCH] Revert "Issue #3468829 by catch, smustgrave: Speed up
WorkspacesContentModerationStateTest"
This reverts commit 9a0f1ff644d34e1a2ab9dd45070787b4fa6c2109.
---
.../WorkspacesContentModerationStateTest.php | 63 +++++++++++++------
1 file changed, 43 insertions(+), 20 deletions(-)
diff --git a/core/modules/content_moderation/tests/src/Kernel/WorkspacesContentModerationStateTest.php b/core/modules/content_moderation/tests/src/Kernel/WorkspacesContentModerationStateTest.php
index f8d3002889ba..5967d8d5b410 100644
--- a/core/modules/content_moderation/tests/src/Kernel/WorkspacesContentModerationStateTest.php
+++ b/core/modules/content_moderation/tests/src/Kernel/WorkspacesContentModerationStateTest.php
@@ -40,30 +40,10 @@ class WorkspacesContentModerationStateTest extends ContentModerationStateTest {
*/
protected $revEntityTypeId = 'entity_test_revpub';
- const SKIP_METHODS = [
- // This test creates published default revisions in Live, which can not be
- // deleted in a workspace. A test scenario for the case when Content
- // Moderation and Workspaces are used together is covered in
- // parent::testContentModerationStateRevisionDataRemoval().
- 'testContentModerationStateDataRemoval',
- // This test does not assert anything that can be workspace-specific.
- 'testModerationWithFieldConfigOverride',
- // This test does not assert anything that can be workspace-specific.
- 'testWorkflowDependencies',
- // This test does not assert anything that can be workspace-specific.
- 'testWorkflowNonConfigBundleDependencies',
- // This test does not assert anything that can be workspace-specific.
- 'testGetCurrentUserId',
- ];
-
/**
* {@inheritdoc}
*/
protected function setUp(): void {
- if (in_array($this->name(), static::SKIP_METHODS, TRUE)) {
- $this->markTestSkipped('Irrelevant for this test');
- }
-
parent::setUp();
$this->initializeWorkspacesModule();
@@ -197,6 +177,49 @@ public static function basicModerationTestCases() {
];
}
+ /**
+ * {@inheritdoc}
+ */
+ public function testContentModerationStateDataRemoval($entity_type_id = NULL): void {
+ // This test creates published default revisions in Live, which can not be
+ // deleted in a workspace. A test scenario for the case when Content
+ // Moderation and Workspaces are used together is covered in
+ // parent::testContentModerationStateRevisionDataRemoval().
+ $this->markTestSkipped();
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function testModerationWithFieldConfigOverride(): void {
+ // This test does not assert anything that can be workspace-specific.
+ $this->markTestSkipped();
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function testWorkflowDependencies(): void {
+ // This test does not assert anything that can be workspace-specific.
+ $this->markTestSkipped();
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function testWorkflowNonConfigBundleDependencies(): void {
+ // This test does not assert anything that can be workspace-specific.
+ $this->markTestSkipped();
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function testGetCurrentUserId(): void {
+ // This test does not assert anything that can be workspace-specific.
+ $this->markTestSkipped();
+ }
+
/**
* {@inheritdoc}
*/
--
GitLab