diff --git a/core/modules/config/src/Tests/ConfigImporterTest.php b/core/modules/config/src/Tests/ConfigImporterTest.php index a08d288..00c5a1f 100644 --- a/core/modules/config/src/Tests/ConfigImporterTest.php +++ b/core/modules/config/src/Tests/ConfigImporterTest.php @@ -32,7 +32,7 @@ class ConfigImporterTest extends KernelTestBase { * * @var array */ - public static $modules = array('config_test', 'system', 'config_import_test'); + public static $modules = array('config_test', 'system', 'config_import_test', 'config_test_language'); protected function setUp() { parent::setUp(); @@ -544,10 +544,10 @@ function testIsInstallable() { */ function testLanguage() { // Test imported configuration with implicit language code. - $data = $this->container->get('config.storage.installer')->read('config_test.dynamic.dotted.default'); + $data = $this->container->get('config.storage.installer')->read('config_test.dynamic.dotted.english'); $this->assertTrue(!isset($data['langcode'])); $this->assertEqual( - $this->config('config_test.dynamic.dotted.default')->get('langcode'), + $this->config('config_test.dynamic.dotted.english')->get('langcode'), 'en' ); diff --git a/core/modules/config/tests/config_test/config/install/config_test.dynamic.dotted.french.yml b/core/modules/config/tests/config_test/config/install/config_test.dynamic.dotted.french.yml index 9c43f67..e69de29 100644 --- a/core/modules/config/tests/config_test/config/install/config_test.dynamic.dotted.french.yml +++ b/core/modules/config/tests/config_test/config/install/config_test.dynamic.dotted.french.yml @@ -1,5 +0,0 @@ -id: dotted.french -label: Default -weight: 0 -protected_property: Default -langcode: fr diff --git a/core/modules/config/tests/config_test_language/config/install/config_test.dynamic.dotted.english.yml b/core/modules/config/tests/config_test_language/config/install/config_test.dynamic.dotted.english.yml new file mode 100644 index 0000000..3470aff --- /dev/null +++ b/core/modules/config/tests/config_test_language/config/install/config_test.dynamic.dotted.english.yml @@ -0,0 +1,6 @@ +id: dotted.english +label: Default +weight: 0 +protected_property: Default +# Used for testing default language code on imported config entities. +# langcode: en diff --git a/core/modules/config/tests/config_test_language/config/install/config_test.dynamic.dotted.french.yml b/core/modules/config/tests/config_test_language/config/install/config_test.dynamic.dotted.french.yml new file mode 100644 index 0000000..9c43f67 --- /dev/null +++ b/core/modules/config/tests/config_test_language/config/install/config_test.dynamic.dotted.french.yml @@ -0,0 +1,5 @@ +id: dotted.french +label: Default +weight: 0 +protected_property: Default +langcode: fr diff --git a/core/modules/config/tests/config_test_language/config_test_language.info.yml b/core/modules/config/tests/config_test_language/config_test_language.info.yml new file mode 100644 index 0000000..28d720b --- /dev/null +++ b/core/modules/config/tests/config_test_language/config_test_language.info.yml @@ -0,0 +1,5 @@ +name: 'Configuration test languages' +type: module +package: Testing +version: VERSION +core: 8.x