Merge remote-tracking branch 'magento-engcom-team/forwardport-2.3-dev…

…elop-magento-magento2-12283' into batch-21-forwardport-2.3-develop # Conflicts: # dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/custom_attributes_rollback.php
magento · Jan 30, 2018 · 79de0d6 · 79de0d6
2 parents e27445d + f0711ed
commit 79de0d6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_multistore.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_multistore.php
@@ -21,6 +21,9 @@
     4
 )->setStoreId(
     1
+)->setCustomAttribute(
+    'tax_class_id',
+    1
 )->setWebsiteIds(
     [1]
 )->setName(

diff --git a/.../testsuite/Magento/CatalogImportExport/Model/Import/_files/custom_attributes_rollback.php b/.../testsuite/Magento/CatalogImportExport/Model/Import/_files/custom_attributes_rollback.php
@@ -8,7 +8,7 @@
 
 $attributeCodes = [
     'test_attribute',
-    ];
+];
 
 foreach ($attributeCodes as $attributeCode) {
     /** @var \Magento\Eav\Model\Entity\Attribute $attribute */