MC-31304: [ElasticSearch] Exception on catalog search result page

Author: SmVladyslav

app/code/Magento/Eav/Model/Config.php

@@ -839,6 +839,7 @@ protected function _createAttribute($entityType, $attributeData)
         }
         /** @var AbstractAttribute $attribute */
         $attribute = $this->createAttribute($model)->setData($attributeData);
+        $attribute->setOrigData('entity_type_id', $attribute->getEntityTypeId());
         $this->_addAttributeReference(
             $attributeData['attribute_id'],
             $code,

app/code/Magento/Eav/Test/Unit/Model/ConfigTest.php

@@ -223,11 +223,13 @@ public function testGetAttributes($cacheEnabled)
             ->method('getData')
             ->willReturn([$attributeData]);
         $entityAttributeMock = $this->getMockBuilder(Attribute::class)
-            ->setMethods(['setData', 'load', 'toArray'])
+            ->setMethods(['setData', 'setOrigData', 'load', 'toArray'])
             ->disableOriginalConstructor()
             ->getMock();
         $entityAttributeMock->method('setData')
             ->willReturnSelf();
+        $entityAttributeMock->method('setOrigData')
+            ->willReturn($attributeData);
         $entityAttributeMock->method('load')
             ->willReturnSelf();
         $entityAttributeMock->method('toArray')