From b3710f94da613ac325260f201169545923e20c6a Mon Sep 17 00:00:00 2001
From: Lee Rowlands <lee.rowlands@previousnext.com.au>
Date: Thu, 28 Dec 2023 08:06:57 +1000
Subject: [PATCH] Issue #3393800 by mstrelan, smustgrave, dww, larowlan,
acbramley, amateescu, quietone: Kernel tests can't use path aliases on
entities
---
.../d6/MigrateBlockContentTranslationTest.php | 1 +
.../Kernel/Migrate/d6/MigrateBlockTest.php | 1 +
.../d7/MigrateBlockContentTranslationTest.php | 1 +
.../d7/MigrateBlockNoBlockContentTest.php | 1 +
.../Kernel/Migrate/d7/MigrateBlockTest.php | 1 +
.../Kernel/Migrate/d6/MigrateBlockTest.php | 1 +
.../Kernel/PathAliasMenuLinkContentTest.php | 12 -----
.../tests/src/Kernel/EntityAliasTest.php | 49 +++++++++++++++++++
.../tests/src/Kernel/Plugin/RssFieldsTest.php | 1 -
.../tests/src/Kernel/PluginInstanceTest.php | 7 +++
.../tests/src/Kernel/ViewsKernelTestBase.php | 1 -
.../src/Kernel/WorkspaceViewsKernelTest.php | 2 +-
...solvedLibraryDefinitionsFilesMatchTest.php | 4 ++
.../Extension/ModuleConfigureRouteTest.php | 1 +
.../Routing/ContentNegotiationRoutingTest.php | 15 ------
.../Core/Routing/RouteProviderTest.php | 14 ------
.../Core/Theme/Stable9LibraryOverrideTest.php | 2 +-
.../Drupal/KernelTests/KernelTestBase.php | 10 ----
18 files changed, 69 insertions(+), 55 deletions(-)
create mode 100644 core/modules/path_alias/tests/src/Kernel/EntityAliasTest.php
diff --git a/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockContentTranslationTest.php b/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockContentTranslationTest.php
index 2173a8ae6e07..5519e0b7bdef 100644
--- a/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockContentTranslationTest.php
+++ b/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockContentTranslationTest.php
@@ -34,6 +34,7 @@ class MigrateBlockContentTranslationTest extends MigrateDrupal6TestBase {
protected function setUp(): void {
parent::setUp();
$this->installEntitySchema('block_content');
+ $this->installEntitySchema('path_alias');
$this->installConfig(['block']);
$this->installConfig(['block_content']);
$this->container->get('theme_installer')->install(['stark']);
diff --git a/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php b/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php
index c9613a28712f..42f92c4ecbe2 100644
--- a/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php
+++ b/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php
@@ -32,6 +32,7 @@ class MigrateBlockTest extends MigrateDrupal6TestBase {
*/
protected function setUp(): void {
parent::setUp();
+ $this->installEntitySchema('path_alias');
// Install the themes used for this test.
$this->installEntitySchema('block_content');
diff --git a/core/modules/block/tests/src/Kernel/Migrate/d7/MigrateBlockContentTranslationTest.php b/core/modules/block/tests/src/Kernel/Migrate/d7/MigrateBlockContentTranslationTest.php
index 3436736c7f38..45a89aaf758b 100644
--- a/core/modules/block/tests/src/Kernel/Migrate/d7/MigrateBlockContentTranslationTest.php
+++ b/core/modules/block/tests/src/Kernel/Migrate/d7/MigrateBlockContentTranslationTest.php
@@ -37,6 +37,7 @@ class MigrateBlockContentTranslationTest extends MigrateDrupal7TestBase {
protected function setUp(): void {
parent::setUp();
$this->installEntitySchema('block_content');
+ $this->installEntitySchema('path_alias');
$this->installConfig(['block']);
$this->installConfig(['block_content']);
$this->container->get('theme_installer')->install(['stark']);
diff --git a/core/modules/block/tests/src/Kernel/Migrate/d7/MigrateBlockNoBlockContentTest.php b/core/modules/block/tests/src/Kernel/Migrate/d7/MigrateBlockNoBlockContentTest.php
index 6c7b92dc9ee1..aa1472642fff 100644
--- a/core/modules/block/tests/src/Kernel/Migrate/d7/MigrateBlockNoBlockContentTest.php
+++ b/core/modules/block/tests/src/Kernel/Migrate/d7/MigrateBlockNoBlockContentTest.php
@@ -37,6 +37,7 @@ protected function setUp(): void {
$this->container->get('theme_installer')->install(['olivero', 'claro']);
$this->installConfig(static::$modules);
+ $this->installEntitySchema('path_alias');
// Set Olivero and Claro as the default public and admin theme.
$config = $this->config('system.theme');
diff --git a/core/modules/block/tests/src/Kernel/Migrate/d7/MigrateBlockTest.php b/core/modules/block/tests/src/Kernel/Migrate/d7/MigrateBlockTest.php
index 2b65a98f582e..bde49c62660f 100644
--- a/core/modules/block/tests/src/Kernel/Migrate/d7/MigrateBlockTest.php
+++ b/core/modules/block/tests/src/Kernel/Migrate/d7/MigrateBlockTest.php
@@ -34,6 +34,7 @@ class MigrateBlockTest extends MigrateDrupal7TestBase {
*/
protected function setUp(): void {
parent::setUp();
+ $this->installEntitySchema('path_alias');
// Install the themes used for this test.
$this->installEntitySchema('block_content');
diff --git a/core/modules/forum/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php b/core/modules/forum/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php
index d018716c62ca..aef056bdccc6 100644
--- a/core/modules/forum/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php
+++ b/core/modules/forum/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php
@@ -30,6 +30,7 @@ class MigrateBlockTest extends MigrateDrupal6TestBase {
*/
protected function setUp(): void {
parent::setUp();
+ $this->installEntitySchema('path_alias');
// Install the themes used for this test.
$this->installEntitySchema('block_content');
diff --git a/core/modules/menu_link_content/tests/src/Kernel/PathAliasMenuLinkContentTest.php b/core/modules/menu_link_content/tests/src/Kernel/PathAliasMenuLinkContentTest.php
index 00e9bf79b2b3..bda3ec228899 100644
--- a/core/modules/menu_link_content/tests/src/Kernel/PathAliasMenuLinkContentTest.php
+++ b/core/modules/menu_link_content/tests/src/Kernel/PathAliasMenuLinkContentTest.php
@@ -2,7 +2,6 @@
namespace Drupal\Tests\menu_link_content\Kernel;
-use Drupal\Core\DependencyInjection\ContainerBuilder;
use Drupal\Core\Menu\MenuTreeParameters;
use Drupal\menu_link_content\Entity\MenuLinkContent;
use Drupal\KernelTests\KernelTestBase;
@@ -45,17 +44,6 @@ protected function setUp(): void {
module_set_weight('menu_link_content', 1);
}
- /**
- * {@inheritdoc}
- */
- public function register(ContainerBuilder $container) {
- parent::register($container);
-
- $definition = $container->getDefinition('path_alias.path_processor');
- $definition
- ->addTag('path_processor_inbound', ['priority' => 100]);
- }
-
/**
* Tests the path aliasing changing.
*/
diff --git a/core/modules/path_alias/tests/src/Kernel/EntityAliasTest.php b/core/modules/path_alias/tests/src/Kernel/EntityAliasTest.php
new file mode 100644
index 000000000000..5c6c6fcdc3a1
--- /dev/null
+++ b/core/modules/path_alias/tests/src/Kernel/EntityAliasTest.php
@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Drupal\Tests\path_alias\Kernel;
+
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\Tests\Traits\Core\PathAliasTestTrait;
+
+/**
+ * Tests path alias on entities.
+ *
+ * @group path_alias
+ */
+class EntityAliasTest extends KernelTestBase {
+
+ use PathAliasTestTrait;
+
+ /**
+ * {@inheritdoc}
+ */
+ protected static $modules = [
+ 'path_alias',
+ 'entity_test',
+ 'user',
+ ];
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp(): void {
+ parent::setUp();
+ $this->installEntitySchema('entity_test');
+ $this->installEntitySchema('path_alias');
+ $this->installEntitySchema('user');
+ }
+
+ /**
+ * Tests transform.
+ */
+ public function testEntityAlias(): void {
+ EntityTest::create(['id' => 1])->save();
+ $this->createPathAlias('/entity_test/1', '/entity-alias');
+ $entity = EntityTest::load(1);
+ $this->assertSame('/entity-alias', $entity->toUrl()->toString());
+ }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Plugin/RssFieldsTest.php b/core/modules/views/tests/src/Kernel/Plugin/RssFieldsTest.php
index d72000a36818..d43a531b593d 100644
--- a/core/modules/views/tests/src/Kernel/Plugin/RssFieldsTest.php
+++ b/core/modules/views/tests/src/Kernel/Plugin/RssFieldsTest.php
@@ -37,7 +37,6 @@ protected function setUp($import_test_views = TRUE): void {
$this->installConfig(['node', 'filter']);
$this->installEntitySchema('user');
$this->installEntitySchema('node');
- $this->installEntitySchema('path_alias');
$this->createContentType(['type' => 'article']);
}
diff --git a/core/modules/views/tests/src/Kernel/PluginInstanceTest.php b/core/modules/views/tests/src/Kernel/PluginInstanceTest.php
index ee8865d995cc..9280387ff8d2 100644
--- a/core/modules/views/tests/src/Kernel/PluginInstanceTest.php
+++ b/core/modules/views/tests/src/Kernel/PluginInstanceTest.php
@@ -12,6 +12,13 @@
*/
class PluginInstanceTest extends ViewsKernelTestBase {
+ /**
+ * {@inheritdoc}
+ */
+ protected static $modules = [
+ 'path_alias',
+ ];
+
/**
* All views plugin types.
*
diff --git a/core/modules/views/tests/src/Kernel/ViewsKernelTestBase.php b/core/modules/views/tests/src/Kernel/ViewsKernelTestBase.php
index 5d8c23f22838..6d2ed55fed2e 100644
--- a/core/modules/views/tests/src/Kernel/ViewsKernelTestBase.php
+++ b/core/modules/views/tests/src/Kernel/ViewsKernelTestBase.php
@@ -28,7 +28,6 @@ abstract class ViewsKernelTestBase extends KernelTestBase {
* {@inheritdoc}
*/
protected static $modules = [
- 'path_alias',
'system',
'views',
'views_test_config',
diff --git a/core/modules/workspaces/tests/src/Kernel/WorkspaceViewsKernelTest.php b/core/modules/workspaces/tests/src/Kernel/WorkspaceViewsKernelTest.php
index 8cc6f1755800..950df9d163c5 100644
--- a/core/modules/workspaces/tests/src/Kernel/WorkspaceViewsKernelTest.php
+++ b/core/modules/workspaces/tests/src/Kernel/WorkspaceViewsKernelTest.php
@@ -20,7 +20,7 @@ class WorkspaceViewsKernelTest extends ViewsKernelTestBase {
*
* @var array
*/
- protected static $modules = ['views_ui', 'workspaces'];
+ protected static $modules = ['views_ui', 'workspaces', 'path_alias'];
/**
* Tests creating a view of workspace entities.
diff --git a/core/tests/Drupal/KernelTests/Core/Asset/ResolvedLibraryDefinitionsFilesMatchTest.php b/core/tests/Drupal/KernelTests/Core/Asset/ResolvedLibraryDefinitionsFilesMatchTest.php
index 51110a29ccfe..5ba0c7bb4d8f 100644
--- a/core/tests/Drupal/KernelTests/Core/Asset/ResolvedLibraryDefinitionsFilesMatchTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Asset/ResolvedLibraryDefinitionsFilesMatchTest.php
@@ -120,6 +120,10 @@ protected function setUp(): void {
// @todo Remove this in https://www.drupal.org/node/3039217.
$this->installEntitySchema('user');
+ // Install the 'path_alias' entity schema because the path alias path
+ // processor requires it.
+ $this->installEntitySchema('path_alias');
+
// Remove demo_umami_content module as its install hook creates content
// that relies on the presence of entity tables and various other elements
// not present in a kernel test.
diff --git a/core/tests/Drupal/KernelTests/Core/Extension/ModuleConfigureRouteTest.php b/core/tests/Drupal/KernelTests/Core/Extension/ModuleConfigureRouteTest.php
index 8c153bd9225a..2ac1d89c71c5 100644
--- a/core/tests/Drupal/KernelTests/Core/Extension/ModuleConfigureRouteTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Extension/ModuleConfigureRouteTest.php
@@ -40,6 +40,7 @@ protected function setUp(): void {
parent::setUp();
$this->routeProvider = \Drupal::service('router.route_provider');
$this->moduleInfo = \Drupal::service('extension.list.module')->getList();
+ $this->installEntitySchema('path_alias');
}
/**
diff --git a/core/tests/Drupal/KernelTests/Core/Routing/ContentNegotiationRoutingTest.php b/core/tests/Drupal/KernelTests/Core/Routing/ContentNegotiationRoutingTest.php
index 05f1d69fcf99..3f1856a8d139 100644
--- a/core/tests/Drupal/KernelTests/Core/Routing/ContentNegotiationRoutingTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Routing/ContentNegotiationRoutingTest.php
@@ -2,7 +2,6 @@
namespace Drupal\KernelTests\Core\Routing;
-use Drupal\Core\DependencyInjection\ContainerBuilder;
use Drupal\KernelTests\KernelTestBase;
use Drupal\Tests\Traits\Core\PathAliasTestTrait;
use Symfony\Component\HttpFoundation\Request;
@@ -31,20 +30,6 @@ protected function setUp(): void {
$this->installEntitySchema('path_alias');
}
- /**
- * {@inheritdoc}
- */
- public function register(ContainerBuilder $container) {
- parent::register($container);
-
- // \Drupal\KernelTests\KernelTestBase::register() removes the alias path
- // processor.
- if ($container->hasDefinition('path_alias.path_processor')) {
- $definition = $container->getDefinition('path_alias.path_processor');
- $definition->addTag('path_processor_inbound', ['priority' => 100])->addTag('path_processor_outbound', ['priority' => 300]);
- }
- }
-
/**
* Tests the content negotiation aspect of routing.
*/
diff --git a/core/tests/Drupal/KernelTests/Core/Routing/RouteProviderTest.php b/core/tests/Drupal/KernelTests/Core/Routing/RouteProviderTest.php
index 1c0cbc1eebfa..aee2729a73d4 100644
--- a/core/tests/Drupal/KernelTests/Core/Routing/RouteProviderTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Routing/RouteProviderTest.php
@@ -5,7 +5,6 @@
use ColinODell\PsrTestLogger\TestLogger;
use Drupal\Core\Cache\MemoryBackend;
use Drupal\Core\Database\Database;
-use Drupal\Core\DependencyInjection\ContainerBuilder;
use Drupal\Core\KeyValueStore\KeyValueMemoryFactory;
use Drupal\Core\Path\CurrentPathStack;
use Drupal\Core\Routing\MatcherDumper;
@@ -106,19 +105,6 @@ protected function setUp(): void {
$this->logger = new TestLogger();
}
- /**
- * {@inheritdoc}
- */
- public function register(ContainerBuilder $container) {
- parent::register($container);
-
- // Read the incoming path alias for these tests.
- if ($container->hasDefinition('path_alias.path_processor')) {
- $definition = $container->getDefinition('path_alias.path_processor');
- $definition->addTag('path_processor_inbound');
- }
- }
-
/**
* {@inheritdoc}
*/
diff --git a/core/tests/Drupal/KernelTests/Core/Theme/Stable9LibraryOverrideTest.php b/core/tests/Drupal/KernelTests/Core/Theme/Stable9LibraryOverrideTest.php
index d4361352f7f5..30b0e5cd503e 100644
--- a/core/tests/Drupal/KernelTests/Core/Theme/Stable9LibraryOverrideTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Theme/Stable9LibraryOverrideTest.php
@@ -32,7 +32,7 @@ class Stable9LibraryOverrideTest extends StableLibraryOverrideTestBase {
/**
* {@inheritdoc}
*/
- protected static $modules = ['system', 'user', 'path_alias'];
+ protected static $modules = ['system', 'user'];
/**
* {@inheritdoc}
diff --git a/core/tests/Drupal/KernelTests/KernelTestBase.php b/core/tests/Drupal/KernelTests/KernelTestBase.php
index 0a07f19c0643..8b3814528391 100644
--- a/core/tests/Drupal/KernelTests/KernelTestBase.php
+++ b/core/tests/Drupal/KernelTests/KernelTestBase.php
@@ -592,16 +592,6 @@ public function register(ContainerBuilder $container) {
->addTag('event_subscriber');
}
- if ($container->hasDefinition('path_alias.path_processor')) {
- // The alias-based processor requires the path_alias entity schema to be
- // installed, so we prevent it from being registered to the path processor
- // manager. We do this by removing the tags that the compiler pass looks
- // for. This means that the URL generator can safely be used within tests.
- $container->getDefinition('path_alias.path_processor')
- ->clearTag('path_processor_inbound')
- ->clearTag('path_processor_outbound');
- }
-
// Relax the password hashing cost in tests to avoid performance issues.
if ($container->hasDefinition('password')) {
$container->getDefinition('password')
--
GitLab