From c703f7ba4e30435b7e4f9dea24ba0fdbe56909de Mon Sep 17 00:00:00 2001 From: catch Date: Thu, 14 Mar 2024 09:43:56 +0000 Subject: [PATCH] Issue #3369912 by andypost, quietone, Spokje: Final steps to deprecate Actions UI (action) module --- core/modules/action/action.info.yml | 2 ++ core/modules/action/tests/src/Functional/ActionListTest.php | 1 + .../action/tests/src/Functional/ActionUninstallTest.php | 1 + .../action/tests/src/Functional/ConfigurationTest.php | 1 + core/modules/action/tests/src/Functional/GenericTest.php | 1 + .../action/tests/src/Functional/Jsonapi/ActionTest.php | 1 + .../src/Functional/Node/NodeActionsConfigurationTest.php | 1 + .../action/tests/src/Functional/Rest/ActionJsonAnonTest.php | 1 + .../tests/src/Functional/Rest/ActionJsonBasicAuthTest.php | 1 + .../tests/src/Functional/Rest/ActionJsonCookieTest.php | 1 + .../action/tests/src/Functional/Rest/ActionXmlAnonTest.php | 1 + .../tests/src/Functional/Rest/ActionXmlBasicAuthTest.php | 1 + .../tests/src/Functional/Rest/ActionXmlCookieTest.php | 1 + .../tests/src/FunctionalJavascript/ActionFormAjaxTest.php | 1 + .../action/tests/src/Unit/Menu/ActionLocalTasksTest.php | 1 + .../tests/src/Functional/Form/ModulesListFormWebTest.php | 6 +++--- .../testing_config_overrides.info.yml | 1 - 17 files changed, 19 insertions(+), 4 deletions(-) diff --git a/core/modules/action/action.info.yml b/core/modules/action/action.info.yml index fc3e6c05267..ef44276711d 100644 --- a/core/modules/action/action.info.yml +++ b/core/modules/action/action.info.yml @@ -3,4 +3,6 @@ type: module description: 'Allows configuration of tasks to be executed in response to events.' package: Core version: VERSION +lifecycle: deprecated +lifecycle_link: https://www.drupal.org/node/3223395#s-action configure: entity.action.collection diff --git a/core/modules/action/tests/src/Functional/ActionListTest.php b/core/modules/action/tests/src/Functional/ActionListTest.php index dd7dd06d4f2..8c0c9c12600 100644 --- a/core/modules/action/tests/src/Functional/ActionListTest.php +++ b/core/modules/action/tests/src/Functional/ActionListTest.php @@ -10,6 +10,7 @@ use Drupal\Tests\BrowserTestBase; * Test behaviors when visiting the action listing page. * * @group action + * @group legacy */ class ActionListTest extends BrowserTestBase { diff --git a/core/modules/action/tests/src/Functional/ActionUninstallTest.php b/core/modules/action/tests/src/Functional/ActionUninstallTest.php index 957d65f15ea..e9cee0a659c 100644 --- a/core/modules/action/tests/src/Functional/ActionUninstallTest.php +++ b/core/modules/action/tests/src/Functional/ActionUninstallTest.php @@ -10,6 +10,7 @@ use Drupal\Tests\BrowserTestBase; * Tests that uninstalling Actions UI does not remove other modules' actions. * * @group action + * @group legacy * @see \Drupal\views\Plugin\views\field\BulkForm * @see \Drupal\user\Plugin\Action\BlockUser */ diff --git a/core/modules/action/tests/src/Functional/ConfigurationTest.php b/core/modules/action/tests/src/Functional/ConfigurationTest.php index d2d2b7e1ca8..982b3b91c9f 100644 --- a/core/modules/action/tests/src/Functional/ConfigurationTest.php +++ b/core/modules/action/tests/src/Functional/ConfigurationTest.php @@ -11,6 +11,7 @@ use Drupal\Tests\BrowserTestBase; * Tests complex actions configuration. * * @group action + * @group legacy */ class ConfigurationTest extends BrowserTestBase { diff --git a/core/modules/action/tests/src/Functional/GenericTest.php b/core/modules/action/tests/src/Functional/GenericTest.php index 7c987812e10..17c248c68d5 100644 --- a/core/modules/action/tests/src/Functional/GenericTest.php +++ b/core/modules/action/tests/src/Functional/GenericTest.php @@ -10,5 +10,6 @@ use Drupal\Tests\system\Functional\Module\GenericModuleTestBase; * Generic module test for action. * * @group action + * @group legacy */ class GenericTest extends GenericModuleTestBase {} diff --git a/core/modules/action/tests/src/Functional/Jsonapi/ActionTest.php b/core/modules/action/tests/src/Functional/Jsonapi/ActionTest.php index 0305b50c943..1e76cc34877 100644 --- a/core/modules/action/tests/src/Functional/Jsonapi/ActionTest.php +++ b/core/modules/action/tests/src/Functional/Jsonapi/ActionTest.php @@ -14,6 +14,7 @@ use Drupal\user\RoleInterface; * * @group action * @group #slow + * @group legacy */ class ActionTest extends ConfigEntityResourceTestBase { diff --git a/core/modules/action/tests/src/Functional/Node/NodeActionsConfigurationTest.php b/core/modules/action/tests/src/Functional/Node/NodeActionsConfigurationTest.php index 95eac981f70..a8dc94c6b4c 100644 --- a/core/modules/action/tests/src/Functional/Node/NodeActionsConfigurationTest.php +++ b/core/modules/action/tests/src/Functional/Node/NodeActionsConfigurationTest.php @@ -13,6 +13,7 @@ use Drupal\user\Entity\User; * Tests configuration of actions provided by the Node module. * * @group action + * @group legacy */ class NodeActionsConfigurationTest extends BrowserTestBase { diff --git a/core/modules/action/tests/src/Functional/Rest/ActionJsonAnonTest.php b/core/modules/action/tests/src/Functional/Rest/ActionJsonAnonTest.php index aede29f7a23..cdd6e4c88f3 100644 --- a/core/modules/action/tests/src/Functional/Rest/ActionJsonAnonTest.php +++ b/core/modules/action/tests/src/Functional/Rest/ActionJsonAnonTest.php @@ -8,6 +8,7 @@ use Drupal\Tests\rest\Functional\AnonResourceTestTrait; /** * @group action + * @group legacy */ class ActionJsonAnonTest extends ActionResourceTestBase { diff --git a/core/modules/action/tests/src/Functional/Rest/ActionJsonBasicAuthTest.php b/core/modules/action/tests/src/Functional/Rest/ActionJsonBasicAuthTest.php index d37c747c108..efbc0350303 100644 --- a/core/modules/action/tests/src/Functional/Rest/ActionJsonBasicAuthTest.php +++ b/core/modules/action/tests/src/Functional/Rest/ActionJsonBasicAuthTest.php @@ -8,6 +8,7 @@ use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait; /** * @group action + * @group legacy */ class ActionJsonBasicAuthTest extends ActionResourceTestBase { diff --git a/core/modules/action/tests/src/Functional/Rest/ActionJsonCookieTest.php b/core/modules/action/tests/src/Functional/Rest/ActionJsonCookieTest.php index e2022097d35..1fab66e231a 100644 --- a/core/modules/action/tests/src/Functional/Rest/ActionJsonCookieTest.php +++ b/core/modules/action/tests/src/Functional/Rest/ActionJsonCookieTest.php @@ -8,6 +8,7 @@ use Drupal\Tests\rest\Functional\CookieResourceTestTrait; /** * @group action + * @group legacy */ class ActionJsonCookieTest extends ActionResourceTestBase { diff --git a/core/modules/action/tests/src/Functional/Rest/ActionXmlAnonTest.php b/core/modules/action/tests/src/Functional/Rest/ActionXmlAnonTest.php index 45a04d87a1d..28a99c08096 100644 --- a/core/modules/action/tests/src/Functional/Rest/ActionXmlAnonTest.php +++ b/core/modules/action/tests/src/Functional/Rest/ActionXmlAnonTest.php @@ -9,6 +9,7 @@ use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrai /** * @group action + * @group legacy */ class ActionXmlAnonTest extends ActionResourceTestBase { diff --git a/core/modules/action/tests/src/Functional/Rest/ActionXmlBasicAuthTest.php b/core/modules/action/tests/src/Functional/Rest/ActionXmlBasicAuthTest.php index dd3175a7cb7..546baa48291 100644 --- a/core/modules/action/tests/src/Functional/Rest/ActionXmlBasicAuthTest.php +++ b/core/modules/action/tests/src/Functional/Rest/ActionXmlBasicAuthTest.php @@ -9,6 +9,7 @@ use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrai /** * @group action + * @group legacy */ class ActionXmlBasicAuthTest extends ActionResourceTestBase { diff --git a/core/modules/action/tests/src/Functional/Rest/ActionXmlCookieTest.php b/core/modules/action/tests/src/Functional/Rest/ActionXmlCookieTest.php index 2d224e5b1a4..497da8c4fe3 100644 --- a/core/modules/action/tests/src/Functional/Rest/ActionXmlCookieTest.php +++ b/core/modules/action/tests/src/Functional/Rest/ActionXmlCookieTest.php @@ -9,6 +9,7 @@ use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrai /** * @group action + * @group legacy */ class ActionXmlCookieTest extends ActionResourceTestBase { diff --git a/core/modules/action/tests/src/FunctionalJavascript/ActionFormAjaxTest.php b/core/modules/action/tests/src/FunctionalJavascript/ActionFormAjaxTest.php index f09b8640071..6c5e3beb695 100644 --- a/core/modules/action/tests/src/FunctionalJavascript/ActionFormAjaxTest.php +++ b/core/modules/action/tests/src/FunctionalJavascript/ActionFormAjaxTest.php @@ -12,6 +12,7 @@ use Drupal\system\Entity\Action; * Tests action plugins using JavaScript. * * @group action + * @group legacy */ class ActionFormAjaxTest extends WebDriverTestBase { diff --git a/core/modules/action/tests/src/Unit/Menu/ActionLocalTasksTest.php b/core/modules/action/tests/src/Unit/Menu/ActionLocalTasksTest.php index 08a2ac0752f..7db789c3608 100644 --- a/core/modules/action/tests/src/Unit/Menu/ActionLocalTasksTest.php +++ b/core/modules/action/tests/src/Unit/Menu/ActionLocalTasksTest.php @@ -10,6 +10,7 @@ use Drupal\Tests\Core\Menu\LocalTaskIntegrationTestBase; * Tests action local tasks. * * @group action + * @group legacy */ class ActionLocalTasksTest extends LocalTaskIntegrationTestBase { diff --git a/core/modules/system/tests/src/Functional/Form/ModulesListFormWebTest.php b/core/modules/system/tests/src/Functional/Form/ModulesListFormWebTest.php index e99db5e3ab6..c64a6c74e64 100644 --- a/core/modules/system/tests/src/Functional/Form/ModulesListFormWebTest.php +++ b/core/modules/system/tests/src/Functional/Form/ModulesListFormWebTest.php @@ -79,10 +79,10 @@ class ModulesListFormWebTest extends BrowserTestBase { $this->assertSession()->elementNotExists('xpath', "//div[@role='contentinfo' and h2[text()='Status message']]//a"); // Enable a module that defines permissions. - $edit = ['modules[action][enable]' => 'action']; + $edit = ['modules[filter][enable]' => 'filter']; $this->submitForm($edit, 'Install'); - $this->assertSession()->elementTextContains('xpath', "//div[@role='contentinfo' and h2[text()='Status message']]", 'Module Actions UI has been installed.'); - $this->assertSession()->elementExists('xpath', "//div[@role='contentinfo' and h2[text()='Status message']]//a[contains(@href, '/admin/people/permissions/module/action')]"); + $this->assertSession()->elementTextContains('xpath', "//div[@role='contentinfo' and h2[text()='Status message']]", 'Module Filter has been installed.'); + $this->assertSession()->elementExists('xpath', "//div[@role='contentinfo' and h2[text()='Status message']]//a[contains(@href, '/admin/people/permissions/module/filter')]"); // Enable a module that has dependencies and both define permissions. $edit = ['modules[content_moderation][enable]' => 'content_moderation']; diff --git a/core/profiles/testing_config_overrides/testing_config_overrides.info.yml b/core/profiles/testing_config_overrides/testing_config_overrides.info.yml index c1323238cbc..9cbb501a325 100644 --- a/core/profiles/testing_config_overrides/testing_config_overrides.info.yml +++ b/core/profiles/testing_config_overrides/testing_config_overrides.info.yml @@ -7,7 +7,6 @@ version: VERSION core_version_requirement: '*' hidden: true install: - - action - language - entity_test_install - testing_config_overrides_module