File tree Expand file tree Collapse file tree 4 files changed +7
-6
lines changed
Component/Listing/Columns
view/base/web/js/grid/columns Expand file tree Collapse file tree 4 files changed +7
-6
lines changed Original file line number Diff line number Diff line change 14
14
</arguments >
15
15
<!-- Navigate to admin System Account Page-->
16
16
<amOnPage url =" {{AdminSystemAccountPage.url}}" stepKey =" openAdminSystemAccountPage" />
17
- <waitForPageLoad stepKey =" loadAdminSystemAccountPage" />
18
- <!-- Change Admin locale to Français (France) / French (France) -->
17
+ <waitForElementVisible selector =" {{AdminSystemAccountSection.interfaceLocale}}" stepKey =" waitForInterfaceLocale" />
19
18
<selectOption userInput =" {{InterfaceLocaleByValue}}" selector =" {{AdminSystemAccountSection.interfaceLocale}}" stepKey =" setInterfaceLocate" />
20
19
<fillField selector =" {{AdminSystemAccountSection.currentPassword}}" userInput =" {{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey =" fillPassword" />
21
- <click selector =" {{AdminCustomerMainActionsSection.saveButton }}" stepKey =" clickSave" />
20
+ <click selector =" {{AdminMainActionsSection.save }}" stepKey =" clickSave" />
22
21
<waitForElement selector =" {{AdminCustomerMessagesSection.successMessage}}" stepKey =" waitSuccessMessage" />
22
+ <see selector =" {{AdminCustomerMessagesSection.successMessage}}" userInput =" You saved the account." stepKey =" seeSuccessMessage" />
23
23
</actionGroup >
24
24
</actionGroups >
Original file line number Diff line number Diff line change 9
9
<sections xmlns : xsi =" http://www.w3.org/2001/XMLSchema-instance"
10
10
xsi : noNamespaceSchemaLocation =" urn:magento:mftf:Page/etc/SectionObject.xsd" >
11
11
<section name =" AdminSystemAccountSection" >
12
- <element name =" interfaceLocale" type =" text " selector =" #interface_locale" />
12
+ <element name =" interfaceLocale" type =" select " selector =" #interface_locale" />
13
13
<element name =" currentPassword" type =" text" selector =" #current_password" />
14
14
</section >
15
15
</sections >
Original file line number Diff line number Diff line change @@ -52,10 +52,10 @@ class Date extends Column
52
52
* @param UiComponentFactory $uiComponentFactory
53
53
* @param TimezoneInterface $timezone
54
54
* @param BooleanUtils $booleanUtils
55
- * @param ResolverInterface $localeResolver
56
- * @param DataBundle $dataBundle
57
55
* @param array $components
58
56
* @param array $data
57
+ * @param ResolverInterface $localeResolver
58
+ * @param DataBundle $dataBundle
59
59
*/
60
60
public function __construct (
61
61
ContextInterface $ context ,
Original file line number Diff line number Diff line change @@ -39,6 +39,7 @@ define([
39
39
*/
40
40
getLabel : function ( value , format ) {
41
41
var date ;
42
+
42
43
if ( this . storeLocale !== undefined ) {
43
44
moment . locale ( this . storeLocale , utils . extend ( { } , this . calendarConfig ) ) ;
44
45
}
You can’t perform that action at this time.
0 commit comments