Skip to content

Commit d36fdfb

Browse files
glo71317glo71317
committed
Merge remote-tracking branch 'origin/2.4-develop' into AC-10727
2 parents cfbb750 + 594a590 commit d36fdfb

File tree

82 files changed

+3280
-638
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+3280
-638
lines changed

‎app/code/Magento/Catalog/Test/Fixture/Product.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class Product implements RevertibleDataFixtureInterface
5353
'media_gallery_entries' => [],
5454
'tier_prices' => [],
5555
'created_at' => null,
56-
'updated_at' => null,
56+
'updated_at' => null
5757
];
5858

5959
private const DEFAULT_PRODUCT_LINK_DATA = [

‎app/code/Magento/Catalog/Test/Fixture/ProductStock.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ class ProductStock implements DataFixtureInterface
2626
{
2727
private const DEFAULT_DATA = [
2828
'prod_id' => null,
29-
'prod_qty' => 1
29+
'prod_qty' => 1,
30+
'is_in_stock' => 1
3031
];
3132

3233
/**
@@ -67,8 +68,8 @@ public function apply(array $data = []): ?DataObject
6768
{
6869
$data = $this->dataMerger->merge(self::DEFAULT_DATA, $data);
6970
$stockItem = $this->stockRegistry->getStockItem($data['prod_id']);
70-
$stockItem->setData('is_in_stock', 1);
71-
$stockItem->setData('qty', 90);
71+
$stockItem->setData('is_in_stock', $data['is_in_stock']);
72+
$stockItem->setData('qty', $data['prod_qty']);
7273
$stockItem->setData('manage_stock', 1);
7374
$stockItem->save();
7475

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAddCustomAttributeToSelectedProductActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<checkOption selector="{{AdminProductAttributeSetGridSection.selectFromAttributeResult(attributeCode)}}" stepKey="selectAttributeFromDisplayedResult"/>
2626
<click selector="{{AdminProductAttributeSetGridSection.addSelected}}" stepKey="clickAddSelectedButton" />
2727
<waitForPageLoad stepKey="waitForAttributesToBeAdded"/>
28-
<scrollTo selector="{{AdminProductFormSection.attributeTab}}" stepKey="scrollToAttributeTab" />
28+
<scrollTo selector="{{AdminProductFormSection.attributeTab}}" x="0" y="-100" stepKey="scrollToAttributeTab" />
2929
<click selector="{{AdminProductFormSection.attributeTab}}" stepKey="expandAttributeTab" />
3030
<selectOption selector="{{AdminProductFormSection.customSelectField(attributeCode)}}" userInput="{{adminOption1}}" stepKey="selectAvalueFromDropdown"/>
3131
<click selector="{{AdminProductFormSection.save}}" stepKey="saveTheProduct" />

‎app/code/Magento/Catalog/Test/Mftf/Test/AddExistingProductAttributeFromProductPageTest.xml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,15 @@
4747
<actionGroup ref="NavigateToEditProductAttributeActionGroup" stepKey="goToAttributeEditPage">
4848
<argument name="ProductAttribute" value="Test Attribute"/>
4949
</actionGroup>
50-
<click selector="{{AttributePropertiesSection.DeleteAttribute}}" stepKey="clickDeleteAttribute" />
51-
<click selector="{{AttributeDeleteModalSection.confirm}}" stepKey="clickOkToConfirmDelete" />
52-
<waitForPageLoad stepKey="waitForDeletion"/>
50+
<actionGroup ref="DeleteProductAttributeByAttributeCodeActionGroup" stepKey="deleteProductAttribute"/>
51+
<comment userInput="BIC workaround" stepKey="clickDeleteAttribute"/>
52+
<comment userInput="BIC workaround" stepKey="clickOkToConfirmDelete"/>
53+
<comment userInput="BIC workaround" stepKey="waitForDeletion"/>
54+
55+
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
56+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexInvalidatedIndices">
57+
<argument name="indices" value=""/>
58+
</actionGroup>
5359

5460
<!-- Select the Default Category for Main Webstore -->
5561
<actionGroup ref="UpdateRootCategoryForStoresActionGroup" stepKey="UpdateRootCategoryForStores">

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeTextSwatchFromProductPageTest.xml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,16 @@
2727
<actionGroup ref="NavigateToEditProductAttributeActionGroup" stepKey="goToEditPage">
2828
<argument name="ProductAttribute" value="{{textSwatchProductAttribute.attribute_code}}"/>
2929
</actionGroup>
30-
<click stepKey="clickDelete" selector="{{AttributePropertiesSection.DeleteAttribute}}"/>
31-
<click stepKey="clickOk" selector="{{AttributeDeleteModalSection.confirm}}"/>
32-
<waitForPageLoad stepKey="waitForDeletion"/>
30+
31+
<actionGroup ref="DeleteProductAttributeByAttributeCodeActionGroup" stepKey="deleteProductAttribute"/>
32+
<comment userInput="BIC workaround" stepKey="clickDelete"/>
33+
<comment userInput="BIC workaround" stepKey="clickOk"/>
34+
<comment userInput="BIC workaround" stepKey="waitForDeletion"/>
35+
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
36+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexInvalidatedIndices">
37+
<argument name="indices" value=""/>
38+
</actionGroup>
39+
3340
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3441
</after>
3542

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeVisualSwatchFromProductPageTest.xml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,14 @@
2727
<actionGroup ref="NavigateToEditProductAttributeActionGroup" stepKey="goToEditPage">
2828
<argument name="ProductAttribute" value="{{visualSwatchProductAttribute.attribute_code}}"/>
2929
</actionGroup>
30-
<click stepKey="clickDelete" selector="{{AttributePropertiesSection.DeleteAttribute}}"/>
31-
<click stepKey="clickOk" selector="{{AttributeDeleteModalSection.confirm}}"/>
32-
<waitForPageLoad stepKey="waitForDeletion"/>
30+
<actionGroup ref="DeleteProductAttributeByAttributeCodeActionGroup" stepKey="deleteProductAttribute"/>
31+
<comment userInput="BIC workaround" stepKey="clickDelete"/>
32+
<comment userInput="BIC workaround" stepKey="clickOk"/>
33+
<comment userInput="BIC workaround" stepKey="waitForDeletion"/>
34+
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
35+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexInvalidatedIndices">
36+
<argument name="indices" value=""/>
37+
</actionGroup>
3338
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3439
</after>
3540

‎app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateBundleProductCustomAttributeEntityTextAreaTest.xml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,16 @@
4444
<actionGroup ref="NavigateToEditProductAttributeActionGroup" stepKey="goToEditPage">
4545
<argument name="ProductAttribute" value="test_custom_attribute"/>
4646
</actionGroup>
47-
<click stepKey="clickDelete" selector="{{AttributePropertiesSection.DeleteAttribute}}"/>
48-
<click stepKey="clickOk" selector="{{AttributeDeleteModalSection.confirm}}"/>
49-
<waitForPageLoad stepKey="waitForDeletion"/>
47+
<actionGroup ref="DeleteProductAttributeByAttributeCodeActionGroup" stepKey="deleteProductAttribute"/>
48+
<comment userInput="BIC workaround" stepKey="clickDelete"/>
49+
<comment userInput="BIC workaround" stepKey="clickOk"/>
50+
<comment userInput="BIC workaround" stepKey="waitForDeletion"/>
51+
52+
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
53+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexInvalidatedIndices">
54+
<argument name="indices" value=""/>
55+
</actionGroup>
56+
5057
<deleteData createDataKey="simpleCategory1" stepKey="deleteCategory"/>
5158
<deleteData createDataKey="createBundleProduct" stepKey="deleteBundleProduct"/>
5259
<deleteData createDataKey="simpleProduct1" stepKey="deleteProduct1"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityDateTest.xml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,12 @@
2727
<actionGroup ref="NavigateToEditProductAttributeActionGroup" stepKey="goToEditPage">
2828
<argument name="ProductAttribute" value="{{dateProductAttribute.attribute_code}}"/>
2929
</actionGroup>
30-
<click stepKey="clickDelete" selector="{{AttributePropertiesSection.DeleteAttribute}}"/>
31-
<click stepKey="clickOk" selector="{{AttributeDeleteModalSection.confirm}}"/>
32-
<waitForPageLoad stepKey="waitForDeletion"/>
30+
<actionGroup ref="DeleteProductAttributeByAttributeCodeActionGroup" stepKey="deleteProductAttribute"/>
31+
<comment userInput="BIC workaround" stepKey="clickDelete"/>
32+
<comment userInput="BIC workaround" stepKey="clickOk"/>
33+
<comment userInput="BIC workaround" stepKey="waitForDeletion"/>
34+
35+
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
3336
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
3437
<argument name="indices" value=""/>
3538
</actionGroup>

‎app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityDropdownTest.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@
2626
<actionGroup ref="NavigateToEditProductAttributeActionGroup" stepKey="goToEditPage">
2727
<argument name="ProductAttribute" value="{{dropdownProductAttribute.attribute_code}}"/>
2828
</actionGroup>
29-
<click stepKey="clickDelete" selector="{{AttributePropertiesSection.DeleteAttribute}}"/>
30-
<click stepKey="clickOk" selector="{{AttributeDeleteModalSection.confirm}}"/>
31-
<waitForPageLoad stepKey="waitForDeletion"/>
29+
<actionGroup ref="DeleteProductAttributeByAttributeCodeActionGroup" stepKey="deleteProductAttribute"/>
30+
<comment userInput="BIC workaround" stepKey="clickDelete"/>
31+
<comment userInput="BIC workaround" stepKey="clickOk"/>
32+
<comment userInput="BIC workaround" stepKey="waitForDeletion"/>
3233
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
3334
<argument name="indices" value=""/>
3435
</actionGroup>

‎app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityDropdownWithSingleQuoteTest.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,10 @@
2727
<actionGroup ref="NavigateToEditProductAttributeActionGroup" stepKey="goToEditPage">
2828
<argument name="ProductAttribute" value="{{dropdownProductAttributeWithQuote.attribute_code}}"/>
2929
</actionGroup>
30-
<click stepKey="clickDelete" selector="{{AttributePropertiesSection.DeleteAttribute}}"/>
31-
<click stepKey="clickOk" selector="{{AttributeDeleteModalSection.confirm}}"/>
32-
<waitForPageLoad stepKey="waitForDeletion"/>
30+
<actionGroup ref="DeleteProductAttributeByAttributeCodeActionGroup" stepKey="deleteProductAttribute"/>
31+
<comment userInput="BIC workaround" stepKey="clickDelete"/>
32+
<comment userInput="BIC workaround" stepKey="clickOk"/>
33+
<comment userInput="BIC workaround" stepKey="waitForDeletion"/>
3334
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
3435
<argument name="indices" value=""/>
3536
</actionGroup>

0 commit comments

Comments
 (0)