diff --git a/core/modules/content_translation/tests/modules/a_content_translation_test/a_content_translation_test.info.yml b/core/modules/content_translation/tests/modules/a_content_translation_test/a_content_translation_test.info.yml deleted file mode 100644 index f2df57c31c..0000000000 --- a/core/modules/content_translation/tests/modules/a_content_translation_test/a_content_translation_test.info.yml +++ /dev/null @@ -1,10 +0,0 @@ -name: 'A content translation test module' -type: module -description: 'Helper module to test hook invocation order.' -package: Testing -version: VERSION -core: 8.x -dependencies: - - content_translation - - entity_test - diff --git a/core/modules/content_translation/tests/modules/a_content_translation_test/a_content_translation_test.module b/core/modules/content_translation/tests/modules/a_content_translation_test/a_content_translation_test.module deleted file mode 100644 index b89e16037a..0000000000 --- a/core/modules/content_translation/tests/modules/a_content_translation_test/a_content_translation_test.module +++ /dev/null @@ -1,13 +0,0 @@ -set('a_content_translation_test.translatable', !empty($bundles['entity_test_mul']['entity_test_mul']['translatable'])); -} diff --git a/core/modules/content_translation/tests/modules/content_translation_test/content_translation_test.module b/core/modules/content_translation/tests/modules/content_translation_test/content_translation_test.module index e2318079c9..1275a278bc 100644 --- a/core/modules/content_translation/tests/modules/content_translation_test/content_translation_test.module +++ b/core/modules/content_translation/tests/modules/content_translation_test/content_translation_test.module @@ -7,6 +7,15 @@ use Drupal\Core\Form\FormStateInterface; +/** + * Implements hook_entity_bundle_info_alter(). + */ +function content_translation_test_entity_bundle_info_alter(&$bundles) { + // Store the initial status of the "translatable" property for the + // "entity_test_mul" bundle. + \Drupal::state()->set('content_translation_test.translatable', !empty($bundles['entity_test_mul']['entity_test_mul']['translatable'])); +} + /** * Implements hook_form_BASE_FORM_ID_alter(). * diff --git a/core/modules/content_translation/tests/src/Kernel/ContentTranslationEntityBundleInfoTest.php b/core/modules/content_translation/tests/src/Kernel/ContentTranslationEntityBundleInfoTest.php index 1fa3a91c8b..810c58f259 100644 --- a/core/modules/content_translation/tests/src/Kernel/ContentTranslationEntityBundleInfoTest.php +++ b/core/modules/content_translation/tests/src/Kernel/ContentTranslationEntityBundleInfoTest.php @@ -13,8 +13,11 @@ class ContentTranslationEntityBundleInfoTest extends KernelTestBase { /** * {@inheritdoc} + * + * The order of the modules is important here, it determines the order of + * invocation of hook implementations. */ - public static $modules = ['user', 'language', 'a_content_translation_test', 'content_translation', 'entity_test']; + public static $modules = ['user', 'language', 'content_translation_test', 'content_translation', 'entity_test']; /** * The content translation manager. @@ -55,7 +58,7 @@ public function testHookInvocationOrder() { // "translatable" bundle info property. /** @var \Drupal\Core\State\StateInterface $state */ $state = $this->container->get('state'); - $this->assertTrue($state->get('a_content_translation_test.translatable')); + $this->assertTrue($state->get('content_translation_test.translatable')); } }