From c120949724616200e54ad4654f343b4baff76aaf Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Sat, 6 Apr 2024 09:04:47 +0100
Subject: [PATCH] Issue #3437589 by andypost: Move permission, jsonapi and rest
 tests out of the action module

---
 core/modules/action/action.permissions.yml          |  3 ---
 .../tests/src/Functional}/ActionTest.php            |  8 +++-----
 core/modules/system/system.permissions.yml          |  3 +++
 .../src/Functional/Rest/ActionJsonAnonTest.php      |  5 ++---
 .../src/Functional/Rest/ActionJsonBasicAuthTest.php |  5 ++---
 .../src/Functional/Rest/ActionJsonCookieTest.php    |  5 ++---
 .../src/Functional/Rest/ActionResourceTestBase.php  | 13 +++++++++++--
 .../tests/src/Functional/Rest/ActionXmlAnonTest.php |  5 ++---
 .../src/Functional/Rest/ActionXmlBasicAuthTest.php  |  5 ++---
 .../src/Functional/Rest/ActionXmlCookieTest.php     |  5 ++---
 .../src/Kernel/Migrate/d7/MigrateUserRoleTest.php   |  2 +-
 11 files changed, 30 insertions(+), 29 deletions(-)
 delete mode 100644 core/modules/action/action.permissions.yml
 rename core/modules/{action/tests/src/Functional/Jsonapi => jsonapi/tests/src/Functional}/ActionTest.php (93%)
 rename core/modules/{action => system}/tests/src/Functional/Rest/ActionJsonAnonTest.php (83%)
 rename core/modules/{action => system}/tests/src/Functional/Rest/ActionJsonBasicAuthTest.php (87%)
 rename core/modules/{action => system}/tests/src/Functional/Rest/ActionJsonCookieTest.php (85%)
 rename core/modules/{action => system}/tests/src/Functional/Rest/ActionResourceTestBase.php (88%)
 rename core/modules/{action => system}/tests/src/Functional/Rest/ActionXmlAnonTest.php (86%)
 rename core/modules/{action => system}/tests/src/Functional/Rest/ActionXmlBasicAuthTest.php (89%)
 rename core/modules/{action => system}/tests/src/Functional/Rest/ActionXmlCookieTest.php (88%)

diff --git a/core/modules/action/action.permissions.yml b/core/modules/action/action.permissions.yml
deleted file mode 100644
index 03b5a449ea68..000000000000
--- a/core/modules/action/action.permissions.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-administer actions:
-  title: 'Administer actions'
-  restrict access: true
diff --git a/core/modules/action/tests/src/Functional/Jsonapi/ActionTest.php b/core/modules/jsonapi/tests/src/Functional/ActionTest.php
similarity index 93%
rename from core/modules/action/tests/src/Functional/Jsonapi/ActionTest.php
rename to core/modules/jsonapi/tests/src/Functional/ActionTest.php
index 1e76cc34877c..a2bbb75b7a42 100644
--- a/core/modules/action/tests/src/Functional/Jsonapi/ActionTest.php
+++ b/core/modules/jsonapi/tests/src/Functional/ActionTest.php
@@ -2,26 +2,24 @@
 
 declare(strict_types=1);
 
-namespace Drupal\Tests\action\Functional\Jsonapi;
+namespace Drupal\Tests\jsonapi\Functional;
 
 use Drupal\Core\Url;
-use Drupal\Tests\jsonapi\Functional\ConfigEntityResourceTestBase;
 use Drupal\system\Entity\Action;
 use Drupal\user\RoleInterface;
 
 /**
  * JSON:API integration test for the "Action" config entity type.
  *
- * @group action
+ * @group Action
  * @group #slow
- * @group legacy
  */
 class ActionTest extends ConfigEntityResourceTestBase {
 
   /**
    * {@inheritdoc}
    */
-  protected static $modules = ['action'];
+  protected static $modules = [];
 
   /**
    * {@inheritdoc}
diff --git a/core/modules/system/system.permissions.yml b/core/modules/system/system.permissions.yml
index d5c6c6b1d6f3..a487f3c64c65 100644
--- a/core/modules/system/system.permissions.yml
+++ b/core/modules/system/system.permissions.yml
@@ -29,3 +29,6 @@ link to any page:
   description: 'This allows to bypass access checking when linking to internal paths.'
 administer menu:
   title: 'Administer menus and menu links'
+administer actions:
+  title: 'Administer actions'
+  restrict access: true
diff --git a/core/modules/action/tests/src/Functional/Rest/ActionJsonAnonTest.php b/core/modules/system/tests/src/Functional/Rest/ActionJsonAnonTest.php
similarity index 83%
rename from core/modules/action/tests/src/Functional/Rest/ActionJsonAnonTest.php
rename to core/modules/system/tests/src/Functional/Rest/ActionJsonAnonTest.php
index cdd6e4c88f37..ad2ffe85c8a3 100644
--- a/core/modules/action/tests/src/Functional/Rest/ActionJsonAnonTest.php
+++ b/core/modules/system/tests/src/Functional/Rest/ActionJsonAnonTest.php
@@ -2,13 +2,12 @@
 
 declare(strict_types=1);
 
-namespace Drupal\Tests\action\Functional\Rest;
+namespace Drupal\Tests\system\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 
 /**
- * @group action
- * @group legacy
+ * @group Action
  */
 class ActionJsonAnonTest extends ActionResourceTestBase {
 
diff --git a/core/modules/action/tests/src/Functional/Rest/ActionJsonBasicAuthTest.php b/core/modules/system/tests/src/Functional/Rest/ActionJsonBasicAuthTest.php
similarity index 87%
rename from core/modules/action/tests/src/Functional/Rest/ActionJsonBasicAuthTest.php
rename to core/modules/system/tests/src/Functional/Rest/ActionJsonBasicAuthTest.php
index efbc0350303e..fa535ec063ee 100644
--- a/core/modules/action/tests/src/Functional/Rest/ActionJsonBasicAuthTest.php
+++ b/core/modules/system/tests/src/Functional/Rest/ActionJsonBasicAuthTest.php
@@ -2,13 +2,12 @@
 
 declare(strict_types=1);
 
-namespace Drupal\Tests\action\Functional\Rest;
+namespace Drupal\Tests\system\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 
 /**
- * @group action
- * @group legacy
+ * @group Action
  */
 class ActionJsonBasicAuthTest extends ActionResourceTestBase {
 
diff --git a/core/modules/action/tests/src/Functional/Rest/ActionJsonCookieTest.php b/core/modules/system/tests/src/Functional/Rest/ActionJsonCookieTest.php
similarity index 85%
rename from core/modules/action/tests/src/Functional/Rest/ActionJsonCookieTest.php
rename to core/modules/system/tests/src/Functional/Rest/ActionJsonCookieTest.php
index 1fab66e231a1..31508ca3e119 100644
--- a/core/modules/action/tests/src/Functional/Rest/ActionJsonCookieTest.php
+++ b/core/modules/system/tests/src/Functional/Rest/ActionJsonCookieTest.php
@@ -2,13 +2,12 @@
 
 declare(strict_types=1);
 
-namespace Drupal\Tests\action\Functional\Rest;
+namespace Drupal\Tests\system\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 
 /**
- * @group action
- * @group legacy
+ * @group Action
  */
 class ActionJsonCookieTest extends ActionResourceTestBase {
 
diff --git a/core/modules/action/tests/src/Functional/Rest/ActionResourceTestBase.php b/core/modules/system/tests/src/Functional/Rest/ActionResourceTestBase.php
similarity index 88%
rename from core/modules/action/tests/src/Functional/Rest/ActionResourceTestBase.php
rename to core/modules/system/tests/src/Functional/Rest/ActionResourceTestBase.php
index 7864b199a79c..8cd01e2643d7 100644
--- a/core/modules/action/tests/src/Functional/Rest/ActionResourceTestBase.php
+++ b/core/modules/system/tests/src/Functional/Rest/ActionResourceTestBase.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Drupal\Tests\action\Functional\Rest;
+namespace Drupal\Tests\system\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\EntityResource\ConfigEntityResourceTestBase;
 use Drupal\system\Entity\Action;
@@ -13,7 +13,7 @@ abstract class ActionResourceTestBase extends ConfigEntityResourceTestBase {
   /**
    * {@inheritdoc}
    */
-  protected static $modules = ['action', 'user'];
+  protected static $modules = ['user'];
 
   /**
    * {@inheritdoc}
@@ -80,4 +80,13 @@ protected function getNormalizedPostEntity() {
     return [];
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExpectedCacheContexts() {
+    return [
+      'user.permissions',
+    ];
+  }
+
 }
diff --git a/core/modules/action/tests/src/Functional/Rest/ActionXmlAnonTest.php b/core/modules/system/tests/src/Functional/Rest/ActionXmlAnonTest.php
similarity index 86%
rename from core/modules/action/tests/src/Functional/Rest/ActionXmlAnonTest.php
rename to core/modules/system/tests/src/Functional/Rest/ActionXmlAnonTest.php
index 28a99c08096d..cedd76fd9f48 100644
--- a/core/modules/action/tests/src/Functional/Rest/ActionXmlAnonTest.php
+++ b/core/modules/system/tests/src/Functional/Rest/ActionXmlAnonTest.php
@@ -2,14 +2,13 @@
 
 declare(strict_types=1);
 
-namespace Drupal\Tests\action\Functional\Rest;
+namespace Drupal\Tests\system\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
 
 /**
- * @group action
- * @group legacy
+ * @group Action
  */
 class ActionXmlAnonTest extends ActionResourceTestBase {
 
diff --git a/core/modules/action/tests/src/Functional/Rest/ActionXmlBasicAuthTest.php b/core/modules/system/tests/src/Functional/Rest/ActionXmlBasicAuthTest.php
similarity index 89%
rename from core/modules/action/tests/src/Functional/Rest/ActionXmlBasicAuthTest.php
rename to core/modules/system/tests/src/Functional/Rest/ActionXmlBasicAuthTest.php
index 546baa482913..7e0b89a8bc09 100644
--- a/core/modules/action/tests/src/Functional/Rest/ActionXmlBasicAuthTest.php
+++ b/core/modules/system/tests/src/Functional/Rest/ActionXmlBasicAuthTest.php
@@ -2,14 +2,13 @@
 
 declare(strict_types=1);
 
-namespace Drupal\Tests\action\Functional\Rest;
+namespace Drupal\Tests\system\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
 
 /**
- * @group action
- * @group legacy
+ * @group Action
  */
 class ActionXmlBasicAuthTest extends ActionResourceTestBase {
 
diff --git a/core/modules/action/tests/src/Functional/Rest/ActionXmlCookieTest.php b/core/modules/system/tests/src/Functional/Rest/ActionXmlCookieTest.php
similarity index 88%
rename from core/modules/action/tests/src/Functional/Rest/ActionXmlCookieTest.php
rename to core/modules/system/tests/src/Functional/Rest/ActionXmlCookieTest.php
index 497da8c4fe3e..5577cc441a3c 100644
--- a/core/modules/action/tests/src/Functional/Rest/ActionXmlCookieTest.php
+++ b/core/modules/system/tests/src/Functional/Rest/ActionXmlCookieTest.php
@@ -2,14 +2,13 @@
 
 declare(strict_types=1);
 
-namespace Drupal\Tests\action\Functional\Rest;
+namespace Drupal\Tests\system\Functional\Rest;
 
 use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
 use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
 
 /**
- * @group action
- * @group legacy
+ * @group Action
  */
 class ActionXmlCookieTest extends ActionResourceTestBase {
 
diff --git a/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserRoleTest.php b/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserRoleTest.php
index 2d1e2c63ff1e..b9ed7aa03c29 100644
--- a/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserRoleTest.php
+++ b/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserRoleTest.php
@@ -55,6 +55,7 @@ public function testUserRole() {
       'access site in maintenance mode',
       'access site reports',
       'access user profiles',
+      'administer actions',
       'administer menu',
       'administer modules',
       'administer permissions',
@@ -141,7 +142,6 @@ public function testUserRole() {
       'access toolbar',
       'access user contact forms',
       'add content to books',
-      'administer actions',
       'administer blocks',
       'administer book outlines',
       'administer comments',
-- 
GitLab