Skip to content

Commit 28c1f28

Browse files
ishakhsuvarovishakhsuvarov
authored
Merge pull request #7722 from magento-amigos/2.4-develop-prs
[Amigos] Community Contributions - 2.4-develop
2 parents 0953fe7 + f7bd703 commit 28c1f28

File tree

51 files changed

+422
-70
lines changed

Some content is hidden

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

51 files changed

+422
-70
lines changed

‎app/code/Magento/AwsS3/Driver/AwsS3.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -527,6 +527,10 @@ public function getRealPath($path)
527527
*/
528528
public function rename($oldPath, $newPath, DriverInterface $targetDriver = null): bool
529529
{
530+
if ($oldPath === $newPath) {
531+
return true;
532+
}
533+
530534
try {
531535
$this->adapter->move(
532536
$this->normalizeRelativePath($oldPath, true),

‎app/code/Magento/AwsS3/Test/Unit/Driver/AwsS3Test.php

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -496,4 +496,21 @@ public function testCreateDirectory(): void
496496

497497
self::assertTrue($this->driver->createDirectory(self::URL . 'test/test2/'));
498498
}
499+
500+
public function testRename(): void
501+
{
502+
$this->adapterMock->expects(self::once())
503+
->method('move')
504+
->with('test/path', 'test/path2');
505+
506+
self::assertTrue($this->driver->rename('test/path', 'test/path2'));
507+
}
508+
509+
public function testRenameSameDestination(): void
510+
{
511+
$this->adapterMock->expects(self::never())
512+
->method('move');
513+
514+
self::assertTrue($this->driver->rename('test/path', 'test/path'));
515+
}
499516
}

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminAttributeSetSelectionTest.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,11 @@
4040

4141
<!-- Go to new product page and see a default attribute -->
4242
<!-- Switch from default attribute set to new attribute set -->
43-
<amOnPage url="{{AdminProductCreatePage.url('4', 'bundle')}}" stepKey="goToNewProductPage"/>
44-
<waitForPageLoad stepKey="wait2"/>
43+
<actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToNewProductPage">
44+
<argument name="attributeSetId" value="4"/>
45+
<argument name="productType" value="bundle"/>
46+
</actionGroup>
47+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="wait2"/>
4548

4649
<actionGroup ref="AdminSelectAttributeSetOnEditProductPageActionGroup" stepKey="startEditAttrSet">
4750
<argument name="attributeSet" value="{{ProductAttributeFrontendLabel.label}}"/>

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminBasicBundleProductAttributesTest.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,10 @@
4040
</actionGroup>
4141

4242
<!--Go to product creation page-->
43-
<actionGroup ref="AdminOpenCreateBundleProductPageActionGroup" stepKey="goToBundleProductCreationPage"/>
43+
<actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToBundleProductCreationPage">
44+
<argument name="attributeSetId" value="{{BundleProduct.set}}"/>
45+
<argument name="productType" value="{{BundleProduct.type}}"/>
46+
</actionGroup>
4447
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreationPage"/>
4548

4649
<!--Enable/Disable Toggle-->

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProductTest.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@
3131
</after>
3232

3333
<!--Create bundle product-->
34-
<actionGroup ref="AdminOpenCreateBundleProductPageActionGroup" stepKey="goToBundleProductCreationPage"/>
34+
<actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToBundleProductCreationPage">
35+
<argument name="attributeSetId" value="{{BundleProduct.set}}"/>
36+
<argument name="productType" value="{{BundleProduct.type}}"/>
37+
</actionGroup>
38+
3539
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreationPage"/>
3640
<conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems"/>
3741
<click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption3"/>

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProductTest.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@
3131
</after>
3232

3333
<!--Create bundle product-->
34-
<actionGroup ref="AdminOpenCreateBundleProductPageActionGroup" stepKey="goToBundleProductCreationPage"/>
34+
<actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToBundleProductCreationPage">
35+
<argument name="attributeSetId" value="{{BundleProduct.set}}"/>
36+
<argument name="productType" value="{{BundleProduct.type}}"/>
37+
</actionGroup>
38+
3539
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreationPage"/>
3640
<conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems"/>
3741
<click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption3"/>

‎app/code/Magento/Bundle/Test/Mftf/Test/BundleProductFixedPricingTest.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,10 @@
3939
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4040
</after>
4141
<!--Go to bundle product creation page-->
42-
<actionGroup ref="AdminOpenCreateBundleProductPageActionGroup" stepKey="goToBundleProductCreationPage"/>
42+
<actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToBundleProductCreationPage">
43+
<argument name="attributeSetId" value="{{BundleProduct.set}}"/>
44+
<argument name="productType" value="{{BundleProduct.type}}"/>
45+
</actionGroup>
4346
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreatePageToLoad"/>
4447

4548
<!-- Add two bundle items -->

‎app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithTierPriceInCartTest.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@
3636
</actionGroup>
3737
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3838
</after>
39-
<actionGroup ref="AdminOpenCreateBundleProductPageActionGroup" stepKey="goToBundleProductCreationPage"/>
39+
<actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToBundleProductCreationPage">
40+
<argument name="attributeSetId" value="{{BundleProduct.set}}"/>
41+
<argument name="productType" value="{{BundleProduct.type}}"/>
42+
</actionGroup>
4043
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreatePageToLoad"/>
4144
<actionGroup ref="FillMainBundleProductFormActionGroup" stepKey="fillMainFieldsForBundle"/>
4245
<actionGroup ref="AddBundleOptionWithOneProductActionGroup" stepKey="addBundleOption1">

‎app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithTierPriceWithFixedAndPercentOptionsInCartTest.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@
4141
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
4242
</after>
4343

44-
<actionGroup ref="AdminOpenCreateBundleProductPageActionGroup" stepKey="goToBundleProductCreationPage"/>
44+
<actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToBundleProductCreationPage">
45+
<argument name="attributeSetId" value="{{BundleProduct.set}}"/>
46+
<argument name="productType" value="{{BundleProduct.type}}"/>
47+
</actionGroup>
4548
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreatePageToLoad"/>
4649
<click selector="{{AdminProductFormBundleSection.dynamicSkuToggle}}" stepKey="disableDynamicSku"/>
4750
<click selector="{{AdminProductFormBundleSection.dynamicPrice}}" stepKey="clickDynamicPriceSwitcher"/>

‎app/code/Magento/Bundle/Test/Mftf/Test/CurrencyChangingBundleProductInCartTest.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,10 @@
4545
<deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
4646
</after>
4747
<!--Go to bundle product creation page-->
48-
<actionGroup ref="AdminOpenCreateBundleProductPageActionGroup" stepKey="goToBundleProductCreationPage"/>
48+
<actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToBundleProductCreationPage">
49+
<argument name="attributeSetId" value="{{BundleProduct.set}}"/>
50+
<argument name="productType" value="{{BundleProduct.type}}"/>
51+
</actionGroup>
4952
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreatePageToLoad"/>
5053
<actionGroup ref="FillMainBundleProductFormActionGroup" stepKey="fillMainFieldsForBundle"/>
5154
<!-- Add Option, a "Radio Buttons" type option -->

‎app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,10 @@
3737
</after>
3838

3939
<!--Go to bundle product creation page-->
40-
<actionGroup ref="AdminOpenCreateBundleProductPageActionGroup" stepKey="goToBundleProductCreationPage"/>
40+
<actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToBundleProductCreationPage">
41+
<argument name="attributeSetId" value="{{BundleProduct.set}}"/>
42+
<argument name="productType" value="{{BundleProduct.type}}"/>
43+
</actionGroup>
4144
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreatePageToLoad"/>
4245

4346
<!--Create bundle product-->
@@ -76,7 +79,10 @@
7679

7780
<!--Creating Second bundle product-->
7881
<!--Go to bundle product creation page-->
79-
<actionGroup ref="AdminOpenCreateBundleProductPageActionGroup" stepKey="goToBundleProductCreationPage2"/>
82+
<actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToBundleProductCreationPage2">
83+
<argument name="attributeSetId" value="{{BundleProduct.set}}"/>
84+
<argument name="productType" value="{{BundleProduct.type}}"/>
85+
</actionGroup>
8086
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreatePageToLoad2"/>
8187

8288
<!--Create bundle product 2-->

‎app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductDetailsTest.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,10 @@
3737
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3838
</after>
3939
<!-- go to bundle product creation page-->
40-
<actionGroup ref="AdminOpenCreateBundleProductPageActionGroup" stepKey="goToBundleProductCreationPage"/>
40+
<actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToBundleProductCreationPage">
41+
<argument name="attributeSetId" value="{{BundleProduct.set}}"/>
42+
<argument name="productType" value="{{BundleProduct.type}}"/>
43+
</actionGroup>
4144
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreatePageToLoad"/>
4245

4346
<!--Add description-->

‎app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductShownInCategoryListAndGridTest.xml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,12 @@
4242
</actionGroup>
4343

4444
<!--Go to bundle product creation page-->
45-
<actionGroup ref="AdminOpenCreateBundleProductPageActionGroup" stepKey="goToBundleProductCreationPage"/>
45+
<actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToBundleProductCreationPage">
46+
<argument name="attributeSetId" value="{{BundleProduct.set}}"/>
47+
<argument name="productType" value="{{BundleProduct.type}}"/>
48+
</actionGroup>
4649
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreatePageToLoad"/>
47-
50+
4851
<!--Categories-->
4952
<click selector="{{AdminProductFormBundleSection.categoriesDropDown}}" stepKey="dropDownCategories"/>
5053
<fillField selector="{{AdminProductFormBundleSection.searchForCategory}}" userInput="{{SimpleSubCategory.name}}" stepKey="searchForCategory"/>
@@ -67,7 +70,7 @@
6770
</actionGroup>
6871
<actionGroup ref="AdminCheckFirstCheckboxInAddProductsToOptionPanelGridActionGroup" stepKey="selectFirstGridRow2"/>
6972
<click selector="{{AdminAddProductsToOptionPanel.addSelectedProducts}}" stepKey="clickAddSelectedBundleProducts"/>
70-
73+
7174
<actionGroup ref="AdminFillBundleItemQtyActionGroup" stepKey="fillProductDefaultQty1">
7275
<argument name="optionIndex" value="0"/>
7376
<argument name="productIndex" value="0"/>
@@ -79,7 +82,7 @@
7982
<argument name="productIndex" value="1"/>
8083
<argument name="qty" value="{{BundleProduct.defaultQuantity}}"/>
8184
</actionGroup>
82-
85+
8386
<actionGroup ref="AncillaryPrepBundleProductActionGroup" stepKey="createBundledProductForTwoSimpleProducts"/>
8487

8588
<!--Save the product-->

‎app/code/Magento/Bundle/Test/Mftf/Test/StorefrontGoToDetailsPageWhenAddingToCartTest.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@
3636
<actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
3737
</after>
3838
<!--Go to bundle product creation page-->
39-
<actionGroup ref="AdminOpenCreateBundleProductPageActionGroup" stepKey="goToBundleProductCreationPage"/>
39+
<actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToBundleProductCreationPage">
40+
<argument name="attributeSetId" value="{{BundleProduct.set}}"/>
41+
<argument name="productType" value="{{BundleProduct.type}}"/>
42+
</actionGroup>
4043
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreatePageToLoad"/>
4144

4245
<!--Categories-->

‎app/code/Magento/Catalog/Model/Product/Type/AbstractType.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,10 @@ protected function _prepareOptions(\Magento\Framework\DataObject $buyRequest, $p
591591

592592
if ($product->getSkipCheckRequiredOption() !== true) {
593593
$group->validateUserValue($optionsFromRequest);
594-
} elseif ($optionsFromRequest !== null && isset($optionsFromRequest[$option->getId()])) {
594+
} elseif ($optionsFromRequest !== null
595+
&& isset($optionsFromRequest[$option->getId()])
596+
&& $optionsFromRequest[$option->getId()] !== ''
597+
) {
595598
if (is_array($optionsFromRequest[$option->getId()])) {
596599
$group->validateUserValue($optionsFromRequest);
597600
} else {

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminCreateAttributeTextSwatchNthValueActionGroup" >
12+
<annotations>
13+
<description>Fills in the Text swatch Field.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="row" type="string"/>
17+
<argument name="swatchNameStore" type="string"/>
18+
<argument name="storeName" type="string"/>
19+
<argument name="swatchNameAdmin" type="string"/>
20+
<argument name="adminName" type="string"/>
21+
</arguments>
22+
23+
<scrollTo selector="{{AdminCreateNewProductAttributeSection.addValue}}" stepKey="scrollToOption"/>
24+
<click selector="{{AdminCreateNewProductAttributeSection.addValue}}" stepKey="clickOnAddSwatch"/>
25+
<waitForPageLoad stepKey="waitForNewTextSwatch"/>
26+
<fillField selector="{{AdminCreateNewProductAttributeSection.adminOptionTextSwatch(row)}}" userInput="{{swatchNameAdmin}}" stepKey="fillAdminSwatchField"/>
27+
<fillField selector="{{AdminCreateNewProductAttributeSection.adminOptionTextOption(row)}}" userInput="{{adminName}}" stepKey="fillAdminOptionField"/>
28+
<fillField selector="{{AdminCreateNewProductAttributeSection.defaultStoreViewTextSwatch(row)}}" userInput="{{swatchNameStore}}" stepKey="fillDefaultStoreViewSwatchField"/>
29+
<fillField selector="{{AdminCreateNewProductAttributeSection.defaultStoreViewTextOption(row)}}" userInput="{{storeName}}" stepKey="fillDefaultStoreViewOptionField"/>
30+
</actionGroup>
31+
</actionGroups>
32+
33+

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminCreateAttributeVisualSwatchNthValueActionGroup" >
12+
<annotations>
13+
<description>Fills in the visual swatch Field.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="row" type="string"/>
17+
<argument name="adminName" type="string"/>
18+
<argument name="storeName" type="string"/>
19+
</arguments>
20+
21+
<scrollTo selector="{{AdminCreateNewProductAttributeSection.addValue}}" stepKey="scrollToOption"/>
22+
<click selector="{{AdminCreateNewProductAttributeSection.addValue}}" stepKey="clickOnAddSwatch"/>
23+
<waitForPageLoad stepKey="waitForNewTextSwatch"/>
24+
<waitForPageLoad stepKey="waitForNewVisualSwatch"/>
25+
<fillField selector="{{AdminCreateNewProductAttributeSection.visualSwatchAdmin(row)}}" userInput="{{adminName}}" stepKey="fillSwatchForAdmin"/>
26+
<fillField selector="{{AdminCreateNewProductAttributeSection.visualSwatchStore(row)}}" userInput="{{storeName}}" stepKey="fillSwatchForStore"/>
27+
</actionGroup>
28+
</actionGroups>
29+
30+

‎app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,22 @@
321321
<data key="option3_admin" unique="suffix">opt3Admin</data>
322322
<data key="option3_frontend" unique="suffix">opt3Front</data>
323323
</entity>
324+
<entity name="visualSwatchProductAttribute" extends="newProductAttribute" type="ProductAttribute">
325+
<data key="frontend_input">swatch_visual</data>
326+
<data key="frontend_input_admin">Visual Swatch</data>
327+
<data key="is_required_admin">No</data>
328+
<data key="option1_admin" unique="suffix">opt1Admin</data>
329+
<data key="option1_store" unique="suffix">opt1Front</data>
330+
</entity>
331+
<entity name="textSwatchProductAttribute" extends="newProductAttribute" type="ProductAttribute">
332+
<data key="frontend_input">text_visual</data>
333+
<data key="frontend_input_admin">Text Swatch</data>
334+
<data key="is_required_admin">No</data>
335+
<data key="swatchStore" unique="suffix">opt1swatch</data>
336+
<data key="store" unique="suffix">opt1store</data>
337+
<data key="SwatchAdmin" unique="suffix">opt1SwatchAdmin</data>
338+
<data key="admin" unique="suffix">opt1Admin</data>
339+
</entity>
324340
<entity name="dropdownProductAttributeWithQuote" extends="productAttributeWysiwyg" type="ProductAttribute">
325341
<data key="frontend_input">select</data>
326342
<data key="frontend_input_admin">Dropdown</data>

‎app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateNewProductAttributeSection.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,11 @@
3030
<element name="allowHtmlTags" type="checkbox" selector="//input[contains(@name, 'is_html_allowed_on_front')]/..//label"/>
3131
<element name="visibleOnStorefront" type="checkbox" selector="//input[contains(@name, 'is_visible_on_front')]/..//label"/>
3232
<element name="sortProductListing" type="checkbox" selector="//input[contains(@name, 'is_visible_on_front')]/..//label"/>
33+
<element name="visualSwatchAdmin" type="input" selector="input[name='optionvisual[value][option_{{var}}][1]']" parameterized="true"/>
34+
<element name="visualSwatchStore" type="input" selector="input[name='optionvisual[value][option_{{var}}][0]']" parameterized="true"/>
35+
<element name="adminOptionTextOption" type="input" selector="input[name='swatchtext[value][option_{{var}}][0]']" parameterized="true"/>
36+
<element name="adminOptionTextSwatch" type="input" selector="input[name='optiontext[value][option_{{var}}][0]']" parameterized="true"/>
37+
<element name="defaultStoreViewTextSwatch" type="input" selector="input[name='swatchtext[value][option_{{var}}][1]']" parameterized="true"/>
38+
<element name="defaultStoreViewTextOption" type="input" selector="input[name='optiontext[value][option_{{var}}][1]']" parameterized="true"/>
3339
</section>
3440
</sections>

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,10 @@
5252
<!-- Save attribute set -->
5353
<actionGroup ref="SaveAttributeSetActionGroup" stepKey="SaveAttributeSet"/>
5454
<!-- Go to create new product page -->
55-
<amOnPage url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, 'simple')}}" stepKey="navigateToNewProduct"/>
56-
<waitForPageLoad stepKey="waitForPageLoad"/>
55+
<actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="navigateToNewProduct">
56+
<argument name="attributeSetId" value="{{AddToDefaultSet.attributeSetId}}"/>
57+
</actionGroup>
58+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageLoad"/>
5759
<!-- Assert attribute can be used in product creation -->
5860
<seeElement selector="{{AdminProductFormSection.attributeLabelByText($$attribute.attribute[frontend_labels][0][label]$$)}}" stepKey="seeLabel"/>
5961
</test>

0 commit comments

Comments
 (0)