diff --git a/core/modules/migrate_drupal/tests/fixtures/drupal7.php b/core/modules/migrate_drupal/tests/fixtures/drupal7.php index fb307f0..8b621bb 100644 --- a/core/modules/migrate_drupal/tests/fixtures/drupal7.php +++ b/core/modules/migrate_drupal/tests/fixtures/drupal7.php @@ -40781,7 +40781,7 @@ 'login' => '1444945097', 'status' => '1', 'timezone' => NULL, - 'language' => '', + 'language' => 'de', 'picture' => '0', 'init' => '', 'data' => 'a:1:{s:7:"contact";i:1;}', diff --git a/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserTest.php b/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserTest.php index 1713ea4..4dde43c 100644 --- a/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserTest.php +++ b/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserTest.php @@ -71,7 +71,6 @@ protected function assertEntity($id, $label, $mail, $access, $login, $blocked, $ // $user->getPreferredLangcode() might fallback to default language if the // user preferred language is not configured on the site. We just want to // test if the value was imported correctly. - $langcode = $langcode ?: \Drupal::config('system.site')->get('default_langcode'); $this->assertIdentical($langcode, $user->langcode->value); $this->assertIdentical($langcode, $user->preferred_langcode->value); $this->assertIdentical($langcode, $user->preferred_admin_langcode->value); @@ -84,7 +83,9 @@ protected function assertEntity($id, $label, $mail, $access, $login, $blocked, $ * Tests the Drupal 7 user to Drupal 8 migration. */ public function testUser() { - $this->assertEntity(2, 'Odo', 'odo@local.host', '0', '0', FALSE, '', 'odo@local.host'); + $default_langcode = \Drupal::config('system.site')->get('default_langcode'); + $this->assertEntity(1, 'admin', 'admin@local.host', '1444945097', '1444945097', FALSE, 'de', NULL); + $this->assertEntity(2, 'Odo', 'odo@local.host', '0', '0', FALSE, $default_langcode, 'odo@local.host'); } }