Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MFTF] Add new AdminClickAddProductToggleAndSelectProductTypeActionGroup #30525

Merged
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,10 @@
<!-- Create a product to appear in the widget, fill in basic info first -->

<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductList"/>
<click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
<click selector="{{AdminProductGridActionSection.addBundleProduct}}" stepKey="clickAddBundleProduct"/>
<comment userInput="StepKey Backward Compatibility" stepKey="clickAddProductToggle"/>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That will do the trick. However, it might not be obvious for me as a developer why we add this comment according to the current description. I would recommend putting some meaningful description like

userInput="Adding the comment to replace clickAddProductToggle action for preserving Backward Compatibility"

It applies to all other comments in all your PRs.

Thanks

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @rogyar
I have applied your recommendations
Thanks :)

<actionGroup ref="AdminClickAddProductToggleAndSelectProductTypeActionGroup" stepKey="clickAddBundleProduct">
<argument name="productType" value="bundle"/>
</actionGroup>
<fillField selector="{{AdminProductFormSection.productName}}" userInput="{{_defaultProduct.name}}" stepKey="fillProductName"/>
<fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{_defaultProduct.sku}}" stepKey="fillProductSku"/>
<fillField selector="{{AdminProductFormSection.setProductAsNewFrom}}" userInput="01/1/2000" stepKey="fillProductNewFrom"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="AdminClickAddProductToggleAndSelectProductTypeActionGroup">
<annotations>
<description>Click Add Product Toggle and select product type.</description>
</annotations>
<arguments>
<argument name="productType" type="string"/>
</arguments>

<click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductDropdown"/>
<click selector="{{AdminProductGridActionSection.addTypeProduct(productType)}}" stepKey="clickAddProduct"/>
<waitForPageLoad stepKey="waitForFormToLoad"/>
</actionGroup>
</actionGroups>
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,10 @@

<!-- Assert attribute can be used in product creation -->
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToCatalogProductGrid"/>
<click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductDropdown"/>
<click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickAddSimpleProduct"/>
<comment userInput="StepKey Backward Compatibility" stepKey="clickAddProductDropdown"/>
<actionGroup ref="AdminClickAddProductToggleAndSelectProductTypeActionGroup" stepKey="clickAddSimpleProduct">
<argument name="productType" value="simple"/>
</actionGroup>

<!-- Switch from default attribute set to new attribute set -->
<click selector="{{AdminProductFormSection.attributeSet}}" stepKey="startEditAttrSet"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,10 @@

<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
<click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductDropdown"/>
<click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickAddSimpleProduct"/>
<comment userInput="StepKey Backward Compatibility" stepKey="clickAddProductDropdown"/>
<actionGroup ref="AdminClickAddProductToggleAndSelectProductTypeActionGroup" stepKey="clickAddSimpleProduct">
<argument name="productType" value="simple"/>
</actionGroup>
<fillField userInput="$$simpleProduct.name$$new" selector="{{AdminProductFormSection.productName}}" stepKey="fillName"/>
<fillField userInput="$$simpleProduct.sku$$new" selector="{{AdminProductFormSection.productSku}}" stepKey="fillSKU"/>
<fillField userInput="$$simpleProduct.price$$" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillPrice"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,11 @@
</after>

<actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage"/>
<click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
<waitForPageLoad stepKey="waitForProductToggleToSelectSimpleProduct"/>
<click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickSimpleProductFromDropDownList"/>
<comment userInput="StepKey Backward Compatibility" stepKey="clickAddProductToggle"/>
<comment userInput="StepKey Backward Compatibility" stepKey="waitForProductToggleToSelectSimpleProduct"/>
<actionGroup ref="AdminClickAddProductToggleAndSelectProductTypeActionGroup" stepKey="clickSimpleProductFromDropDownList">
<argument name="productType" value="simple"/>
</actionGroup>

<!-- Create simple product with country of manufacture attribute -->
<fillField selector="{{AdminProductFormSection.productName}}" userInput="{{nameAndAttributeSkuMaskSimpleProduct.name}}" stepKey="fillSimpleProductName"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,11 @@
</after>

<actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage"/>
<click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
<waitForPageLoad stepKey="waitForProductToggleToSelectProduct"/>
<click selector="{{AdminProductGridActionSection.addVirtualProduct}}" stepKey="clickVirtualProduct"/>
<comment userInput="StepKey Backward Compatibility" stepKey="clickAddProductToggle"/>
<comment userInput="StepKey Backward Compatibility" stepKey="waitForProductToggleToSelectProduct"/>
<actionGroup ref="AdminClickAddProductToggleAndSelectProductTypeActionGroup" stepKey="clickVirtualProduct">
<argument name="productType" value="virtual"/>
</actionGroup>

<!-- Create virtual product with required fields only -->
<fillField selector="{{AdminProductFormSection.productName}}" userInput="{{virtualProductWithRequiredFields.name}}" stepKey="fillProductName"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,11 @@
</after>

<actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage"/>
<click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
<waitForPageLoad stepKey="waitForProductToggleToSelectProduct"/>
<click selector="{{AdminProductGridActionSection.addVirtualProduct}}" stepKey="clickVirtualProduct"/>
<comment userInput="StepKey Backward Compatibility" stepKey="clickAddProductToggle"/>
<comment userInput="StepKey Backward Compatibility" stepKey="waitForProductToggleToSelectProduct"/>
<actionGroup ref="AdminClickAddProductToggleAndSelectProductTypeActionGroup" stepKey="clickVirtualProduct">
<argument name="productType" value="virtual"/>
</actionGroup>

<!-- Create virtual product out of stock with tier price -->
<fillField selector="{{AdminProductFormSection.productName}}" userInput="{{virtualProductOutOfStock.name}}" stepKey="fillProductName"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,11 @@
</after>

<actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage"/>
<click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
<waitForPageLoad stepKey="waitForProductToggleToSelectProduct"/>
<click selector="{{AdminProductGridActionSection.addVirtualProduct}}" stepKey="clickVirtualProduct"/>
<comment userInput="StepKey Backward Compatibility" stepKey="clickAddProductToggle"/>
<comment userInput="StepKey Backward Compatibility" stepKey="waitForProductToggleToSelectProduct"/>
<actionGroup ref="AdminClickAddProductToggleAndSelectProductTypeActionGroup" stepKey="clickVirtualProduct">
<argument name="productType" value="virtual"/>
</actionGroup>

<!-- Create virtual product with custom options suite and import options -->
<fillField selector="{{AdminProductFormSection.productName}}" userInput="{{virtualProductCustomImportOptions.name}}" stepKey="fillProductName"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,11 @@
</after>

<actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage"/>
<click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
<waitForPageLoad stepKey="waitForProductToggleToSelectProduct"/>
<click selector="{{AdminProductGridActionSection.addVirtualProduct}}" stepKey="clickVirtualProduct"/>
<comment userInput="StepKey Backward Compatibility" stepKey="clickAddProductToggle"/>
<comment userInput="StepKey Backward Compatibility" stepKey="waitForProductToggleToSelectProduct"/>
<actionGroup ref="AdminClickAddProductToggleAndSelectProductTypeActionGroup" stepKey="clickVirtualProduct">
<argument name="productType" value="virtual"/>
</actionGroup>

<!-- Create virtual product with tier price -->
<fillField selector="{{AdminProductFormSection.productName}}" userInput="{{virtualProductBigQty.name}}" stepKey="fillProductName"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,11 @@
</after>

<actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage"/>
<click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
<waitForPageLoad stepKey="waitForProductToggleToSelectProduct"/>
<click selector="{{AdminProductGridActionSection.addVirtualProduct}}" stepKey="clickVirtualProduct"/>
<comment userInput="StepKey Backward Compatibility" stepKey="clickAddProductToggle"/>
<comment userInput="StepKey Backward Compatibility" stepKey="waitForProductToggleToSelectProduct"/>
<actionGroup ref="AdminClickAddProductToggleAndSelectProductTypeActionGroup" stepKey="clickVirtualProduct">
<argument name="productType" value="virtual"/>
</actionGroup>

<!-- Create virtual product without manage stock -->
<fillField selector="{{AdminProductFormSection.productName}}" userInput="{{virtualProductWithoutManageStock.name}}" stepKey="fillProductName"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,11 @@
<see selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records." stepKey="assertDataGridEmptyMessage2"/>
<!--Go to the Catalog > Products page and create Simple Product -->
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductList"/>
<click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="toggleAddProductBtn"/>
<click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="chooseAddSimpleProduct"/>
<waitForPageLoad stepKey="waitForProductAdded"/>
<comment userInput="StepKey Backward Compatibility" stepKey="toggleAddProductBtn"/>
<actionGroup ref="AdminClickAddProductToggleAndSelectProductTypeActionGroup" stepKey="chooseAddSimpleProduct">
<argument name="productType" value="simple"/>
</actionGroup>
<comment userInput="StepKey Backward Compatibility" stepKey="waitForProductAdded"/>
<!-- Press Add Attribute button -->
<click selector="{{AdminProductFormSection.addAttributeBtn}}" stepKey="clickAddAttributeBtn"/>
<waitForPageLoad stepKey="waitForAttributeAdded"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,10 @@

<!--Create a Simple Product -->
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToCatalogProductGrid"/>
<click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductDropdown"/>
<click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickAddSimpleProduct"/>
<comment userInput="StepKey Backward Compatibility" stepKey="clickAddProductDropdown"/>
<actionGroup ref="AdminClickAddProductToggleAndSelectProductTypeActionGroup" stepKey="clickAddSimpleProduct">
<argument name="productType" value="simple"/>
</actionGroup>
<fillField userInput="{{_defaultProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillProductName"/>
<fillField userInput="{{_defaultProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="fillProductSKU"/>
<fillField userInput="{{_defaultProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillProductPrice"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,11 @@
<waitForPageLoad stepKey="waitForAttributeToSave"/>
<actionGroup ref="ClearCacheActionGroup" stepKey="clearCache"/>
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
<click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickOnAddProductDropdown"/>
<click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickOnAddSimpleProduct"/>
<waitForPageLoad stepKey="waitForProductEditToLoad"/>
<comment userInput="StepKey Backward Compatibility" stepKey="clickOnAddProductDropdown"/>
<actionGroup ref="AdminClickAddProductToggleAndSelectProductTypeActionGroup" stepKey="clickOnAddSimpleProduct">
<argument name="productType" value="simple"/>
</actionGroup>
<comment userInput="StepKey Backward Compatibility" stepKey="waitForProductEditToLoad"/>
<dontSeeCheckboxIsChecked selector="{{AdminProductFormSection.productStatus}}" stepKey="dontSeeCheckboxEnableProductIsChecked"/>

</test>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,10 @@
</assertEquals>

<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndexPage"/>
<click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="addProductDropdown"/>
<click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="addSimpleProduct"/>
<comment userInput="StepKey Backward Compatibility" stepKey="addProductDropdown"/>
<actionGroup ref="AdminClickAddProductToggleAndSelectProductTypeActionGroup" stepKey="addSimpleProduct">
<argument name="productType" value="simple"/>
</actionGroup>

<!-- Verify that the Product Name and Sku fields have the required field name indicator -->
<executeJS function="{{AdminProductFormSection.RequiredNameIndicator}}" stepKey="productNameRequiredFieldIndicator"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@
<!-- Create a Virtual Product to appear in the widget -->

<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductList"/>
<click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="toggleAddProductButton"/>
<click selector="{{AdminProductGridActionSection.addVirtualProduct}}" stepKey="clickAddVirtualProduct"/>
<comment userInput="StepKey Backward Compatibility" stepKey="toggleAddProductButton"/>
<actionGroup ref="AdminClickAddProductToggleAndSelectProductTypeActionGroup" stepKey="clickAddVirtualProduct">
<argument name="productType" value="virtual"/>
</actionGroup>
<fillField selector="{{AdminProductFormSection.productName}}" userInput="{{_defaultProduct.name}}" stepKey="fillProductName"/>
<fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{_defaultProduct.sku}}" stepKey="fillProductSku"/>
<fillField selector="{{AdminProductFormSection.productPrice}}" userInput="123.45" stepKey="fillProductPrice"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,10 @@

<!--Create a Simple Product with Custom Options -->
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToCatalogProductGrid"/>
<click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductDropdown"/>
<click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickAddSimpleProduct"/>
<comment userInput="StepKey Backward Compatibility" stepKey="clickAddProductDropdown"/>
<actionGroup ref="AdminClickAddProductToggleAndSelectProductTypeActionGroup" stepKey="clickAddSimpleProduct">
<argument name="productType" value="simple"/>
</actionGroup>
<fillField userInput="{{_defaultProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillName"/>
<fillField userInput="{{_defaultProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="fillSKU"/>
<fillField userInput="{{_defaultProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillPrice"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,10 @@
<!-- Create a Downloadable product to appear in the widget -->

<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductList"/>
<click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProduct"/>
<click selector="{{AdminProductGridActionSection.addDownloadableProduct}}" stepKey="clickAddDownloadableProduct"/>
<comment userInput="StepKey Backward Compatibility" stepKey="clickAddProduct"/>
<actionGroup ref="AdminClickAddProductToggleAndSelectProductTypeActionGroup" stepKey="clickAddDownloadableProduct">
<argument name="productType" value="downloadable"/>
</actionGroup>
<fillField selector="{{AdminProductFormSection.productName}}" userInput="{{_defaultProduct.name}}" stepKey="fillProductName"/>
<fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{_defaultProduct.sku}}" stepKey="fillProductSku"/>
<fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{_defaultProduct.price}}" stepKey="fillProductPrice"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,10 @@
<!-- Create a grouped product to appear in the widget -->

<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductList"/>
<click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="toggleAddProductButton"/>
<click selector="{{AdminProductGridActionSection.addGroupedProduct}}" stepKey="clickAddGroupedProduct"/>
<comment userInput="StepKey Backward Compatibility" stepKey="toggleAddProductButton"/>
<actionGroup ref="AdminClickAddProductToggleAndSelectProductTypeActionGroup" stepKey="clickAddGroupedProduct">
<argument name="productType" value="grouped"/>
</actionGroup>
<fillField selector="{{AdminProductFormSection.productName}}" userInput="{{_defaultProduct.name}}" stepKey="fillProductName"/>
<fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{_defaultProduct.sku}}" stepKey="fillProductSku"/>
<fillField selector="{{AdminProductFormSection.setProductAsNewFrom}}" userInput="01/1/2000" stepKey="fillProductNewFrom"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,10 @@

<!-- Create a configurable product to verify the storefront with -->
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductGridPage"/>
<click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickOnAddProductToggle"/>
<click selector="{{AdminProductGridActionSection.addConfigurableProduct}}" stepKey="clickOnAddConfigurableProduct"/>
<comment userInput="StepKey Backward Compatibility" stepKey="clickOnAddProductToggle"/>
<actionGroup ref="AdminClickAddProductToggleAndSelectProductTypeActionGroup" stepKey="clickOnAddConfigurableProduct">
<argument name="productType" value="configurable"/>
</actionGroup>
<fillField userInput="{{_defaultProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillName"/>
<fillField userInput="{{_defaultProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="fillSKU"/>
<fillField userInput="{{_defaultProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillPrice"/>
Expand Down
Loading