Skip to content
This repository was archived by the owner on Apr 29, 2019. It is now read-only.

Commit a2b9fab

Browse files
Merge forwardport of magento/magento2#12767 to 2.3-develop branch
Applied pull request patch https://github.com/magento/magento2/pull/12767.patch (created by @awarche) based on commit(s): 1. 39098d8 2. 49ae5fa 3. 5c30670
2 parents 4709a22 + 4810755 commit a2b9fab

File tree

6 files changed

+103
-54
lines changed

6 files changed

+103
-54
lines changed

app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/AbstractTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,13 @@ public function testWalkAttributes()
4444

4545
$code = 'test_attr';
4646
$set = 10;
47+
$storeId = 100;
4748

4849
$object = $this->createPartialMock(\Magento\Catalog\Model\Product::class, ['__wakeup']);
4950

5051
$object->setData('test_attr', 'test_attr');
5152
$object->setData('attribute_set_id', $set);
53+
$object->setData('store_id', $storeId);
5254

5355
$entityType = new \Magento\Framework\DataObject();
5456
$entityType->setEntityTypeCode('test');

0 commit comments

Comments
 (0)