From 70c84d095f3f316da81cae91beef3364073fd7b8 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Tue, 4 Aug 2020 10:06:02 +0100
Subject: [PATCH] Issue #3163162 by quietone: Fix error in d7 fixture
 field_config_instance table

(cherry picked from commit ef06a015ece6cdea606e4174b0ff8a48d2a0d189)
---
 core/modules/migrate_drupal/tests/fixtures/drupal7.php          | 2 +-
 .../migrate_drupal/tests/src/Kernel/d7/FieldDiscoveryTest.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/modules/migrate_drupal/tests/fixtures/drupal7.php b/core/modules/migrate_drupal/tests/fixtures/drupal7.php
index b0b0316143..372ffa6d0b 100644
--- a/core/modules/migrate_drupal/tests/fixtures/drupal7.php
+++ b/core/modules/migrate_drupal/tests/fixtures/drupal7.php
@@ -5284,7 +5284,7 @@
 ))
 ->values(array(
   'id' => '83',
-  'field_id' => '54',
+  'field_id' => '1',
   'field_name' => 'comment_body',
   'entity_type' => 'comment',
   'bundle' => 'comment_node_et',
diff --git a/core/modules/migrate_drupal/tests/src/Kernel/d7/FieldDiscoveryTest.php b/core/modules/migrate_drupal/tests/src/Kernel/d7/FieldDiscoveryTest.php
index 95868e49ae..af7bccedf7 100644
--- a/core/modules/migrate_drupal/tests/src/Kernel/d7/FieldDiscoveryTest.php
+++ b/core/modules/migrate_drupal/tests/src/Kernel/d7/FieldDiscoveryTest.php
@@ -280,7 +280,7 @@ public function testGetAllFields() {
     $this->assertArrayHasKey('user', $actual_fields['user']);
     $this->assertArrayHasKey('test_content_type', $actual_fields['node']);
     $this->assertCount(7, $actual_fields['node']);
-    $this->assertCount(6, $actual_fields['comment']);
+    $this->assertCount(7, $actual_fields['comment']);
     $this->assertCount(22, $actual_fields['node']['test_content_type']);
     foreach ($actual_fields as $entity_type_id => $bundles) {
       foreach ($bundles as $bundle => $fields) {
-- 
GitLab