|
21 | 21 | <before> |
22 | 22 | <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/> |
23 | 23 |
|
24 | | - <!-- Create Data --> |
25 | 24 | <createData entity="Simple_US_Customer" stepKey="createCustomer"/> |
26 | 25 | <createData entity="_defaultCategory" stepKey="createCategory"/> |
27 | 26 | <createData entity="defaultSimpleProduct" stepKey="createProduct"> |
28 | 27 | <requiredEntity createDataKey="createCategory"/> |
29 | 28 | </createData> |
30 | 29 | </before> |
31 | 30 | <after> |
32 | | - <!-- Delete data --> |
33 | 31 | <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/> |
34 | 32 | <deleteData createDataKey="createCategory" stepKey="deleteCategory"/> |
35 | 33 | <deleteData createDataKey="createProduct" stepKey="deleteProduct"/> |
36 | 34 | <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/> |
37 | 35 | </after> |
38 | 36 |
|
39 | | - <!-- Create order --> |
40 | | - <actionGroup ref="CreateOrderActionGroup" stepKey="createFirstOrder"> |
41 | | - <argument name="product" value="$$createProduct$$"/> |
42 | | - <argument name="customer" value="$$createCustomer$$"/> |
43 | | - </actionGroup> |
44 | | - <grabTextFrom selector="|Order # (\d+)|" stepKey="getOrderId"/> |
45 | | - <assertNotEmpty stepKey="assertOrderIdIsNotEmpty" after="getOrderId"> |
46 | | - <actualResult type="const">$getOrderId</actualResult> |
47 | | - </assertNotEmpty> |
48 | | - |
49 | | - <!-- Create Shipment for Order --> |
50 | | - <actionGroup ref="AdminCreateInvoiceAndShipmentActionGroup" stepKey="createShipment"/> |
| 37 | + <createData entity="CustomerCart" stepKey="createCustomerCart"> |
| 38 | + <requiredEntity createDataKey="createCustomer"/> |
| 39 | + </createData> |
| 40 | + <createData entity="CustomerCartItem" stepKey="addCartItem"> |
| 41 | + <requiredEntity createDataKey="createCustomerCart"/> |
| 42 | + <requiredEntity createDataKey="createProduct"/> |
| 43 | + </createData> |
| 44 | + <createData entity="CustomerAddressInformation" stepKey="addCustomerOrderAddress"> |
| 45 | + <requiredEntity createDataKey="createCustomerCart"/> |
| 46 | + </createData> |
| 47 | + <updateData createDataKey="createCustomerCart" entity="CustomerOrderPaymentMethod" stepKey="createFirstOrder"> |
| 48 | + <requiredEntity createDataKey="createCustomerCart"/> |
| 49 | + </updateData> |
| 50 | + <createData entity="Invoice" stepKey="invoiceOrder"> |
| 51 | + <requiredEntity createDataKey="createCustomerCart"/> |
| 52 | + </createData> |
| 53 | + <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="getOrderId"/> |
| 54 | + <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="assertOrderIdIsNotEmpty"/> |
| 55 | + <createData entity="Shipment" stepKey="createShipment"> |
| 56 | + <requiredEntity createDataKey="createCustomerCart"/> |
| 57 | + </createData> |
51 | 58 |
|
52 | | - <!-- Navigate to backend: Go to Sales > Orders --> |
53 | 59 | <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="onOrderPage"/> |
54 | 60 | <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/> |
| 61 | + <grabTextFrom selector="{{AdminOrdersGridSection.orderIdByIncrementId($createCustomerCart.return$)}}" stepKey="grabOrderId"/> |
55 | 62 |
|
56 | | - <!-- Select Mass Action according to dataset: Hold --> |
57 | 63 | <actionGroup ref="AdminOrderActionOnGridActionGroup" stepKey="actionHold"> |
58 | 64 | <argument name="action" value="Hold"/> |
59 | | - <argument name="orderId" value="$getOrderId"/> |
| 65 | + <argument name="orderId" value="$grabOrderId"/> |
60 | 66 | </actionGroup> |
61 | 67 | <see userInput="No order(s) were put on hold." stepKey="assertOrderOnHoldFailMessage"/> |
62 | 68 |
|
63 | | - <!--Assert order in orders grid --> |
64 | 69 | <actionGroup ref="AdminOrderFilterByOrderIdAndStatusActionGroup" stepKey="seeFirstOrder"> |
65 | | - <argument name="orderId" value="{$getOrderId}"/> |
| 70 | + <argument name="orderId" value="{$grabOrderId}"/> |
66 | 71 | <argument name="orderStatus" value="Complete"/> |
67 | 72 | </actionGroup> |
68 | | - <see userInput="{$getOrderId}" selector="{{AdminOrdersGridSection.gridCell('1','ID')}}" stepKey="assertOrderID"/> |
| 73 | + <see userInput="{$grabOrderId}" selector="{{AdminOrdersGridSection.gridCell('1','ID')}}" stepKey="assertOrderID"/> |
69 | 74 | <see userInput="Complete" selector="{{AdminOrdersGridSection.gridCell('1','Status')}}" stepKey="assertOrderStatus"/> |
70 | 75 | </test> |
71 | 76 | </tests> |
0 commit comments