diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/IdConflictTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/IdConflictTest.php index 204e02314f..64007fb9f6 100644 --- a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/IdConflictTest.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/IdConflictTest.php @@ -2,6 +2,8 @@ namespace Drupal\Tests\migrate_drupal_ui\Functional\d6; +use Drupal\Core\DrupalKernel; +use Drupal\Core\Site\Settings; use Drupal\Tests\migrate_drupal_ui\Functional\MigrateUpgradeExecuteTestBase; /** @@ -33,6 +35,14 @@ class IdConflictTest extends MigrateUpgradeExecuteTestBase { */ protected function setUp() { parent::setUp(); + + // Enable the complete node migration. + $settings['settings']['migrate_node_migrate_type_classic'] = (object) [ + 'value' => FALSE, + 'required' => TRUE, + ]; + $this->writeSettings($settings); + $this->loadFixture(drupal_get_path('module', 'migrate_drupal') . '/tests/fixtures/drupal6.php'); } diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MultilingualReviewPageTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MultilingualReviewPageTest.php index 5ea6badda6..f70a4b103c 100644 --- a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MultilingualReviewPageTest.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MultilingualReviewPageTest.php @@ -47,6 +47,14 @@ class MultilingualReviewPageTest extends MultilingualReviewPageTestBase { */ protected function setUp() { parent::setUp(); + + // Enable the complete node migration. + $settings['settings']['migrate_node_migrate_type_classic'] = (object) [ + 'value' => FALSE, + 'required' => TRUE, + ]; + $this->writeSettings($settings); + $this->loadFixture(drupal_get_path('module', 'migrate_drupal') . '/tests/fixtures/drupal6.php'); } diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/NoMultilingualReviewPageTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/NoMultilingualReviewPageTest.php index 469a73ca89..ed737abd1d 100644 --- a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/NoMultilingualReviewPageTest.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/NoMultilingualReviewPageTest.php @@ -42,6 +42,14 @@ class NoMultilingualReviewPageTest extends NoMultilingualReviewPageTestBase { */ protected function setUp() { parent::setUp(); + + // Enable the complete node migration. + $settings['settings']['migrate_node_migrate_type_classic'] = (object) [ + 'value' => FALSE, + 'required' => TRUE, + ]; + $this->writeSettings($settings); + $this->loadFixture(drupal_get_path('module', 'migrate_drupal') . '/tests/fixtures/drupal6.php'); } diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/NoMultilingualTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/NoMultilingualTest.php index 20f7098bd3..8ffdc0158f 100644 --- a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/NoMultilingualTest.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/NoMultilingualTest.php @@ -33,6 +33,14 @@ class NoMultilingualTest extends MigrateUpgradeExecuteTestBase { */ protected function setUp() { parent::setUp(); + + // Enable the complete node migration. + $settings['settings']['migrate_node_migrate_type_classic'] = (object) [ + 'value' => FALSE, + 'required' => TRUE, + ]; + $this->writeSettings($settings); + $this->loadFixture(drupal_get_path('module', 'migrate_drupal') . '/tests/fixtures/drupal6.php'); } diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php index b0061da3ff..5ae1b800fa 100644 --- a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php @@ -50,6 +50,13 @@ class Upgrade6Test extends MigrateUpgradeExecuteTestBase { protected function setUp() { parent::setUp(); + // Enable the complete node migration. + $settings['settings']['migrate_node_migrate_type_classic'] = (object) [ + 'value' => FALSE, + 'required' => TRUE, + ]; + $this->writeSettings($settings); + // Delete the existing content made to test the ID Conflict form. Migrations // are to be done on a site without content. The test of the ID Conflict // form is being moved to its own issue which will remove the deletion diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/IdConflictTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/IdConflictTest.php index 4c923e8532..fbc597ea0d 100644 --- a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/IdConflictTest.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/IdConflictTest.php @@ -35,6 +35,14 @@ class IdConflictTest extends MigrateUpgradeExecuteTestBase { */ protected function setUp() { parent::setUp(); + + // Enable the complete node migration. + $settings['settings']['migrate_node_migrate_type_classic'] = (object) [ + 'value' => FALSE, + 'required' => TRUE, + ]; + $this->writeSettings($settings); + $this->loadFixture(drupal_get_path('module', 'migrate_drupal') . '/tests/fixtures/drupal7.php'); } diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MultilingualReviewPageTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MultilingualReviewPageTest.php index c25ec43223..46f74d4d96 100644 --- a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MultilingualReviewPageTest.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MultilingualReviewPageTest.php @@ -44,6 +44,14 @@ class MultilingualReviewPageTest extends MultilingualReviewPageTestBase { */ protected function setUp() { parent::setUp(); + + // Enable the complete node migration. + $settings['settings']['migrate_node_migrate_type_classic'] = (object) [ + 'value' => FALSE, + 'required' => TRUE, + ]; + $this->writeSettings($settings); + $this->loadFixture(drupal_get_path('module', 'migrate_drupal') . '/tests/fixtures/drupal7.php'); } diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/NoMultilingualTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/NoMultilingualTest.php index 46421a69f9..03962767f9 100644 --- a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/NoMultilingualTest.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/NoMultilingualTest.php @@ -34,6 +34,14 @@ class NoMultilingualTest extends MigrateUpgradeExecuteTestBase { */ protected function setUp() { parent::setUp(); + + // Enable the complete node migration. + $settings['settings']['migrate_node_migrate_type_classic'] = (object) [ + 'value' => FALSE, + 'required' => TRUE, + ]; + $this->writeSettings($settings); + $this->loadFixture(drupal_get_path('module', 'migrate_drupal') . '/tests/fixtures/drupal7.php'); } diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php index 2056c0e3cb..e6b8125fed 100644 --- a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php @@ -52,6 +52,13 @@ class Upgrade7Test extends MigrateUpgradeExecuteTestBase { protected function setUp() { parent::setUp(); + // Enable the complete node migration. + $settings['settings']['migrate_node_migrate_type_classic'] = (object) [ + 'value' => FALSE, + 'required' => TRUE, + ]; + $this->writeSettings($settings); + // Delete the existing content made to test the ID Conflict form. Migrations // are to be done on a site without content. The test of the ID Conflict // form is being moved to its own issue which will remove the deletion