X-Git-Url: http://aleph1.co.uk/gitweb/?a=blobdiff_plain;f=web%2Fcore%2Fmodules%2Ffield%2Ftests%2Fsrc%2FKernel%2FMigrate%2Fd7%2FMigrateFieldFormatterSettingsTest.php;h=6773ca8d28c4e0f0ecefbed70dc746d6ebfb39e1;hb=refs%2Fheads%2Fd864;hp=dd38569de144ebcf19bbfbb7093bd6056f7d96d3;hpb=a2bd1bf0c2c1f1a17d188f4dc0726a45494cefae;p=yaffs-website

diff --git a/web/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldFormatterSettingsTest.php b/web/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldFormatterSettingsTest.php
index dd38569de..6773ca8d2 100644
--- a/web/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldFormatterSettingsTest.php
+++ b/web/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldFormatterSettingsTest.php
@@ -56,7 +56,7 @@ class MigrateFieldFormatterSettingsTest extends MigrateDrupal7TestBase {
       'label' => $this->randomMachineName(),
     ])->save();
     CommentType::create([
-      'id' => 'comment_node_forum',
+      'id' => 'comment_forum',
       'label' => $this->randomMachineName(),
     ])->save();
     CommentType::create([
@@ -97,7 +97,7 @@ class MigrateFieldFormatterSettingsTest extends MigrateDrupal7TestBase {
     Database::getConnection('default', 'migrate')
       ->update('field_config_instance')
       ->fields([
-        'data' => serialize( [
+        'data' => serialize([
           'label' => 'Body',
           'widget' =>
              [
@@ -122,9 +122,7 @@ class MigrateFieldFormatterSettingsTest extends MigrateDrupal7TestBase {
                  [
                   'label' => 'hidden',
                   'type' => 'text_default',
-                  'settings' =>
-                     [
-                    ],
+                  'settings' => [],
                   'module' => 'text',
                   'weight' => 0,
                 ],
@@ -215,8 +213,8 @@ class MigrateFieldFormatterSettingsTest extends MigrateDrupal7TestBase {
     $this->assertEntity('comment.comment_node_book.default');
     $this->assertComponent('comment.comment_node_book.default', 'comment_body', 'text_default', 'hidden', 0);
 
-    $this->assertEntity('comment.comment_node_forum.default');
-    $this->assertComponent('comment.comment_node_forum.default', 'comment_body', 'text_default', 'hidden', 0);
+    $this->assertEntity('comment.comment_forum.default');
+    $this->assertComponent('comment.comment_forum.default', 'comment_body', 'text_default', 'hidden', 0);
 
     $this->assertEntity('comment.comment_node_page.default');
     $this->assertComponent('comment.comment_node_page.default', 'comment_body', 'text_default', 'hidden', 0);
@@ -229,6 +227,11 @@ class MigrateFieldFormatterSettingsTest extends MigrateDrupal7TestBase {
     $this->assertComponent('node.article.default', 'body', 'text_default', 'hidden', 0);
     $this->assertComponent('node.article.default', 'field_tags', 'entity_reference_label', 'above', 10);
     $this->assertComponent('node.article.default', 'field_image', 'image', 'hidden', -1);
+    $this->assertComponent('node.article.default', 'field_text_plain', 'string', 'above', 11);
+    $this->assertComponent('node.article.default', 'field_text_filtered', 'text_default', 'above', 12);
+    $this->assertComponent('node.article.default', 'field_text_long_plain', 'basic_string', 'above', 14);
+    $this->assertComponent('node.article.default', 'field_text_long_filtered', 'text_default', 'above', 15);
+    $this->assertComponent('node.article.default', 'field_text_sum_filtered', 'text_default', 'above', 18);
 
     $this->assertEntity('node.article.teaser');
     $this->assertComponent('node.article.teaser', 'body', 'text_summary_or_trimmed', 'hidden', 0);
@@ -257,6 +260,11 @@ class MigrateFieldFormatterSettingsTest extends MigrateDrupal7TestBase {
 
     $this->assertEntity('node.page.default');
     $this->assertComponent('node.page.default', 'body', 'text_default', 'hidden', 0);
+    $this->assertComponent('node.page.default', 'field_text_plain', 'string', 'above', 1);
+    $this->assertComponent('node.page.default', 'field_text_filtered', 'text_default', 'above', 2);
+    $this->assertComponent('node.page.default', 'field_text_long_plain', 'basic_string', 'above', 4);
+    $this->assertComponent('node.page.default', 'field_text_long_filtered', 'text_default', 'above', 5);
+    $this->assertComponent('node.page.default', 'field_text_sum_filtered', 'text_default', 'above', 8);
 
     $this->assertEntity('node.page.teaser');
     $this->assertComponent('node.page.teaser', 'body', 'text_summary_or_trimmed', 'hidden', 0);
@@ -275,6 +283,7 @@ class MigrateFieldFormatterSettingsTest extends MigrateDrupal7TestBase {
     $this->assertComponent('node.test_content_type.default', 'field_link', 'link', 'above', 9);
     $this->assertComponent('node.test_content_type.default', 'field_text_list', 'list_default', 'above', 10);
     $this->assertComponent('node.test_content_type.default', 'field_integer_list', 'list_default', 'above', 11);
+    $this->assertComponent('node.test_content_type.default', 'field_float_list', 'list_default', 'above', 19);
     $this->assertComponent('node.test_content_type.default', 'field_long_text', 'text_default', 'above', 12);
     $this->assertComponent('node.test_content_type.default', 'field_node_entityreference', 'entity_reference_label', 'above', 15);
     $this->assertComponent('node.test_content_type.default', 'field_user_entityreference', 'entity_reference_label', 'above', 16);