From 605e0a8d74b088983b2b3eb0aded361abe95f7d9 Mon Sep 17 00:00:00 2001
From: catch <6915-catch@users.noreply.drupalcode.org>
Date: Thu, 23 Jan 2025 13:31:05 +0000
Subject: [PATCH] Issue #3488834 by quietone, smustgrave: Remove Ban module
from migration tests not in the module
---
.../migrate_plugin_config_test.info.yml | 5 +++
.../migrations/simple_migration.yml | 8 ++++
.../Plugin/migrate/source/SimpleSource.php | 42 +++++++++++++++++++
.../MigrationPluginConfigurationTest.php | 8 ++--
.../Kernel/Plugin/MigrationPluginListTest.php | 1 +
.../migrate/DestinationCategoryTest.php | 1 +
.../tests/src/Kernel/StateFileExistsTest.php | 1 +
7 files changed, 62 insertions(+), 4 deletions(-)
create mode 100644 core/modules/migrate/tests/modules/migrate_plugin_config_test/migrate_plugin_config_test.info.yml
create mode 100644 core/modules/migrate/tests/modules/migrate_plugin_config_test/migrations/simple_migration.yml
create mode 100644 core/modules/migrate/tests/modules/migrate_plugin_config_test/src/Plugin/migrate/source/SimpleSource.php
diff --git a/core/modules/migrate/tests/modules/migrate_plugin_config_test/migrate_plugin_config_test.info.yml b/core/modules/migrate/tests/modules/migrate_plugin_config_test/migrate_plugin_config_test.info.yml
new file mode 100644
index 000000000000..077da3c496c5
--- /dev/null
+++ b/core/modules/migrate/tests/modules/migrate_plugin_config_test/migrate_plugin_config_test.info.yml
@@ -0,0 +1,5 @@
+name: 'Migration plugin configuration rest'
+type: module
+description: 'Provides test migrations to test altering configuration.'
+package: Testing
+version: VERSION
diff --git a/core/modules/migrate/tests/modules/migrate_plugin_config_test/migrations/simple_migration.yml b/core/modules/migrate/tests/modules/migrate_plugin_config_test/migrations/simple_migration.yml
new file mode 100644
index 000000000000..ba2f1ec973a8
--- /dev/null
+++ b/core/modules/migrate/tests/modules/migrate_plugin_config_test/migrations/simple_migration.yml
@@ -0,0 +1,8 @@
+id: simple_migration
+label: Simple migration test
+source:
+ plugin: simple_source
+process:
+ foo: foo
+destination:
+ plugin: null
diff --git a/core/modules/migrate/tests/modules/migrate_plugin_config_test/src/Plugin/migrate/source/SimpleSource.php b/core/modules/migrate/tests/modules/migrate_plugin_config_test/src/Plugin/migrate/source/SimpleSource.php
new file mode 100644
index 000000000000..26559d4b9e69
--- /dev/null
+++ b/core/modules/migrate/tests/modules/migrate_plugin_config_test/src/Plugin/migrate/source/SimpleSource.php
@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Plugin\migrate\source;
+
+use Drupal\migrate\Plugin\migrate\source\SqlBase;
+use Drupal\Core\Database\Query\SelectInterface;
+
+/**
+ * Simple source for testing changing configuration.
+ *
+ * @MigrateSource(
+ * id = "simple_source",
+ * )
+ */
+class SimpleSource extends SqlBase {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function query(): SelectInterface {
+ return $this->select('source_table', 's')->fields('s', ['id']);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function fields(): array {
+ return [
+ 'foo' => $this->t('Test field.'),
+ ];
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getIds(): array {
+ return ['foo' => ['type' => 'string']];
+ }
+
+}
diff --git a/core/modules/migrate/tests/src/Kernel/Plugin/MigrationPluginConfigurationTest.php b/core/modules/migrate/tests/src/Kernel/Plugin/MigrationPluginConfigurationTest.php
index 489684a48e85..18955f3d037e 100644
--- a/core/modules/migrate/tests/src/Kernel/Plugin/MigrationPluginConfigurationTest.php
+++ b/core/modules/migrate/tests/src/Kernel/Plugin/MigrationPluginConfigurationTest.php
@@ -21,7 +21,7 @@ class MigrationPluginConfigurationTest extends KernelTestBase {
'migrate',
'migrate_drupal',
// Test with a simple migration.
- 'ban',
+ 'migrate_plugin_config_test',
'locale',
];
@@ -46,7 +46,7 @@ public static function mergeProvider() {
// Tests adding new configuration to a migration.
[
// New configuration.
- 'd7_blocked_ips',
+ 'simple_migration',
[
'source' => [
'constants' => [
@@ -56,7 +56,7 @@ public static function mergeProvider() {
],
// Expected final source configuration.
[
- 'plugin' => 'd7_blocked_ips',
+ 'plugin' => 'simple_source',
'constants' => [
'added_setting' => 'Ban them all!',
],
@@ -65,7 +65,7 @@ public static function mergeProvider() {
// Tests overriding pre-existing configuration in a migration.
[
// New configuration.
- 'd7_blocked_ips',
+ 'simple_migration',
[
'source' => [
'plugin' => 'a_different_plugin',
diff --git a/core/modules/migrate/tests/src/Kernel/Plugin/MigrationPluginListTest.php b/core/modules/migrate/tests/src/Kernel/Plugin/MigrationPluginListTest.php
index 41121f455093..9daf9d87e659 100644
--- a/core/modules/migrate/tests/src/Kernel/Plugin/MigrationPluginListTest.php
+++ b/core/modules/migrate/tests/src/Kernel/Plugin/MigrationPluginListTest.php
@@ -27,6 +27,7 @@ class MigrationPluginListTest extends KernelTestBase {
protected static $modules = [
'migrate',
// Test with all modules containing Drupal migrations.
+ // @todo Remove Ban in https://www.drupal.org/project/drupal/issues/3488827
'ban',
'block',
'block_content',
diff --git a/core/modules/migrate_drupal/tests/src/Kernel/Plugin/migrate/DestinationCategoryTest.php b/core/modules/migrate_drupal/tests/src/Kernel/Plugin/migrate/DestinationCategoryTest.php
index 82d7fe8da270..6589912b28cf 100644
--- a/core/modules/migrate_drupal/tests/src/Kernel/Plugin/migrate/DestinationCategoryTest.php
+++ b/core/modules/migrate_drupal/tests/src/Kernel/Plugin/migrate/DestinationCategoryTest.php
@@ -120,6 +120,7 @@ protected function getConfigurationClasses(): array {
protected function getContentClasses(): array {
return [
EntityContentBase::class,
+ // @todo Remove BlockedIp in https://www.drupal.org/project/drupal/issues/3488827
BlockedIp::class,
UserData::class,
];
diff --git a/core/modules/migrate_drupal/tests/src/Kernel/StateFileExistsTest.php b/core/modules/migrate_drupal/tests/src/Kernel/StateFileExistsTest.php
index 318b2674b086..5ee7570604c6 100644
--- a/core/modules/migrate_drupal/tests/src/Kernel/StateFileExistsTest.php
+++ b/core/modules/migrate_drupal/tests/src/Kernel/StateFileExistsTest.php
@@ -38,6 +38,7 @@ class StateFileExistsTest extends MigrateDrupalTestBase {
* @var array
*/
protected $stateFileRequired = [
+ // @todo Remove ban in https://www.drupal.org/project/drupal/issues/3488827
'ban',
'block',
'block_content',
--
GitLab