Skip to content

Commit d0edca3

Browse files
magento-engcom-teammagento-engcom-team
committed
ENGCOM-9269: [MTTF] Excessive customer grid filtering actions removing #34149
- Merge Pull Request #34149 from AnnaAPak/magento2:optimize-customer-filtering - Merged commits: 1. e30b64d 2. 4da6dfd
2 parents ac88ad9 + 4da6dfd commit d0edca3

9 files changed

+43
-33
lines changed

‎app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCountryPolandTest.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,11 @@
2828
</after>
2929

3030
<!--Filter the created customer From grid-->
31-
<actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterTheCustomerByEmail">
32-
<argument name="email" value="$$createCustomer.email$$"/>
31+
<actionGroup ref="AdminOpenCustomerEditPageActionGroup" stepKey="openCustomerEditPage">
32+
<argument name="customerId" value="$createCustomer.id$"/>
3333
</actionGroup>
34-
<actionGroup ref="AdminClickFirstRowEditLinkOnCustomerGridActionGroup" stepKey="clickOnEditButton"/>
34+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="filterTheCustomerByEmail"/>
35+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clickOnEditButton"/>
3536

3637
<!-- Add the Address -->
3738
<click selector="{{AdminEditCustomerAddressesSection.addresses}}" stepKey="selectAddress"/>

‎app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCountryUSATest.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,11 @@
2828
</after>
2929

3030
<!--Filter the customer From grid-->
31-
<actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterTheCustomerByEmail">
32-
<argument name="email" value="$$createCustomer.email$$"/>
31+
<actionGroup ref="AdminOpenCustomerEditPageActionGroup" stepKey="openCustomerEditPage">
32+
<argument name="customerId" value="$createCustomer.id$"/>
3333
</actionGroup>
34-
<actionGroup ref="AdminClickFirstRowEditLinkOnCustomerGridActionGroup" stepKey="clickOnEditButton"/>
34+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="filterTheCustomerByEmail"/>
35+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clickOnEditButton"/>
3536

3637
<!-- Add the Address -->
3738
<click selector="{{AdminEditCustomerAddressesSection.addresses}}" stepKey="selectAddress"/>

‎app/code/Magento/Sales/Test/Mftf/Test/AddConfigurableProductToOrderFromShoppingCartTest.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,11 @@
9494
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
9595

9696
<!-- Search and open customer -->
97-
<actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterCreatedCustomer">
98-
<argument name="email" value="$$createCustomer.email$$"/>
97+
<actionGroup ref="AdminOpenCustomerEditPageActionGroup" stepKey="openCustomerEditPage">
98+
<argument name="customerId" value="$createCustomer.id$"/>
9999
</actionGroup>
100-
<actionGroup ref="AdminClickFirstRowEditLinkOnCustomerGridActionGroup" stepKey="clickEditButton"/>
100+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="filterCreatedCustomer"/>
101+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clickEditButton"/>
101102

102103
<!-- Click create order -->
103104
<click selector="{{AdminCustomerMainActionsSection.createOrderBtn}}" stepKey="clickCreateOrder"/>

‎app/code/Magento/Sales/Test/Mftf/Test/AddSimpleProductToOrderFromShoppingCartTest.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,11 @@
5454
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
5555

5656
<!-- Search and open customer -->
57-
<actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterCreatedCustomer">
58-
<argument name="email" value="$$createCustomer.email$$"/>
57+
<actionGroup ref="AdminOpenCustomerEditPageActionGroup" stepKey="openCustomerEditPage">
58+
<argument name="customerId" value="$createCustomer.id$"/>
5959
</actionGroup>
60-
<actionGroup ref="AdminClickFirstRowEditLinkOnCustomerGridActionGroup" stepKey="clickEditButton"/>
60+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="filterCreatedCustomer"/>
61+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clickEditButton"/>
6162

6263
<!-- Click create order -->
6364
<click selector="{{AdminCustomerMainActionsSection.createOrderBtn}}" stepKey="clickCreateOrder"/>

‎app/code/Magento/Sales/Test/Mftf/Test/CreateOrderFromEditCustomerPageTest.xml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,12 @@
9595
<magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
9696
</after>
9797

98-
<!--Filter and Open the customer edit page -->
99-
<actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterTheCustomer">
100-
<argument name="email" value="$$simpleCustomer.email$$"/>
98+
<actionGroup ref="AdminOpenCustomerEditPageActionGroup" stepKey="openCustomerEditPage">
99+
<argument name="customerId" value="$$simpleCustomer.id$$"/>
101100
</actionGroup>
102-
<click selector="{{AdminCustomerGridSection.customerEditLinkByEmail($$simpleCustomer.email$$)}}" stepKey="clickOnEditButton"/>
103-
<waitForPageLoad stepKey="waitForCustomerEditPageToLoad"/>
101+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="filterTheCustomer"/>
102+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clickOnEditButton"/>
103+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForCustomerEditPageToLoad"/>
104104
<click selector="{{AdminCustomerMainActionsSection.createOrderBtn}}" stepKey="clickOnCreateOrderButton"/>
105105
<waitForPageLoad stepKey="waitForOrderPageToLoad"/>
106106
<conditionalClick selector="{{AdminOrderStoreScopeTreeSection.storeOption(_defaultStore.name)}}" dependentSelector="{{AdminOrderStoreScopeTreeSection.storeOption(_defaultStore.name)}}" visible="true" stepKey="selectStoreViewIfAppears"/>
@@ -190,11 +190,13 @@
190190
<grabTextFrom selector="|Order # (\d+)|" stepKey="orderId"/>
191191

192192
<!-- Filter and Open the customer edit page -->
193-
<actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterTheCustomer1">
194-
<argument name="email" value="$$simpleCustomer.email$$"/>
193+
<actionGroup ref="AdminOpenCustomerEditPageActionGroup" stepKey="openCustomerEditPage1">
194+
<argument name="customerId" value="$$simpleCustomer.id$$"/>
195195
</actionGroup>
196-
<click selector="{{AdminCustomerGridSection.customerEditLinkByEmail($$simpleCustomer.email$$)}}" stepKey="clickOnEditButton1"/>
197-
<waitForPageLoad stepKey="waitForCustomerEditPageToLoad1"/>
196+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="filterTheCustomer1"/>
197+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clickOnEditButton1"/>
198+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForCustomerEditPageToLoad1"/>
199+
198200
<click selector="{{AdminEditCustomerInformationSection.orders}}" stepKey="clickOnOrdersButton"/>
199201
<waitForPageLoad stepKey="waitForOrderPageToOpen"/>
200202
<click selector="{{AdminEditCustomerOrdersSection.orderIdInGrid('$orderId')}}" stepKey="selectOnOrderID"/>

‎app/code/Magento/Sales/Test/Mftf/Test/MoveLastOrderedConfigurableProductOnOrderPageTest.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,11 @@
9393
<actionGroup ref="AdminSubmitOrderActionGroup" stepKey="submitOrder"/>
9494

9595
<!-- Search and open customer -->
96-
<actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterCreatedCustomer">
97-
<argument name="email" value="$$createCustomer.email$$"/>
96+
<actionGroup ref="AdminOpenCustomerEditPageActionGroup" stepKey="openCustomerEditPage">
97+
<argument name="customerId" value="$createCustomer.id$"/>
9898
</actionGroup>
99-
<actionGroup ref="AdminClickFirstRowEditLinkOnCustomerGridActionGroup" stepKey="clickEditButton"/>
99+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="filterCreatedCustomer"/>
100+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clickEditButton"/>
100101

101102
<!-- Click create order -->
102103
<click selector="{{AdminCustomerMainActionsSection.createOrderBtn}}" stepKey="clickCreateOrder"/>

‎app/code/Magento/Sales/Test/Mftf/Test/MoveLastOrderedSimpleProductOnOrderPageTest.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,11 @@
4343
</actionGroup>
4444

4545
<!-- Search and open customer -->
46-
<actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterCreatedCustomer">
47-
<argument name="email" value="$$createCustomer.email$$"/>
46+
<actionGroup ref="AdminOpenCustomerEditPageActionGroup" stepKey="openCustomerEditPage">
47+
<argument name="customerId" value="$createCustomer.id$"/>
4848
</actionGroup>
49-
<actionGroup ref="AdminClickFirstRowEditLinkOnCustomerGridActionGroup" stepKey="clickEditButton"/>
49+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="filterCreatedCustomer"/>
50+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clickEditButton"/>
5051

5152
<!-- Click create order -->
5253
<click selector="{{AdminCustomerMainActionsSection.createOrderBtn}}" stepKey="clickCreateOrder"/>

‎app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedBundleFixedProductOnOrderPageTest.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,11 @@
9191
<waitForPageLoad stepKey="waitForProductPageLoad"/>
9292

9393
<!-- Search and open customer -->
94-
<actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterCreatedCustomer">
95-
<argument name="email" value="$$createCustomer.email$$"/>
94+
<actionGroup ref="AdminOpenCustomerEditPageActionGroup" stepKey="openCustomerEditPage">
95+
<argument name="customerId" value="$createCustomer.id$"/>
9696
</actionGroup>
97-
<actionGroup ref="AdminClickFirstRowEditLinkOnCustomerGridActionGroup" stepKey="clickEditButton"/>
97+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="filterCreatedCustomer"/>
98+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clickEditButton"/>
9899

99100
<!-- Click create order -->
100101
<click selector="{{AdminCustomerMainActionsSection.createOrderBtn}}" stepKey="clickCreateOrder"/>

‎app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedConfigurableProductOnOrderPageTest.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,11 @@
9696
<selectOption selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" userInput="$$getConfigAttributeOption.value$$" stepKey="selectOption"/>
9797

9898
<!-- Search and open customer -->
99-
<actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterCreatedCustomer">
100-
<argument name="email" value="$$createCustomer.email$$"/>
99+
<actionGroup ref="AdminOpenCustomerEditPageActionGroup" stepKey="openCustomerEditPage">
100+
<argument name="customerId" value="$createCustomer.id$"/>
101101
</actionGroup>
102-
<actionGroup ref="AdminClickFirstRowEditLinkOnCustomerGridActionGroup" stepKey="clickEditButton"/>
102+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="filterCreatedCustomer"/>
103+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clickEditButton"/>
103104

104105
<!-- Click create order -->
105106
<click selector="{{AdminCustomerMainActionsSection.createOrderBtn}}" stepKey="clickCreateOrder"/>

0 commit comments

Comments
 (0)