Skip to content

[MFTF] AdminClickCreateOrderOnEditCustomerPageActionGroup adding #34260

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.

Sign up for GitHub

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

Closed
wants to merge 12 commits into from
Closed

[MFTF] AdminClickCreateOrderOnEditCustomerPageActionGroup adding #34260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
30d6370
added AdminClickCreateOrderOnEditCustomerPageActionGroup
AnnaAPak Oct 6, 2021
5b77071
Merge branch '2.4-develop' into add-AdminClickCreateOrderOnEditCustom…
Oct 14, 2021
bd49efb
Merged 2.4-develop and resolved conflicts
engcom-Charlie Nov 30, 2021
b1fb382
Merge remote-tracking branch 'magento2/2.4-develop' into add-AdminCli…
engcom-Charlie Dec 6, 2021
3dbd7ce
Merge remote-tracking branch 'magento2/2.4-develop' into add-AdminCli…
engcom-Charlie Dec 10, 2021
0f45092
Merge remote-tracking branch 'magento2/2.4-develop' into add-AdminCli…
engcom-Charlie Dec 17, 2021
1ece1ba
Merge remote-tracking branch 'magento2/2.4-develop' into add-AdminCli…
engcom-Charlie Dec 20, 2021
665e1a6
34260-Removing duplicate stepKey from one of the functional test
engcom-Charlie Dec 20, 2021
706b983
34260-Fixing the build failure issues
engcom-Charlie Dec 22, 2021
740670b
Merged 2.4-develop
engcom-Charlie Feb 21, 2022
4118467
Merge remote-tracking branch 'magento2/2.4-develop' into add-AdminCli…
engcom-Charlie Feb 22, 2022
350fd76
Merge remote-tracking branch 'magento2/2.4-develop' into add-AdminCli…
engcom-Charlie Feb 24, 2022
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
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/Test/Mftf/Test/AddConfigurableProductToOrderFromShoppingCartTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clickEditButton"/>

<!-- Click create order -->
<click selector="{{AdminCustomerMainActionsSection.createOrderBtn}}" stepKey="clickCreateOrder"/>
<actionGroup ref="AdminClickCreateOrderOnEditCustomerPageActionGroup" stepKey="clickCreateOrder"/>

<!-- Check product in customer's activities in shopping cart section -->
<see selector="{{AdminCustomerActivitiesShoppingCartSection.productName}}" userInput="$$createConfigProduct.name$$" stepKey="seeProductNameInShoppingCartSection"/>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/Test/Mftf/Test/AddSimpleProductToOrderFromShoppingCartTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clickEditButton"/>

<!-- Click create order -->
<click selector="{{AdminCustomerMainActionsSection.createOrderBtn}}" stepKey="clickCreateOrder"/>
<actionGroup ref="AdminClickCreateOrderOnEditCustomerPageActionGroup" stepKey="clickCreateOrder"/>

<!-- Check product in customer's activities in shopping cart section -->
<see selector="{{AdminCreateOrderShoppingCartSection.shoppingCartBlock}}" userInput="Shopping Cart (2)" stepKey="seeCorrectNumberInCart"/>
Expand Down
9 changes: 4 additions & 5 deletions app/code/Magento/Sales/Test/Mftf/Test/CreateOrderFromEditCustomerPageTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,10 @@
<actionGroup ref="AdminOpenCustomerEditPageActionGroup" stepKey="openCustomerEditPage">
<argument name="customerId" value="$$simpleCustomer.id$$"/>
</actionGroup>
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="filterTheCustomer"/>
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clickOnEditButton"/>
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForCustomerEditPageToLoad"/>
<click selector="{{AdminCustomerMainActionsSection.createOrderBtn}}" stepKey="clickOnCreateOrderButton"/>
<waitForPageLoad stepKey="waitForOrderPageToLoad"/>
<waitForPageLoad stepKey="waitForCustomerEditPageToLoad"/>
<actionGroup ref="AdminClickCreateOrderOnEditCustomerPageActionGroup" stepKey="clickCreateOrder"/>
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForOrderPageToLoad"/>
<conditionalClick selector="{{AdminOrderStoreScopeTreeSection.storeOption(_defaultStore.name)}}" dependentSelector="{{AdminOrderStoreScopeTreeSection.storeOption(_defaultStore.name)}}" visible="true" stepKey="selectStoreViewIfAppears"/>

<!--Add configurable product to order-->
Expand Down Expand Up @@ -197,7 +196,7 @@
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="filterTheCustomer1"/>
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clickOnEditButton1"/>
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForCustomerEditPageToLoad1"/>

<click selector="{{AdminEditCustomerInformationSection.orders}}" stepKey="clickOnOrdersButton"/>
<waitForPageLoad stepKey="waitForOrderPageToOpen"/>
<click selector="{{AdminEditCustomerOrdersSection.orderIdInGrid('$orderNumber')}}" stepKey="selectOnOrderID"/>
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/Sales/Test/Mftf/Test/MoveConfigurableProductsInComparedOnOrderPageTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@
</actionGroup>

<!-- Click 'Create Order' -->
<click selector="{{AdminCustomerMainActionsSection.createOrderBtn}}" stepKey="clickCreateOrder"/>

<actionGroup ref="AdminClickCreateOrderOnEditCustomerPageActionGroup" stepKey="clickCreateOrder"/>
<!-- Add configure to first product -->
<click selector="{{AdminCustomerActivitiesComparisonListSection.addToOrderConfigure($$createFirstConfigProduct.name$$)}}" stepKey="configureFirstProduct"/>
<selectOption selector="{{AdminCustomerActivitiesConfigureSection.addAttribute}}" userInput="$$getFirstConfigAttributeOption.value$$" stepKey="selectOptionForFirstProduct"/>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/Test/Mftf/Test/MoveLastOrderedConfigurableProductOnOrderPageTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clickEditButton"/>

<!-- Click create order -->
<click selector="{{AdminCustomerMainActionsSection.createOrderBtn}}" stepKey="clickCreateOrder"/>
<actionGroup ref="AdminClickCreateOrderOnEditCustomerPageActionGroup" stepKey="clickCreateOrder"/>

<!-- Select product in Last Ordered Items section -->
<click selector="{{AdminCustomerActivitiesLastOrderedSection.addProductToOrder($$createConfigProduct.name$$)}}" stepKey="addProductToOrder"/>
Expand Down
5 changes: 3 additions & 2 deletions app/code/Magento/Sales/Test/Mftf/Test/MoveLastOrderedSimpleProductOnOrderPageTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,9 @@
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="filterCreatedCustomer"/>
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clickEditButton"/>

<actionGroup ref="AdminClickCreateOrderButtonOnEditCustomerPageActionGroup" stepKey="clickCreateOrder"/>

<!-- Click create order -->
<actionGroup ref="AdminClickCreateOrderOnEditCustomerPageActionGroup" stepKey="clickCreateOrder"/>

<actionGroup ref="AdminCheckLastOrderedProductOnCustomerEditPageActionGroup" stepKey="addProductToOrder">
<argument name="productName" value="$$createProduct.name$$"/>
</actionGroup>
Expand Down
8 changes: 5 additions & 3 deletions ...code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedBundleFixedProductOnOrderPageTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,19 +80,21 @@
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForProductPageLoad"/>

<actionGroup ref="AdminOpenCustomerEditPageActionGroup" stepKey="openCustomerEditPage">
<argument name="customerId" value="$createCustomer.id$"/>
<argument name="customerId" value="$$createCustomer.id$$"/>
</actionGroup>
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="filterCreatedCustomer"/>
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clickEditButton"/>

<actionGroup ref="AdminClickCreateOrderOnEditCustomerPageActionGroup" stepKey="clickCreateOrder"/>
<actionGroup ref="AdminClickCreateOrderOnEditCustomerPageActionGroup" stepKey="clickCreateOrder">
<argument name="productName" value="$$createBundleProduct.name$$"/>
</actionGroup>

<actionGroup ref="AdminClickConfigureForRecentlyViewedProductActionGroup" stepKey="configureProduct">
<argument name="productName" value="$$createBundleProduct.name$$"/>
</actionGroup>
<actionGroup ref="AdminSelectDropdownOptionOnConfigureProductSlidingModalActionGroup" stepKey="selectProductOption">
<argument name="optionName" value="$$createFirstProduct.name$$"/>
</actionGroup>
</actionGroup>

<actionGroup ref="AdminClickOkOnConfigureProductSlidingModalActionGroup" stepKey="clickOkBtn"/>
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForAddingConfigure"/>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/Test/Mftf/Test/MoveSimpleProductsInComparedOnOrderPageTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
</actionGroup>

<!-- Click 'Create Order' -->
<click selector="{{AdminCustomerMainActionsSection.createOrderBtn}}" stepKey="clickCreateOrder"/>
<actionGroup ref="AdminClickCreateOrderOnEditCustomerPageActionGroup" stepKey="clickCreateOrder"/>

<!-- Select products in comparison list section -->
<click selector="{{AdminCustomerActivitiesComparisonListSection.addProductToOrder($$createFirstSimpleProduct.name$$)}}" stepKey="addFirstProductToOrder"/>
Expand Down