Skip to content

Commit 8ad0972

Browse files
author
Anna Bukatar
committed
ACP2E-980: Customizable options Drag and drop issue
1 parent bb3329c commit 8ad0972

File tree

5 files changed

+20
-19
lines changed

5 files changed

+20
-19
lines changed

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenAndApplyCustomOptionValuesPerPageActionGroup.xml renamed to ‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenAndApplyCustomOptionRecordsPerPageActionGroup.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11-
<actionGroup name="AdminOpenAndApplyCustomOptionValuesPerPageActionGroup">
11+
<actionGroup name="AdminOpenAndApplyCustomOptionRecordsPerPageActionGroup">
1212
<annotations>
1313
<description>Open the custom option drop down section and assign the user defined custom value</description>
1414
</annotations>
1515
<arguments>
1616
<argument name="perPageInputValue" type="string" defaultValue="1"/>
1717
</arguments>
1818

19-
<click selector="{{AdminProductGridPaginationSection.perPageDropdown}}" stepKey="clickProductPerPageDropdown"/>
20-
<click selector="{{AdminProductGridPaginationSection.perPageOption('Custom')}}" stepKey="selectCustomPerPage"/>
21-
<fillField selector="{{AdminProductGridPaginationSection.perPageInput}}" userInput="{{perPageInputValue}}" stepKey="fillCustomPerPage"/>
22-
<click selector="{{AdminProductGridPaginationSection.perPageApplyInput}}" stepKey="applyCustomPerPage"/>
19+
<click selector="{{AdminProductCustomOptionsPaginationSection.perPageDropdown}}" stepKey="clickProductPerPageDropdown"/>
20+
<click selector="{{AdminProductCustomOptionsPaginationSection.perPageOption('Custom')}}" stepKey="selectCustomPerPage"/>
21+
<fillField selector="{{AdminProductCustomOptionsPaginationSection.perPageInput}}" userInput="{{perPageInputValue}}" stepKey="fillCustomPerPage"/>
22+
<click selector="{{AdminProductCustomOptionsPaginationSection.perPageApplyInput}}" stepKey="applyCustomPerPage"/>
2323
<waitForPageLoad stepKey="waitForPageRefreshCustomPerPage"/>
2424
</actionGroup>
2525
</actionGroups>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
<argument name="perPageInputValue" type="string" defaultValue="1"/>
1717
</arguments>
1818

19-
<click selector="{{AdminProductCustomOptionsPaginationSection.perPageDropdown}}" stepKey="clickCustomOptionsPerPageDropdown"/>
20-
<click selector="{{AdminProductCustomOptionsPaginationSection.perPageOption('Custom')}}" stepKey="selectCustomOptionsPerPage"/>
21-
<fillField selector="{{AdminProductCustomOptionsPaginationSection.perPageInput}}" userInput="{{perPageInputValue}}" stepKey="fillCustomOptionsPerPage"/>
22-
<click selector="{{AdminProductCustomOptionsPaginationSection.perPageApplyInput}}" stepKey="applyCustomOptionsPerPage"/>
23-
<waitForPageLoad stepKey="waitForPageRefreshCustomOptionsPerPage"/>
19+
<click selector="{{AdminProductGridPaginationSection.perPageDropdown}}" stepKey="clickProductPerPageDropdown"/>
20+
<click selector="{{AdminProductGridPaginationSection.perPageOption('Custom')}}" stepKey="selectCustomPerPage"/>
21+
<fillField selector="{{AdminProductGridPaginationSection.perPageInput}}" userInput="{{perPageInputValue}}" stepKey="fillCustomPerPage"/>
22+
<click selector="{{AdminProductGridPaginationSection.perPageApplyInput}}" stepKey="applyCustomPerPage"/>
23+
<waitForPageLoad stepKey="waitForPageRefreshCustomPerPage"/>
2424
</actionGroup>
2525
</actionGroups>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
-->
88

99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="AdminProductCustomOptionsPaginationSection">
12-
<element name="perPageDropdown" type="select" selector=".admin__control-table-pagination .selectmenu-toggle"/>
12+
<element name="perPageDropdown" type="select" selector=".admin__control-table-pagination .selectmenu"/>
1313
<element name="perPageOption" type="button" selector="//div[@class='admin__control-table-pagination']//div[@class='selectmenu-items _active']//li//button[text()='{{label}}']" parameterized="true"/>
1414
<element name="perPageInput" type="input" selector="//div[@class='admin__control-table-pagination']//div[@class='selectmenu-items _active']//li//div[@class='selectmenu-item-edit']//input"/>
1515
<element name="perPageApplyInput" type="button" selector="//div[@class='admin__control-table-pagination']//div[@class='selectmenu-items _active']//li//div[@class='selectmenu-item-edit']//button"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<element name="optionSku" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr//*[@name='product[options][{{index}}][sku]']" parameterized="true"/>
5858
<element name="optionFileExtensions" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr//*[@name='product[options][{{index}}][file_extension]']" parameterized="true"/>
5959
<element name="importOptions" type="button" selector="//button[@data-index='button_import']" timeout="30"/>
60-
<element name="customOptionValuesTableRows" type="button" selector=".admin__dynamic-rows[data-index='values'] tr.data-row" timeout="30"/>
60+
<element name="customOptionTableRows" type="button" selector=".admin__dynamic-rows[data-index='values'] tr.data-row" timeout="30"/>
6161
<element name="customOptionsTableRecords" type="button" selector=".admin__dynamic-rows[data-index='options']>tbody>tr.data-row" timeout="30"/>
6262
</section>
6363
</sections>

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@
5050
<argument name="secondOption" value="ProductOptionValueDropdown2"/>
5151
</actionGroup>
5252

53-
<!-- Validate custom option values dynamic rows per page -->
54-
<actionGroup ref="AdminOpenAndApplyCustomOptionValuesPerPageActionGroup" stepKey="openAndApplyPerPageDropdown">
53+
<!-- Validate custom options dynamic rows per page -->
54+
<actionGroup ref="AdminOpenAndApplyCustomOptionsPerPageActionGroup" stepKey="openAndApplyPerPageDropdown">
5555
<argument name="perPageInputValue" value="1"/>
5656
</actionGroup>
57-
<waitForElementVisible selector="{{AdminProductCustomizableOptionsSection.customOptionValuesTableRows}}" stepKey="waitForRowsToBeVisible"/>
58-
<seeNumberOfElements selector="{{AdminProductCustomizableOptionsSection.customOptionValuesTableRows}}" userInput="1" stepKey="see4RowsOfOptions"/>
57+
<waitForElementVisible selector="{{AdminProductCustomizableOptionsSection.customOptionTableRows}}" stepKey="waitForRowsToBeVisible"/>
58+
<seeNumberOfElements selector="{{AdminProductCustomizableOptionsSection.customOptionTableRows}}" userInput="1" stepKey="see4RowsOfOptions"/>
5959

6060
<!-- Create a second custom option with 2 values -->
6161
<actionGroup ref="AdminCreateCustomDropDownOptionsActionGroup" stepKey="createSecondCustomOption">
@@ -64,8 +64,9 @@
6464
<argument name="secondOption" value="ProductOptionValueDropdown2"/>
6565
</actionGroup>
6666

67-
<!-- Validate custom options per page -->
68-
<actionGroup ref="AdminOpenAndApplyCustomOptionsPerPageActionGroup" stepKey="openAndApplyCustomOptionsPerPageDropdown">
67+
<!-- Validate custom options records per page -->
68+
<scrollToTopOfPage stepKey="scrollToPerPageDropdown"/>
69+
<actionGroup ref="AdminOpenAndApplyCustomOptionRecordsPerPageActionGroup" stepKey="openAndApplyCustomOptionsPerPageDropdown">
6970
<argument name="perPageInputValue" value="1"/>
7071
</actionGroup>
7172
<waitForElementVisible selector="{{AdminProductCustomizableOptionsSection.customOptionsTableRecords}}" stepKey="waitForCustomOptionsToBeVisible"/>

0 commit comments

Comments
 (0)