Skip to content

Commit d986431

Browse files
shanthishanthi
shanthi
authored and
shanthi
committed
added AC-4455
2 parents 090e4b3 + b83b759 commit d986431

File tree

4 files changed

+228
-0
lines changed

4 files changed

+228
-0
lines changed

‎app/code/Magento/Backend/Test/Mftf/Section/LocaleOptionsSection.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,8 @@
1818
<element name="defaultLocale" type="checkbox" selector="#general_locale_code_inherit"/>
1919
<element name="checkIfTabExpand" type="button" selector="#general_locale-head:not(.open)"/>
2020
<element name="timeZoneDropdown" type="select" selector="//select[@id='general_locale_timezone']"/>
21+
<element name="changeStoreConfigButton" type="button" selector="//button[@id='store-change-button']"/>
22+
<element name="changeStoreConfigToSpecificWebsite" type="select" selector="//a[contains(text(),'{{var}}')]" parameterized="true"/>
23+
<element name="changeWebsiteConfirmButton" type="button" selector="//button[@class='action-primary action-accept']/span"/>
2124
</section>
2225
</sections>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<!-- Login as admin -->
2323
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
2424
<!-- remove the Filter From the page-->
25+
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
2526
<actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearFilterFromProductIndex"/>
2627
<!--Create Category-->
2728
<createData entity="SimpleSubCategory" stepKey="createCategory"/>

‎app/code/Magento/Config/Test/Mftf/ActionGroup/AdminChangeTimeZoneForDifferentWebsiteActionGroup.xml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminChangeTimeZoneForDifferentWebsiteActionGroup">
11+
<annotations>
12+
<description>set the time zone for different website</description>
13+
</annotations>
14+
<arguments>
15+
<argument name="websiteName" type="string" defaultValue="{{SimpleProduct.sku}}"/>
16+
<argument name="timeZoneName" type="string"/>
17+
</arguments>
18+
<amOnPage url="{{GeneralConfigurationPage.url}}" stepKey="navigateToLocaleConfigurationPage"/>
19+
<waitForPageLoad stepKey="waitForConfigPageLoad"/>
20+
<click selector="{{LocaleOptionsSection.changeStoreConfigButton}}" stepKey="changeStoreButton"/>
21+
<waitForPageLoad stepKey="waitForStoreOption"/>
22+
<click selector="{{LocaleOptionsSection.changeStoreConfigToSpecificWebsite(websiteName)}}" stepKey="selectNewWebsite"/>
23+
<waitForPageLoad stepKey="waitForWebsiteChange"/>
24+
<!-- Accept the current popup visible on the page. -->
25+
<click selector="{{LocaleOptionsSection.changeWebsiteConfirmButton}}" stepKey="confirmModal"/>
26+
<waitForPageLoad stepKey="waitForSaveChange"/>
27+
<conditionalClick stepKey="expandDefaultLayouts" selector="{{LocaleOptionsSection.sectionHeader}}" dependentSelector="{{LocaleOptionsSection.checkIfTabExpand}}" visible="true"/>
28+
<click selector="{{LocaleOptionsSection.useDefault}}" stepKey="unCheckCheckbox"/>
29+
<waitForElementVisible selector="{{LocaleOptionsSection.timezone}}" stepKey="waitForLocaleTimeZone"/>
30+
<selectOption userInput="{{timeZoneName}}" selector="{{LocaleOptionsSection.timeZoneDropdown}}" stepKey="selectDefaultOption"/>
31+
</actionGroup>
32+
</actionGroups>

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

Lines changed: 192 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,192 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="OrderDataGridDisplaysPurchaseDateTest">
11+
<annotations>
12+
<stories value="verify purchase date format"/>
13+
<title value="Order Data Grid displays Purchase Date in correct format"/>
14+
<description value="Order Data Grid displays Purchase Date in correct format"/>
15+
<testCaseId value="AC-4455"/>
16+
<severity value="MAJOR"/>
17+
</annotations>
18+
<before>
19+
<!-- Set Store Code To Urls -->
20+
<magentoCLI command="config:set {{StorefrontEnableAddStoreCodeToUrls.path}} {{StorefrontEnableAddStoreCodeToUrls.value}}" stepKey="setAddStoreCodeToUrlsToYes"/>
21+
<!-- Login as Admin -->
22+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
23+
<!--Create website-->
24+
<actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createSecondWebsite">
25+
<argument name="newWebsiteName" value="{{secondCustomWebsite.name}}"/>
26+
<argument name="websiteCode" value="{{secondCustomWebsite.code}}"/>
27+
</actionGroup>
28+
<!-- Create second store -->
29+
<actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createSecondStoreGroup">
30+
<argument name="website" value="{{secondCustomWebsite.name}}"/>
31+
<argument name="storeGroupName" value="{{SecondStoreGroupUnique.name}}"/>
32+
<argument name="storeGroupCode" value="{{SecondStoreGroupUnique.code}}"/>
33+
</actionGroup>
34+
<!-- Create second store view -->
35+
<actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createSecondStoreView">
36+
<argument name="StoreGroup" value="SecondStoreGroupUnique"/>
37+
<argument name="customStore" value="SecondStoreUnique"/>
38+
</actionGroup>
39+
<magentoCron groups="index" stepKey="reindexAllIndexes"/>
40+
<!-- Change time zone for second website-->
41+
<actionGroup ref="AdminChangeTimeZoneForDifferentWebsiteActionGroup" stepKey="openConfigPage">
42+
<argument name="websiteName" value="{{secondCustomWebsite.name}}"/>
43+
<argument name="timeZoneName" value="Hawaii-Aleutian Standard Time (America/Adak)"/>
44+
</actionGroup>
45+
<actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveConfiguration"/>
46+
<!-- Change time zone for Main website-->
47+
<actionGroup ref="AdminChangeTimeZoneForDifferentWebsiteActionGroup" stepKey="openConfigPageSecondTime">
48+
<argument name="websiteName" value="Main Website"/>
49+
<argument name="timeZoneName" value="Taipei Standard Time (Asia/Taipei)"/>
50+
</actionGroup>
51+
<actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveConfigurationSecondTime"/>
52+
<!-- Create category and simple product -->
53+
<createData entity="ApiCategory" stepKey="createCategory"/>
54+
<createData entity="ApiSimpleProduct" stepKey="createSimpleProduct">
55+
<requiredEntity createDataKey="createCategory"/>
56+
<field key="price">10</field>
57+
</createData>
58+
<!-- Open product page and assign grouped project to second website -->
59+
<actionGroup ref="FilterAndSelectProductActionGroup" stepKey="openAdminProductPage">
60+
<argument name="productSku" value="$$createSimpleProduct.sku$$"/>
61+
</actionGroup>
62+
<actionGroup ref="AdminAssignProductInWebsiteActionGroup" stepKey="assignProductToSecondWebsite">
63+
<argument name="website" value="{{secondCustomWebsite.name}}"/>
64+
</actionGroup>
65+
<actionGroup ref="SaveProductFormActionGroup" stepKey="saveSimpleProduct"/>
66+
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>
67+
<!--Go to Storefront as Customer-->
68+
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
69+
<argument name="Customer" value="$$createCustomer$$" />
70+
</actionGroup>
71+
</before>
72+
<after>
73+
<!-- Disabled Store URLs -->
74+
<magentoCLI command="config:set {{StorefrontDisableAddStoreCodeToUrls.path}} {{StorefrontDisableAddStoreCodeToUrls.value}}" stepKey="setAddStoreCodeToUrlsToNo"/>
75+
<!-- Delete Category -->
76+
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
77+
<!-- Delete simple product -->
78+
<deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
79+
<!-- Delete first customer -->
80+
<deleteData createDataKey="createCustomer" stepKey="deleteFirstCustomer"/>
81+
<!-- Delete second customer -->
82+
<deleteData createDataKey="createSecondCustomer" stepKey="deleteSecondCustomer"/>
83+
<amOnPage url="{{AdminDashboardPage.url}}" stepKey="gotoOnDashboardPage"/>
84+
<waitForPageLoad stepKey="waitForDashboardPageToLoad"/>
85+
<!-- Reset time zone for Main website-->
86+
<actionGroup ref="AdminChangeTimeZoneForDifferentWebsiteActionGroup" stepKey="openConfigPageSecondTime">
87+
<argument name="websiteName" value="Main Website"/>
88+
<argument name="timeZoneName" value="Central Standard Time (America/Chicago)"/>
89+
</actionGroup>
90+
<actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveConfigurationSecondTime"/>
91+
<!--set main website as default-->
92+
<actionGroup ref="AdminSetDefaultWebsiteActionGroup" stepKey="setMainWebsiteAsDefault">
93+
<argument name="websiteName" value="Main Website"/>
94+
</actionGroup>
95+
<!-- Delete second website -->
96+
<actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
97+
<argument name="websiteName" value="{{secondCustomWebsite.name}}"/>
98+
</actionGroup>
99+
<magentoCron groups="index" stepKey="reindex"/>
100+
<!--reset prouct grid filter-->
101+
<actionGroup ref="NavigateToAndResetProductGridToDefaultViewActionGroup" stepKey="resetProductGridFilter"/>
102+
<!-- Admin logout -->
103+
<actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
104+
</after>
105+
<!-- Go to product page -->
106+
<amOnPage url="$$createSimpleProduct.custom_attributes[url_key]$$.html" stepKey="navigateToSimpleProductPage"/>
107+
<waitForPageLoad stepKey="waitForCatalogPageLoad"/>
108+
<!-- Add Product to Shopping Cart -->
109+
<actionGroup ref="AddToCartFromStorefrontProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage">
110+
<argument name="productName" value="$$createSimpleProduct.name$$"/>
111+
</actionGroup>
112+
<!-- Go to Checkout -->
113+
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMiniCart"/>
114+
<actionGroup ref="StorefrontSelectFirstShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
115+
<comment userInput="Adding the comment to replace waitForLoadingMask2 action for preserving Backward Compatibility" stepKey="waitForLoadingMask2"/>
116+
<actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickNext"/>
117+
<!-- Checkout select Check/Money Order payment -->
118+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
119+
<!-- Click Place Order button -->
120+
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickPlaceOrder"/>
121+
<!-- capture date at time of Placing Order -->
122+
<generateDate date="+2 hour" format="M j, Y" stepKey="generateDateAtFirstOrderTime"/>
123+
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabFirstOrderNumber"/>
124+
<amOnPage url="{{AdminDashboardPage.url}}" stepKey="amOnDashboardPage"/>
125+
<waitForPageLoad stepKey="waitForDashboardPageLoad"/>
126+
<!--set second website as default-->
127+
<actionGroup ref="AdminSetDefaultWebsiteActionGroup" stepKey="setSecondWebsiteAsDefault">
128+
<argument name="websiteName" value="{{secondCustomWebsite.name}}"/>
129+
</actionGroup>
130+
<!-- create second Customer-->
131+
<createData entity="Simple_US_Customer_CA" stepKey="createSecondCustomer"/>
132+
<!--Go to Storefront as Customer-->
133+
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="secondCustomerLogin">
134+
<argument name="Customer" value="$$createSecondCustomer$$" />
135+
</actionGroup>
136+
<!-- Go to product page -->
137+
<amOnPage url="$$createSimpleProduct.custom_attributes[url_key]$$.html" stepKey="navigateToSimpleProductPageSecondTime"/>
138+
<waitForPageLoad stepKey="waitForCatalogPageLoadSecondTime"/>
139+
<!-- Add Product to Shopping Cart -->
140+
<actionGroup ref="AddToCartFromStorefrontProductPageActionGroup" stepKey="addToCartFromStorefrontProductPageSecondTime">
141+
<argument name="productName" value="$$createSimpleProduct.name$$"/>
142+
</actionGroup>
143+
<!-- Go to Checkout -->
144+
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMiniCartSecondTime"/>
145+
<actionGroup ref="StorefrontSelectFirstShippingMethodActionGroup" stepKey="selectFlatRateShippingMethodSecondTime"/>
146+
<actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickNextSecondTime"/>
147+
<!-- Checkout select Check/Money Order payment -->
148+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPaymentSecondTime"/>
149+
<!-- Click Place Order button -->
150+
<wait time="75" stepKey="waitBeforePlaceOrder"/>
151+
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickPlaceOrderSecondTime"/>
152+
<!-- capture date at time of Placing Order -->
153+
<generateDate date="+2 hour" format="M j, Y" stepKey="generateDateAtSecondOrderTime"/>
154+
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabSecondOrderNumber"/>
155+
<!-- Go to admin and check order status -->
156+
<actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="navigateToSalesOrderPage"/>
157+
<actionGroup ref="SearchAdminDataGridByKeywordActionGroup" stepKey="searchForFirstOrder">
158+
<argument name="keyword" value="{$grabFirstOrderNumber}"/>
159+
</actionGroup>
160+
<!--Get date from "Purchase Date" column -->
161+
<grabTextFrom selector="{{AdminOrdersGridSection.gridCell('1','Purchase Date')}}" stepKey="grabPurchaseDateForFirstOrderInDefaultLocale"/>
162+
<!--Get date and time in default locale (US)-->
163+
<executeJS function="return (new Date('{$grabPurchaseDateForFirstOrderInDefaultLocale}').toLocaleDateString('en-US',{month: 'short', day: 'numeric', year: 'numeric'} ))" stepKey="getDateMonthYearNameForFirstOrderInUS"/>
164+
<!--Checking oder placing Date with default "Interface Locale"-->
165+
<assertStringContainsString stepKey="checkingFirstOrderDateWithPurchaseDate">
166+
<expectedResult type="variable">getDateMonthYearNameForFirstOrderInUS</expectedResult>
167+
<actualResult type="variable">grabPurchaseDateForFirstOrderInDefaultLocale</actualResult>
168+
</assertStringContainsString>
169+
<!--compare date of order with date of purchase-->
170+
<assertStringContainsString stepKey="checkingFirstOrderDateWithDefaultInterfaceLocale1">
171+
<expectedResult type="variable">generateDateAtFirstOrderTime</expectedResult>
172+
<actualResult type="variable">grabPurchaseDateForFirstOrderInDefaultLocale</actualResult>
173+
</assertStringContainsString>
174+
<actionGroup ref="SearchAdminDataGridByKeywordActionGroup" stepKey="searchForSecondOrder">
175+
<argument name="keyword" value="{$grabSecondOrderNumber}"/>
176+
</actionGroup>
177+
<!--Get date from "Purchase Date" column-->
178+
<grabTextFrom selector="{{AdminOrdersGridSection.gridCell('1','Purchase Date')}}" stepKey="grabPurchaseDateForSecondOrderInDefaultLocale"/>
179+
<!--Get date and time in default locale (US)-->
180+
<executeJS function="return (new Date('{$grabPurchaseDateForSecondOrderInDefaultLocale}').toLocaleDateString('en-US',{month: 'short', day: 'numeric', year: 'numeric'} ))" stepKey="getDateMonthYearNameForSecondOrderInUS"/>
181+
<!--Checking Purchase Date with default "Interface Locale"-->
182+
<assertStringContainsString stepKey="checkingSecondOrderDateWithDefaultInterfaceLocale">
183+
<expectedResult type="variable">getDateMonthYearNameForSecondOrderInUS</expectedResult>
184+
<actualResult type="variable">grabPurchaseDateForSecondOrderInDefaultLocale</actualResult>
185+
</assertStringContainsString>
186+
<!--compare date of order with date of purchase-->
187+
<assertStringContainsString stepKey="checkingSecondOrderDateWithPurchaseDate">
188+
<expectedResult type="variable">generateDateAtSecondOrderTime</expectedResult>
189+
<actualResult type="variable">grabPurchaseDateForFirstOrderInDefaultLocale</actualResult>
190+
</assertStringContainsString>
191+
</test>
192+
</tests>

0 commit comments

Comments
 (0)