Updated Drupal to 8.6. This goes with the following updates because it's possible...

[yaffs-website] / web / core / modules / language / tests / src / Kernel / Migrate / d7 / MigrateLanguageNegotiationSettingsTest.php

diff --git a/web/core/modules/language/tests/src/Kernel/Migrate/d7/MigrateLanguageNegotiationSettingsTest.php b/web/core/modules/language/tests/src/Kernel/Migrate/d7/MigrateLanguageNegotiationSettingsTest.php
index 09681dee6520154132d5c850115ef0c62494ad33..cd1a21835eed7827d50f98682a743932c5fb6ec9 100644 (file)
--- a/web/core/modules/language/tests/src/Kernel/Migrate/d7/MigrateLanguageNegotiationSettingsTest.php
+++ b/web/core/modules/language/tests/src/Kernel/Migrate/d7/MigrateLanguageNegotiationSettingsTest.php
@@ -28,10 +28,10 @@ class MigrateLanguageNegotiationSettingsTest extends MigrateDrupal7TestBase {
     ]);
 
     $config = $this->config('language.types');
-    $this->assertSame($config->get('all'), ['language_content', 'language_url', 'language_interface']);
-    $this->assertSame($config->get('configurable'), ['language_interface']);
-    $this->assertSame($config->get('negotiation.language_content'), ['enabled' => ['language-interface' => 0]]);
-    $this->assertSame($config->get('negotiation.language_url'), ['enabled' => ['language-url' => 0, 'language-url-fallback' => 1]]);
+    $this->assertSame(['language_content', 'language_url', 'language_interface'], $config->get('all'));
+    $this->assertSame(['language_interface'], $config->get('configurable'));
+    $this->assertSame(['enabled' => ['language-interface' => 0]], $config->get('negotiation.language_content'));
+    $this->assertSame(['enabled' => ['language-url' => 0, 'language-url-fallback' => 1]], $config->get('negotiation.language_url'));
     $expected_language_interface = [
       'enabled' => [
         'language-url' => -9,
@@ -46,13 +46,17 @@ class MigrateLanguageNegotiationSettingsTest extends MigrateDrupal7TestBase {
         'language-selected' => -6,
       ],
     ];
-    $this->assertSame($config->get('negotiation.language_interface'), $expected_language_interface);
+    $this->assertSame($expected_language_interface, $config->get('negotiation.language_interface'));
   }
 
   /**
    * Tests the migration with prefix negotiation.
    */
   public function testLanguageNegotiationWithPrefix() {
+    $this->sourceDatabase->update('languages')
+      ->fields(['domain' => ''])
+      ->execute();
+
     $this->executeMigrations([
       'language',
       'd7_language_negotiation_settings',
@@ -60,14 +64,25 @@ class MigrateLanguageNegotiationSettingsTest extends MigrateDrupal7TestBase {
     ]);
 
     $config = $this->config('language.negotiation');
-    $this->assertSame($config->get('session.parameter'), 'language');
-    $this->assertSame($config->get('url.source'), LanguageNegotiationUrl::CONFIG_PATH_PREFIX);
-    $this->assertSame($config->get('selected_langcode'), 'site_default');
+    $this->assertSame('language', $config->get('session.parameter'));
+    $this->assertSame(LanguageNegotiationUrl::CONFIG_PATH_PREFIX, $config->get('url.source'));
+    $this->assertSame('site_default', $config->get('selected_langcode'));
     $expected_prefixes = [
       'en' => '',
+      'fr' => 'fr',
       'is' => 'is',
     ];
-    $this->assertSame($config->get('url.prefixes'), $expected_prefixes);
+    $this->assertSame($expected_prefixes, $config->get('url.prefixes'));
+
+    // If prefix negotiation is used, make sure that no domains are migrated.
+    // Otherwise there will be validation errors when trying to save URL
+    // language detection configuration from the UI.
+    $expected_domains = [
+      'en' => '',
+      'fr' => '',
+      'is' => '',
+    ];
+    $this->assertSame($expected_domains, $config->get('url.domains'));
   }
 
   /**
@@ -87,14 +102,15 @@ class MigrateLanguageNegotiationSettingsTest extends MigrateDrupal7TestBase {
 
     global $base_url;
     $config = $this->config('language.negotiation');
-    $this->assertSame($config->get('session.parameter'), 'language');
-    $this->assertSame($config->get('url.source'), LanguageNegotiationUrl::CONFIG_DOMAIN);
-    $this->assertSame($config->get('selected_langcode'), 'site_default');
+    $this->assertSame('language', $config->get('session.parameter'));
+    $this->assertSame(LanguageNegotiationUrl::CONFIG_DOMAIN, $config->get('url.source'));
+    $this->assertSame('site_default', $config->get('selected_langcode'));
     $expected_domains = [
       'en' => parse_url($base_url, PHP_URL_HOST),
+      'fr' => 'fr.drupal.org',
       'is' => 'is.drupal.org',
     ];
-    $this->assertSame($config->get('url.domains'), $expected_domains);
+    $this->assertSame($expected_domains, $config->get('url.domains'));
   }
 
   /**
@@ -112,14 +128,15 @@ class MigrateLanguageNegotiationSettingsTest extends MigrateDrupal7TestBase {
     ]);
 
     $config = $this->config('language.negotiation');
-    $this->assertSame($config->get('session.parameter'), 'language');
-    $this->assertSame($config->get('url.source'), LanguageNegotiationUrl::CONFIG_PATH_PREFIX);
-    $this->assertSame($config->get('selected_langcode'), 'site_default');
+    $this->assertSame('language', $config->get('session.parameter'));
+    $this->assertSame(LanguageNegotiationUrl::CONFIG_PATH_PREFIX, $config->get('url.source'));
+    $this->assertSame('site_default', $config->get('selected_langcode'));
     $expected_prefixes = [
       'en' => '',
+      'fr' => 'fr',
       'is' => 'is',
     ];
-    $this->assertSame($config->get('url.prefixes'), $expected_prefixes);
+    $this->assertSame($expected_prefixes, $config->get('url.prefixes'));
   }
 
 }