Skip to content

Commit 95df453

Browse files
slavvkaslavvka
authored
Merge pull request #407 from magento-gl/functional-mainline-deployment-inventory-new
Functional mainline deployment inventory new
2 parents 813b3f6 + 639fda3 commit 95df453

File tree

3 files changed

+155
-2
lines changed

3 files changed

+155
-2
lines changed

‎InventoryAdminUi/Test/Mftf/Test/AdminCreateDownloadableProductWithDefaultSourceTest.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
<argument name="selector" value="AdminProductGridFilterSection.skuFilter"/>
6969
<argument name="value" value="$$downloadableProduct1.product[sku]$$"/>
7070
</actionGroup>
71+
<waitForElementVisible selector="{{AdminGridRow.editByValue($$downloadableProduct1.product[sku]$$)}}" stepKey="waitForClickOnEditDownloadableProductForCheckInStock"/>
7172
<click selector="{{AdminGridRow.editByValue($$downloadableProduct1.product[sku]$$)}}" stepKey="clickOnEditDownloadableProductForCheckInStock"/>
7273
<waitForPageLoad time="30" stepKey="waitForPageLoad2"/>
7374

‎InventoryAdminUi/Test/Mftf/Test/AdminManageSourceGridColumnsSortingTest.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,15 +103,15 @@
103103

104104
<comment userInput="Ascend sorting for Name" stepKey="ascendSortingForNameComment"/>
105105
<click selector="{{AdminGridHeaders.headerByName('Name')}}" stepKey="clickOnNameHeaderToSetAscendSorting"/>
106-
<waitForPageLoad time="10" stepKey="waitForSourceGridPageLoadAfterSettingAscendSortingForName"/>
106+
<waitForPageLoad time="30" stepKey="waitForSourceGridPageLoadAfterSettingAscendSortingForName"/>
107107
<see userInput="$$createCustomSource1.source[name]$$" selector="{{AdminGridRow.rowByIndex('0')}}" stepKey="seeCustomSource1NameInRow1WhenAscendSorting"/>
108108
<see userInput="$$createCustomSource2.source[name]$$" selector="{{AdminGridRow.rowByIndex('1')}}" stepKey="seeCustomSource2NameInRow2WhenAscendSorting"/>
109109
<see userInput="$$createCustomSource3.source[name]$$" selector="{{AdminGridRow.rowByIndex('2')}}" stepKey="seeCustomSource3NameInRow3WhenAscendSorting"/>
110110
<see userInput="$$createCustomSource4.source[name]$$" selector="{{AdminGridRow.rowByIndex('3')}}" stepKey="seeCustomSource4NameInRow4WhenAscendSorting"/>
111111

112112
<comment userInput="Descend sorting for Name" stepKey="descendSortingForNameComment"/>
113113
<click selector="{{AdminGridHeaders.headerByName('Name')}}" stepKey="clickOnNameHeaderToSetDescendSorting"/>
114-
<waitForPageLoad time="10" stepKey="waitForSourceGridPageLoadAfterSettingDescendSortingForName"/>
114+
<waitForPageLoad time="30" stepKey="waitForSourceGridPageLoadAfterSettingDescendSortingForName"/>
115115
<see userInput="$$createCustomSource4.source[name]$$" selector="{{AdminGridRow.rowByIndex('0')}}" stepKey="seeCustomSource4NameInRow1WhenDescendSorting"/>
116116
<see userInput="$$createCustomSource3.source[name]$$" selector="{{AdminGridRow.rowByIndex('1')}}" stepKey="seeCustomSource3NameInRow2WhenDescendSorting"/>
117117
<see userInput="$$createCustomSource2.source[name]$$" selector="{{AdminGridRow.rowByIndex('2')}}" stepKey="seeCustomSource2NameInRow3WhenDescendSorting"/>

‎InventoryInStorePickupFrontend/Test/Mftf/Test/GuestCustomerPlaceOrderWithPickupInStoreMethodWithGoogleAPIEnabledTest.xml‎

Lines changed: 152 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,152 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
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="GuestCustomerPlaceOrderWithPickupInStoreMethodWithGoogleAPIEnabledTest">
12+
<annotations>
13+
<stories value="Simple Product Custom Stock."/>
14+
<title value="Guest customer place order with Pickup In store method with Google API enabled."/>
15+
<description value="As a guest customer place an order with Pickup In store method along with Google API enabled."/>
16+
<testCaseId value="AC-1798"/>
17+
<severity value="CRITICAL"/>
18+
</annotations>
19+
<before>
20+
<!--Enable Store pickup-->
21+
<magentoCLI command="config:set {{EnableInStorePickup.path}} {{EnableInStorePickup.value}}" stepKey="enableInStorePickupMethod"/>
22+
<!--Enable Distance Provider for Distance Based SSA to online-->
23+
<magentoCLI command="config:set {{OnlineDistanceProviderForDistanceBasedSSA.path}} {{OnlineDistanceProviderForDistanceBasedSSA.value}}" stepKey="setDistanceProviderToOnline"/>
24+
<createData entity="CulverStorePickupEnabledSource2" stepKey="createSource1"/>
25+
<createData entity="AustinStorePickupEnabledSource" stepKey="createSource2"/>
26+
<createData entity="BasicMsiStockWithMainWebsite1" stepKey="createStock"/>
27+
<createData entity="SimpleProduct" stepKey="createSimpleProduct"/>
28+
<createData entity="_defaultCategory" stepKey="category"/>
29+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
30+
<!--Go to Stores -> Configuration -> Catalog -> Inventory and open google distance provider Tab-->
31+
<actionGroup ref="AdminFillGoogleDistanceProviderAPIKeyActionGroup" stepKey="fillGoogleApiKey"/>
32+
<!--Go to Stores -> Stock and filter created stock to edit -->
33+
<actionGroup ref="AdminGoToStockGridFilterResultsByInputEditStock"
34+
stepKey="goToStockGridFilterResultsByInputEditStock1">
35+
<argument name="filter_selector" value="AdminManageStockGridFilterControls.name"/>
36+
<argument name="filter_value" value="$$createStock.stock[name]$$"/>
37+
</actionGroup>
38+
<!--Assign Sources to stock-->
39+
<actionGroup ref="AdminOnStockEditPageAssignSourceToStock" stepKey="onStockEditPageAssignSourceToStock1">
40+
<argument name="filter_selector" value="AdminManageStockGridFilterControls.name"/>
41+
<argument name="filter_value" value="$$createSource1.source[name]$$"/>
42+
</actionGroup>
43+
<!--Add source to stock -->
44+
<actionGroup ref="AdminOnStockEditPageAssignSourceToStock" stepKey="onStockEditPageAssignSourceToStock2">
45+
<argument name="filter_selector" value="AdminManageStockGridFilterControls.name"/>
46+
<argument name="filter_value" value="$$createSource2.source[name]$$"/>
47+
</actionGroup>
48+
<actionGroup ref="AdminFormSaveAndCloseActionGroup" stepKey="saveAndClose"/>
49+
<!--Go to product and open product to edit-->
50+
<actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="openProductEditPage">
51+
<argument name="productId" value="$createSimpleProduct.id$"/>
52+
</actionGroup>
53+
<!--Add category to product-->
54+
<actionGroup ref="AdminAssignCategoryToProductAndSaveActionGroup" stepKey="assignProduct">
55+
<argument name="categoryName" value="$$category.name$$"/>
56+
</actionGroup>
57+
<!--Assign Source to product and update quantity-->
58+
<actionGroup ref="AdminOnProductEditPageAssignSourceToProduct" stepKey="AdminOnProductEditPageAssignSourceToProduct1">
59+
<argument name="filter_selector" value="AdminManageSourcesGridFilterControls.code"/>
60+
<argument name="filter_value" value="$$createSource1.source[source_code]$$"/>
61+
</actionGroup>
62+
<actionGroup ref="AdminOnProductEditPageAssignSourceToProduct" stepKey="AdminOnProductEditPageAssignSourceToProduct2">
63+
<argument name="filter_selector" value="AdminManageSourcesGridFilterControls.code"/>
64+
<argument name="filter_value" value="$$createSource2.source[source_code]$$"/>
65+
</actionGroup>
66+
<fillField selector="{{AdminProductSourcesGrid.rowQty('1')}}" userInput="100" stepKey="fillDefaultQuantityField1"/>
67+
<fillField selector="{{AdminProductSourcesGrid.rowQty('2')}}" userInput="100" stepKey="fillDefaultQuantityField2"/>
68+
<!--Save the product-->
69+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="saveProduct"/>
70+
<!--Clean cache and reindex-->
71+
<actionGroup ref="ClearCacheActionGroup" stepKey="clearCache" />
72+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
73+
<argument name="indices" value=""/>
74+
</actionGroup>
75+
76+
</before>
77+
<after>
78+
<actionGroup ref="AssignWebsiteToStockActionGroup" stepKey="assignMainWebsiteToDefaultStock">
79+
<argument name="stockName" value="{{_defaultStock.name}}"/>
80+
<argument name="websiteName" value="{{_defaultWebsite.name}}"/>
81+
</actionGroup>
82+
<!--Set Distance Provider for Distance Based SSA to offline-->
83+
<magentoCLI command="config:set {{OfflineDistanceProviderForDistanceBasedSSA.path}} {{OfflineDistanceProviderForDistanceBasedSSA.value}}" stepKey="setDistanceProviderToOffline"/>
84+
<!--Disable 'In Store Pickup' shipping method.-->
85+
<magentoCLI command="config:set {{DisableInStorePickup.path}} {{DisableInStorePickup.value}}" stepKey="enableInStorePickupMethod"/>
86+
<deleteData createDataKey="createStock" stepKey="deleteStock"/>
87+
<actionGroup ref="DisableAllSourcesActionGroup" stepKey="disableAllSources"/>
88+
<!--Clean cache and reindex-->
89+
<actionGroup ref="ClearCacheActionGroup" stepKey="clearCacheAfterDisablingSources" />
90+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexAfterDisablingSources">
91+
<argument name="indices" value=""/>
92+
</actionGroup>
93+
<deleteData createDataKey="category" stepKey="deleteCategory"/>
94+
<deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
95+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
96+
</after>
97+
<!--Go to storefront -->
98+
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToFrontend"/>
99+
<!--Open product in storefront-->
100+
<actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="GoToProductPage">
101+
<argument name="productUrl" value="$$createSimpleProduct.custom_attributes[url_key]$$"/>
102+
</actionGroup>
103+
<!--Add product to cart-->
104+
<actionGroup ref="StorefrontAddSimpleProductWithQtyActionGroup" stepKey="addSimpleProductToCart">
105+
<argument name="product" value="$$createSimpleProduct$$"/>
106+
<argument name="quantity" value="5"/>
107+
</actionGroup>
108+
<!-- Grab Quantity Value from Product Details Page-->
109+
<waitForElement selector="{{StorefrontProductPageSection.qtyInput($$createSimpleProduct.name$$)}}" stepKey="waitForQtyElementVisibleOnProduct1"/>
110+
<grabValueFrom selector="{{StorefrontProductPageSection.qtyInput($$createSimpleProduct.name$$)}}" stepKey="grabProductQtyInProductDetailsPage"/>
111+
<actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="clickMiniCart"/>
112+
<!-- Grab Quantity Value from MiniCart-->
113+
<waitForElement selector="{{StorefrontMinicartSection.itemQuantity($$createSimpleProduct.name$$)}}" stepKey="waitForQtyElementVisibleOnProduct1InMiniCart"/>
114+
<grabValueFrom selector="{{StorefrontMinicartSection.itemQuantity($$createSimpleProduct.name$$)}}" stepKey="grabProductQtyInShowMinicart"/>
115+
<!-- Assert Quantity is same as mentioned in product details page -->
116+
<assertEquals stepKey="assertquantityValuesAreEqualfromProductPage">
117+
<actualResult type="string">$grabProductQtyInShowMinicart</actualResult>
118+
<expectedResult type="string">$grabProductQtyInProductDetailsPage</expectedResult>
119+
</assertEquals>
120+
<!--Click on Proceed to checkout-->
121+
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToCart"/>
122+
<actionGroup ref="StorefrontClickProceedToCheckoutActionGroup" stepKey="goToCheckout"/>
123+
<!--Click on Store Pickup and Fill Email -->
124+
<waitForElement selector="{{StorefrontSelectStoreSection.pickInStoreBtn}}" stepKey="waitForPickInStoreBtn"/>
125+
<actionGroup ref="StorefrontPickInStoreActionGroup" stepKey="pickInStore"/>
126+
<actionGroup ref="StorefrontPickInStoreFillCustomerEmail" stepKey="fillCustomerEmail"/>
127+
<!-- Click on select Store and select a store-->
128+
<actionGroup ref="StorefrontPickInStoreNavigateToSelectStoreActionGroup" stepKey="navigateToSelectStores"/>
129+
<click selector="{{StorefrontPickInStoreModalSection.shipBtn($$createSource1.source[name]$$)}}" stepKey="clickShipButton"/>
130+
<waitForPageLoad stepKey="waitForSourceSelection"/>
131+
<!--Navigate to Payment-->
132+
<actionGroup ref="StorefrontPickInStoreNavigateToPaymentActionGroup" stepKey="navigateToPaymentStep"/>
133+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="clickCheckMoneyOrderPayment"/>
134+
<!--Fill Shipping address -->
135+
<actionGroup ref="StorefrontPickInStoreGuestCustomerFillBillingAddressActionGroup" stepKey="fillAddress">
136+
<argument name="customerVar" value="Simple_US_Customer"/>
137+
<argument name="customerAddressVar" value="US_Address_TX"/>
138+
</actionGroup>
139+
<!--Click on place order -->
140+
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickOnPlaceOrder"/>
141+
<waitForElement selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="waitForOrderNumber"/>
142+
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="orderNumber"/>
143+
<!--Open recently submitted order in backend-->
144+
<actionGroup ref="OpenOrderByIdActionGroup" stepKey="openOrder">
145+
<argument name="orderId" value="{$orderNumber}"/>
146+
</actionGroup>
147+
<!--Verify ship is not present and Notify Order Is Ready For Pickup is present-->
148+
<actionGroup ref="AdminAssertOrderWithStorePickupShippingMethodActionGroup" stepKey="verifyShippingInformation">
149+
<argument name="sourceName" value="$createSource1.source[name]$"/>
150+
</actionGroup>
151+
</test>
152+
</tests>

0 commit comments

Comments
 (0)