Skip to content

Commit 35f6006

Browse files
magento-devops-queue-mgr-svcmagento-devops-queue-mgr-svc
authored
Merge branch '2.4-develop' into spartans_pr_25062025
2 parents 8f68c03 + e995df2 commit 35f6006

File tree

8 files changed

+403
-13
lines changed

8 files changed

+403
-13
lines changed

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

Lines changed: 275 additions & 0 deletions
Large diffs are not rendered by default.

‎app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminAssignBlockCMSPageWithTinyMCEActionGroup.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
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="AdminAssignBlockCMSPageWithTinyMCEActionGroup" extends="AssignBlockToCMSPage">
12+
<annotations>
13+
<description>Clicks On Show/Hide Button To display TinyMCE</description>
14+
</annotations>
15+
<conditionalClick selector="{{TinyMCESection.ShowHideBtn}}" dependentSelector="{{TinyMCESection.TinyMCE}}" visible="false" after="clickContentTab" stepKey="toggleEditorIfHidden"/>
16+
</actionGroup>
17+
</actionGroups>

‎app/code/Magento/Cms/Test/Mftf/Data/WysiwygConfigData.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,9 @@
2424
<data key="label">Yes</data>
2525
<data key="value">mage/adminhtml/wysiwyg/tiny_mce/tinymceAdapter</data>
2626
</entity>
27+
<entity name="WysiwygDisabled">
28+
<data key="path">cms/wysiwyg/enabled</data>
29+
<data key="scope_id">0</data>
30+
<data key="value">hidden</data>
31+
</entity>
2732
</entities>

‎app/code/Magento/Review/Test/Mftf/ActionGroup/AdminAddProductReviewActionGroup.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<pressKey parameterArray="[\Facebook\WebDriver\WebDriverKeys::ENTER]" selector="{{AdminCreateNewReviewSection.filterName}}" stepKey="pressEnter"/>
2121
<waitForElementClickable selector="{{AdminCreateNewReviewSection.firstRowReview}}" stepKey="waitForVisibleReviewButton"/>
2222
<executeJS function="jQuery('{{AdminCreateNewReviewSection.firstRowReview}}').click()" stepKey="addNewReviewBySKU"/>
23+
<waitForPageLoad stepKey="waitForPageLoad"/>
2324
<waitForElementVisible selector="{{AdminCreateNewReviewSection.select_stores}}" stepKey="waitForVisibleReviewDetails"/>
2425
<selectOption selector="{{AdminCreateNewReviewSection.select_stores}}" userInput="{{review.select_stores[0]}}" stepKey="visibilityField"/>
2526
<fillField selector="{{AdminCreateNewReviewSection.nickname}}" userInput="{{review.nickname}}" stepKey="fillNicknameField"/>

‎app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsInformationSection.xml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
6-
*/
3+
/**
4+
* Copyright 2018 Adobe.
5+
* All Rights Reserved.
6+
*/
77
-->
88

99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -28,5 +28,7 @@
2828
<element name="orderStatusUnderViewS" type="text" selector="//tr//div[contains(text(),'{{product}}')]/../../..//td[@class='col-status' and contains(text(),'{{status}}')]" parameterized="true" timeout="30"/>
2929
<element name="paymentInformationField" type="text" selector="//*[contains(text(),'{{paymentInformationField}}')]/following-sibling::td" parameterized="true"/>
3030
<element name="rateValue" type="text" selector="//table[contains(@class, 'order-information-table')]//th[contains(text(), 'rate:')]/following-sibling::td"/>
31+
<element name="historyStatus" type="button" selector="//select[@name='history[status]']"/>
32+
<element name="statusUpdate" type="button" selector="//button[@title='Update']"/>
3133
</section>
3234
</sections>

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

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2025 Adobe.
5+
* All Rights Reserved.
6+
*/
7+
-->
8+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminAbleToCreateOrderStatusAndUpdateStatusInOrderTest">
12+
<annotations>
13+
<features value="Sales"/>
14+
<stories value="CRUD status in order"/>
15+
<title value="Order status is set and updated correctly when default status is used for processing"/>
16+
<description value="Create a custom order status, assign it as default to processing state, then place an order, invoice it, and verify status behaviour."/>
17+
<testCaseId value="AC-11877"/>
18+
<severity value="AVERAGE"/>
19+
</annotations>
20+
<before>
21+
<!-- Create product and login -->
22+
<createData entity="SimpleProduct" stepKey="createProduct"/>
23+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
24+
</before>
25+
<after>
26+
<!-- Assign status to default one -->
27+
<actionGroup ref="AdminOrderStatusToStateAssignActionGroup" stepKey="resetDefaultStatusToState">
28+
<argument name="orderStatus" value="Processing"/>
29+
<argument name="orderState" value="{{defaultOrderStatus.label}}"/>
30+
</actionGroup>
31+
<!-- Unassign order status -->
32+
<actionGroup ref="AdminGoToOrderStatusPageActionGroup" stepKey="goToOrderStatus"/>
33+
<actionGroup ref="FilterOrderStatusByLabelAndCodeActionGroup" stepKey="filterStatusGrid">
34+
<argument name="statusLabel" value="{{defaultOrderStatus.label}}"/>
35+
<argument name="statusCode" value="{{defaultOrderStatus.status}}"/>
36+
</actionGroup>
37+
<click selector="{{AdminOrderStatusGridSection.unassign}}" stepKey="unassignOrderStatus"/>
38+
<waitForPageLoad stepKey="waitForGridLoad"/>
39+
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
40+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
41+
</after>
42+
<!-- Go to new order status page -->
43+
<actionGroup ref="AdminGoToOrderStatusPageActionGroup" stepKey="goToOrderStatusPage"/>
44+
<actionGroup ref="AdminClickCreateNewStatusButtonOnOrderStatusPageActionGroup" stepKey="clickCreateNewStatus"/>
45+
<!-- Fill the form and validate message -->
46+
<actionGroup ref="AdminOrderStatusFormFillAndSave" stepKey="fillFormAndClickSave">
47+
<argument name="status" value="{{defaultOrderStatus.status}}"/>
48+
<argument name="label" value="{{defaultOrderStatus.label}}"/>
49+
</actionGroup>
50+
<actionGroup ref="AssertOrderStatusFormSaveSuccess" stepKey="seeFormSaveSuccess"/>
51+
<!-- Assign created order status to state -->
52+
<actionGroup ref="AdminOrderStatusToStateAssignActionGroup" stepKey="assignTestStatusToState">
53+
<argument name="orderStatus" value="{{defaultOrderStatus.status}}"/>
54+
<argument name="orderState" value="Processing"/>
55+
</actionGroup>
56+
<!-- Add product to cart and place order -->
57+
<actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="AddProductToCart">
58+
<argument name="product" value="$$createProduct$$"/>
59+
</actionGroup>
60+
<actionGroup ref="StorefrontOpenCheckoutPageActionGroup" stepKey="clickToProceedToCheckout"/>
61+
<actionGroup ref="FillGuestCheckoutShippingAddressWithCountryAndStateActionGroup" stepKey="fillShippingFormData">
62+
<argument name="customer" value="CustomerEntityOne"/>
63+
<argument name="customerAddress" value="CustomerAddressSimple"/>
64+
</actionGroup>
65+
<actionGroup ref="StorefrontSetShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
66+
<actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="clickNextOnShippingStep"/>
67+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrder"/>
68+
<!-- Place order -->
69+
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickPlaceOrder"/>
70+
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>
71+
<!-- Go to admin, create invoice and check order status -->
72+
<!-- Open order -->
73+
<actionGroup ref="OpenOrderByIdActionGroup" stepKey="openOrder">
74+
<argument name="orderId" value="{$grabOrderNumber}"/>
75+
</actionGroup>
76+
<!--Create Invoice for this Order-->
77+
<actionGroup ref="StartCreateInvoiceFromOrderPageActionGroup" stepKey="createInvoice"/>
78+
<actionGroup ref="SubmitInvoiceActionGroup" stepKey="submitInvoice"/>
79+
<!-- Verify status -->
80+
<actionGroup ref="AdminOrderViewCheckStatusActionGroup" stepKey="verifyOrderStatusOnOrderViewPage">
81+
<argument name="status" value="{{defaultOrderStatus.label}}" />
82+
</actionGroup>
83+
<selectOption selector="{{AdminOrderDetailsInformationSection.historyStatus}}" userInput="Processing" stepKey="selectProcessingStatus"/>
84+
<click selector="{{AdminOrderDetailsInformationSection.statusUpdate}}" stepKey="clickUpdateButton"/>
85+
<waitForPageLoad stepKey="waitForPageLoad"/>
86+
<actionGroup ref="AdminOrderViewCheckStatusActionGroup" stepKey="againVerifyOrderStatusOnOrderViewPage">
87+
<argument name="status" value="Processing"/>
88+
</actionGroup>
89+
</test>
90+
</tests>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@
224224
</actionGroup>
225225
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForOrderPageToOpen"/>
226226
<actionGroup ref="AdminOpenOrderByIdFromOrdersGridOnCustomerEditPageActionGroup" stepKey="selectOnOrderID">
227-
<argument name="orderId" value="$orderId"/>
227+
<argument name="orderId" value="$orderNumber"/>
228228
</actionGroup>
229229

230230
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForOrderInformationToLoad"/>

‎composer.lock

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)