Skip to content

Commit 9f9b35d

Browse files
committed
MC-40240: Product grid date filters does not work for en_GB locale
1 parent fb38d86 commit 9f9b35d

File tree

2 files changed

+22
-6
lines changed

2 files changed

+22
-6
lines changed

app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridFilteringByDateWithCustomLocaleTest.xml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,19 @@
2020
</annotations>
2121

2222
<before>
23+
<!-- Deploy static content with United Kingdom locale-->
24+
<magentoCLI command="setup:static-content:deploy en_GB" stepKey="deployStaticContentWithUnitedKingdomLocale"/>
2325
<createData entity="_defaultCategory" stepKey="createCategory"/>
2426
<createData entity="SimpleProduct" stepKey="createProduct">
2527
<requiredEntity createDataKey="createCategory"/>
2628
</createData>
2729

2830
<!-- Create new User -->
2931
<actionGroup ref="AdminLoginActionGroup" stepKey="adminLogin"/>
30-
<actionGroup ref="AdminCreateUserWithRoleActionGroup" stepKey="createAdminUser">
32+
<actionGroup ref="AdminCreateUserWithRoleAndLocaleActionGroup" stepKey="createAdminUser">
3133
<argument name="user" value="activeAdmin"/>
3234
<argument name="role" value="roleDefaultAdministrator"/>
35+
<argument name="interfaceLocale" value="en_GB"/>
3336
</actionGroup>
3437
</before>
3538
<after>
@@ -86,11 +89,6 @@
8689
<argument name="password" value="{{activeAdmin.password}}"/>
8790
</actionGroup>
8891

89-
<!--Set Admin "Interface Locale" to "English (United Kingdom)"-->
90-
<actionGroup ref="SetAdminAccountActionGroup" stepKey="setAdminInterfaceLocaleToFrance">
91-
<argument name="InterfaceLocaleByValue" value="en_GB"/>
92-
</actionGroup>
93-
9492
<!-- Open Product Index Page and filter the product -->
9593
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex2"/>
9694
<actionGroup ref="FilterProductGridByCustomDateRangeActionGroup" stepKey="filterProductGridByCustomDateRange">
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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+
<!-- Create new user with role and locale setting-->
11+
<actionGroup name="AdminCreateUserWithRoleAndLocaleActionGroup" extends="AdminCreateUserWithRoleActionGroup">
12+
<arguments>
13+
<argument name="interfaceLocale" defaultValue="en_US" type="string"/>
14+
</arguments>
15+
16+
<selectOption selector="{{AdminNewUserFormSection.interfaceLocale}}" userInput="{{interfaceLocale}}" stepKey="setInterfaceLocate" after="confirmPassword"/>
17+
</actionGroup>
18+
</actionGroups>

0 commit comments

Comments
 (0)