Merge pull request #536 from magento-performance/ACPT-1316

ACPT-1316: Fix Sales Webapi GraphQl tests on MTS

Author: andimov

app/code/Magento/Eav/Model/Validator/Attribute/Data.php

@@ -8,6 +8,7 @@
 
 use Magento\Eav\Model\Attribute;
 use Magento\Eav\Model\AttributeDataFactory;
+use Magento\Eav\Model\Config;
 use Magento\Framework\DataObject;
 
 /**
@@ -47,14 +48,23 @@ class Data extends \Magento\Framework\Validator\AbstractValidator
      */
     private $ignoredAttributesByTypesList;
 
+    /**
+     * @var \Magento\Eav\Model\Config
+     */
+    private $eavConfig;
+
     /**
      * @param AttributeDataFactory $attrDataFactory
+     * @param Config|null $eavConfig
      * @param array $ignoredAttributesByTypesList
      */
     public function __construct(
         AttributeDataFactory $attrDataFactory,
+        Config $eavConfig = null,
         array $ignoredAttributesByTypesList = []
     ) {
+        $this->eavConfig = $eavConfig ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(Config::class);
         $this->_attrDataFactory = $attrDataFactory;
         $this->ignoredAttributesByTypesList = $ignoredAttributesByTypesList;
     }
@@ -166,8 +176,9 @@ protected function _getAttributes($entity)
         } elseif ($entity instanceof \Magento\Framework\Model\AbstractModel &&
             $entity->getResource() instanceof \Magento\Eav\Model\Entity\AbstractEntity
         ) { // $entity is EAV-model
+            $type = $entity->getEntityType()->getEntityTypeCode();
             /** @var \Magento\Eav\Model\Entity\Type $entityType */
-            $entityType = $entity->getEntityType();
+            $entityType = $this->eavConfig->getEntityType($type);
             $attributes = $entityType->getAttributeCollection()->getItems();
 
             $ignoredTypeAttributes = $this->ignoredAttributesByTypesList[$entityType->getEntityTypeCode()] ?? [];

app/code/Magento/Eav/Test/Unit/Model/Validator/Attribute/DataTest.php

@@ -13,6 +13,7 @@
 use Magento\Eav\Model\AttributeDataFactory;
 use Magento\Eav\Model\Entity\AbstractEntity;
 use Magento\Eav\Model\Validator\Attribute\Data;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DataObject;
 use Magento\Framework\Model\AbstractModel;
 use Magento\Framework\ObjectManagerInterface;
@@ -35,6 +36,11 @@ class DataTest extends TestCase
      */
     private $model;
 
+    /**
+     * @var \Magento\Eav\Model\Config|MockObject
+     */
+    private $eavConfigMock;
+
     /**
      * @inheritdoc
      */
@@ -49,7 +55,12 @@ protected function setUp(): void
                 ]
             )
             ->getMock();
-
+        $this->createMock(ObjectManagerInterface::class);
+        ObjectManager::setInstance($this->createMock(ObjectManagerInterface::class));
+        $this->eavConfigMock = $this->getMockBuilder(\Magento\Eav\Model\Config::class)
+            ->onlyMethods(['getEntityType'])
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->model = new Data($this->attrDataFactory);
     }
 
@@ -205,13 +216,17 @@ public function testIsValidAttributesFromCollection(): void
                 'is_visible' => true,
             ]
         );
+        $entityTypeCode = 'entity_type_code';
         $collection = $this->getMockBuilder(DataObject::class)
             ->addMethods(['getItems'])->getMock();
         $collection->expects($this->once())->method('getItems')->willReturn([$attribute]);
         $entityType = $this->getMockBuilder(DataObject::class)
-            ->addMethods(['getAttributeCollection'])
+            ->addMethods(['getAttributeCollection','getEntityTypeCode'])
             ->getMock();
+        $entityType->expects($this->atMost(2))->method('getEntityTypeCode')->willReturn($entityTypeCode);
         $entityType->expects($this->once())->method('getAttributeCollection')->willReturn($collection);
+        $this->eavConfigMock->expects($this->once())->method('getEntityType')
+            ->with($entityTypeCode)->willReturn($entityType);
         $entity = $this->_getEntityMock();
         $entity->expects($this->once())->method('getResource')->willReturn($resource);
         $entity->expects($this->once())->method('getEntityType')->willReturn($entityType);
@@ -235,7 +250,7 @@ public function testIsValidAttributesFromCollection(): void
         )->willReturn(
             $dataModel
         );
-        $validator = new Data($attrDataFactory);
+        $validator = new Data($attrDataFactory, $this->eavConfigMock);
 
         $validator->setData(['attribute' => 'new_test_data']);
         $this->assertTrue($validator->isValid($entity));