Commit 996c3830 authored by catch's avatar catch
Browse files

task: #3588276 Remove comment module dependency from standard profile and recipe 

By: gábor hojtsy
By: smustgrave
(cherry picked from commit 39e95282)
parent c42c8879

core/modules/contact/tests/src/Functional/migrate_drupal_ui/d6/Upgrade6Test.php

+4 −3
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ class Upgrade6Test extends MigrateUpgradeExecuteTestBase { 
    'config_translation',

    'contact',

    'content_translation',

    'comment',

    'migrate_drupal_ui',

    'update',

    'shortcut',
@@ -76,11 +77,11 @@ protected function getEntityCounts(): array { 
      'contact_message' => 0,

      'date_format' => 12,

      'editor' => 2,

      'entity_form_display' => 7,

      'entity_form_display' => 6,

      'entity_form_mode' => 1,

      'entity_view_display' => 10,

      'entity_view_display' => 9,

      'entity_view_mode' => 9,

      'field_config' => 10,

      'field_config' => 9,

      'field_storage_config' => 7,

      'file' => 1,

      'filter_format' => 7,

core/modules/contact/tests/src/Functional/migrate_drupal_ui/d7/Upgrade7Test.php

+4 −3
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ class Upgrade7Test extends MigrateUpgradeExecuteTestBase { 
    'config_translation',

    'contact',

    'content_translation',

    'comment',

    'migrate_drupal_ui',

    'shortcut',

  ];
@@ -77,11 +78,11 @@ protected function getEntityCounts(): array { 
      'contact_message' => 0,

      'date_format' => 12,

      'editor' => 2,

      'entity_form_display' => 13,

      'entity_form_display' => 12,

      'entity_form_mode' => 1,

      'entity_view_display' => 19,

      'entity_view_display' => 18,

      'entity_view_mode' => 9,

      'field_config' => 30,

      'field_config' => 29,

      'field_storage_config' => 21,

      'file' => 1,

      'filter_format' => 7,

core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeExecuteTestBase.php

+12 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 


namespace Drupal\Tests\migrate_drupal_ui\Functional;



use Drupal\comment\Entity\CommentType;

use Drupal\Core\Entity\ContentEntityStorageInterface;

use Drupal\Core\Logger\RfcLogLevel;

use Drupal\Tests\migrate_drupal\Traits\CreateTestContentEntitiesTrait;
@@ -42,6 +43,17 @@ abstract class MigrateUpgradeExecuteTestBase extends MigrateUpgradeTestBase { 
  protected function setUp(): void {

    parent::setUp();



    $comment_types = CommentType::loadMultiple();

    if (empty($comment_types['comment'])) {

      $bundle = CommentType::create([

        'id' => 'comment',

        'label' => 'Default comments',

        'description' => 'Allows commenting on content',

        'target_entity_type_id' => 'node',

      ]);

      $bundle->save();

    }



    // Create content.

    $this->createContent();

core/modules/migrate_drupal_ui/tests/src/Functional/MultilingualReviewPageTestBase.php

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ abstract class MultilingualReviewPageTestBase extends MigrateUpgradeTestBase { 
  /**

   * {@inheritdoc}

   */

  protected static $modules = ['migrate_drupal_ui', 'shortcut'];

  protected static $modules = ['migrate_drupal_ui', 'shortcut', 'comment'];



  /**

   * Tests the migrate upgrade review form.

core/modules/migrate_drupal_ui/tests/src/Functional/d6/IdConflictTest.php

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ class IdConflictTest extends MigrateUpgradeExecuteTestBase { 
  protected static $modules = [

    'config_translation',

    'content_translation',

    'comment',

    'language',

    'migrate_drupal_ui',

    'telephone',