Skip to content

Commit 02bd217

Browse files
committed
ACQE-8333: Check default status for processing when 'Use Order Status As Default' check box checked for custom order status
- Updated the story title and descrition in testfile
1 parent cbca7ac commit 02bd217

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

app/code/Magento/Sales/Test/Mftf/Data/OrderCommentsData.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,7 @@
1818
<data key="sent">An example comment when Status is sent.</data>
1919
<data key="readyForPickup">An example comment when Status is Ready For Pickup.</data>
2020
</entity>
21+
<entity name="OrderMessage">
22+
<data key="value">You have unassigned the order status.</data>
23+
</entity>
2124
</entities>

app/code/Magento/Sales/Test/Mftf/Data/OrderStatusData.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,5 @@
3131
<entity name="readyToPickup">
3232
<data key="code" unique="suffix">readytopickup</data>
3333
<data key="label" unique="suffix">Ready To Pickup</data>
34-
<data key="state">processing</data>
35-
<data key="status">fraud</data>
36-
<data key="message">You have unassigned the order status.</data>
3734
</entity>
3835
</entities>

app/code/Magento/Sales/Test/Mftf/Test/AdminVerifyBehaviorOfDefaultStatusForProcessingStateTest.xml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<test name="AdminVerifyBehaviorOfDefaultStatusForProcessingStateTest">
1212
<annotations>
1313
<features value="Sales"/>
14-
<stories value="Ensure 'Use Order Status as Default' Applies to Processing State"/>
15-
<title value="Check default status for processing when 'Use Order Status As Default' check box checked for custom order status"/>
16-
<description value="Admin can validate the behaviour of default status in order status grid for processing when custom order status is set as default for processing state"/>
14+
<stories value="Validate Auto-Assignment of Custom Status for Processing State"/>
15+
<title value="Verify default Status Behavior for Processing State When Custom Status Is Set as Default"/>
16+
<description value="Default order status for the Processing state is correctly updated when a custom status is assigned as default and reverts when the custom status is unassigned"/>
1717
<severity value="MAJOR"/>
1818
<testCaseId value="AC-15125"/>
1919
<group value="Sales"/>
@@ -31,8 +31,9 @@
3131
<!--Step 2: Verify the default status for the order status Processing -->
3232
<actionGroup ref="FilterOrderStatusByLabelAndCodeActionGroup" stepKey="filterOrderStatusGrid">
3333
<argument name="statusLabel" value="{{OrderStatus.processing}}"/>
34-
<argument name="statusCode" value="{{readyToPickup.state}}"/>
34+
<argument name="statusCode" value="{{orderStatus.value}}"/>
3535
</actionGroup>
36+
<!-- Default Status for processing should be displayed as Yes -->
3637
<waitForText selector="{{AdminOrderStatusGridSection.gridCell('1', 'Default Status')}}" userInput="{{EnableClearShoppingCart.textValue}}" stepKey="seeOrderStatusInOrderGrid"/>
3738
<!--Step 3: Create a status "Ready To Pickup" and bind it to "Processing" state-->
3839
<actionGroup ref="AdminClickCreateNewStatusButtonOnOrderStatusPageActionGroup" stepKey="clickAgainCreateNewStatus"/>
@@ -51,12 +52,14 @@
5152
<argument name="statusLabel" value="{{readyToPickup.label}}"/>
5253
<argument name="statusCode" value="{{readyToPickup.code}}"/>
5354
</actionGroup>
55+
<!-- Default Status for Ready To Pickup should be displayed as Yes -->
5456
<waitForText selector="{{AdminOrderStatusGridSection.gridCell('1', 'Default Status')}}" userInput="{{EnableClearShoppingCart.textValue}}" stepKey="seeOrderStatus"/>
5557
<!--Step 6: Verify the default status for the order status Processing -->
5658
<actionGroup ref="FilterOrderStatusByLabelAndCodeActionGroup" stepKey="filterOrderStatusGridAfterDefaultChange">
5759
<argument name="statusLabel" value="{{OrderStatus.processing}}"/>
58-
<argument name="statusCode" value="{{readyToPickup.state}}"/>
60+
<argument name="statusCode" value="{{orderStatus.value}}"/>
5961
</actionGroup>
62+
<!-- Default Status for processing should be displayed as No -->
6063
<waitForText selector="{{AdminOrderStatusGridSection.gridCell('1', 'Default Status')}}" userInput="{{DisableClearShoppingCart.textValue}}" stepKey="seeOrderStatusInGrid"/>
6164
<!--Step 7: Click on Unassign for the order status Ready To Pickup -->
6265
<actionGroup ref="FilterOrderStatusByLabelAndCodeActionGroup" stepKey="filterOrderStatusGridForUnassign">
@@ -66,12 +69,14 @@
6669
<waitForElementClickable selector="{{AdminOrderStatusGridSection.unassign}}" stepKey="waitToClickUnassignOrderStatus"/>
6770
<click selector="{{AdminOrderStatusGridSection.unassign}}" stepKey="clickUnassign"/>
6871
<waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSuccessMessageVisible"/>
69-
<waitForText selector="{{AdminMessagesSection.success}}" time="30" userInput="{{readyToPickup.message}}" stepKey="seeAssertOrderStatusSuccessUnassignMessage"/>
72+
<!-- "You have unassigned the order status." Message should be displayed -->
73+
<waitForText selector="{{AdminMessagesSection.success}}" userInput="{{OrderMessage.value}}" stepKey="seeAssertOrderStatusSuccessUnassignMessage"/>
7074
<!--Step 8: Verify the default status for the order status Processing -->
7175
<actionGroup ref="FilterOrderStatusByLabelAndCodeActionGroup" stepKey="filterStatusForOrderInGrid">
7276
<argument name="statusLabel" value="{{OrderStatus.processing}}"/>
73-
<argument name="statusCode" value="{{readyToPickup.state}}"/>
77+
<argument name="statusCode" value="{{orderStatus.value}}"/>
7478
</actionGroup>
79+
<!-- Default Status for processing should be displayed as Yes -->
7580
<waitForText selector="{{AdminOrderStatusGridSection.gridCell('1', 'Default Status')}}" userInput="{{EnableClearShoppingCart.textValue}}" stepKey="seeStatusForOrderInOrderGrid"/>
7681
</test>
7782
</tests>

0 commit comments

Comments
 (0)