Skip to content

Commit 4d55920

Browse files
arnobsharnobsh
committed
ACP2E-1104: UI issue in Order Total Report Date picker
- without test
1 parent 82ecd9d commit 4d55920

File tree

4 files changed

+71
-1
lines changed

4 files changed

+71
-1
lines changed

‎app/code/Magento/Reports/Test/Mftf/ActionGroup/AdminVerifyOrdersTotalDatePickerActionGroup.xml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminVerifyOrdersTotalDatePickerActionGroup">
12+
<annotations>
13+
<description>Clicks on 'FROM' and 'TO' From Date Picker.Verify the calendar UI does not show any button text after selecting date.</description>
14+
</annotations>
15+
<!-- Verify From Date Picker Does Not Show Button Text -->
16+
<click selector="{{OrderReportMainSection.fromDatePicker}}" stepKey="clickFromDatePicker"/>
17+
<waitForElementVisible selector="{{OrderReportMainSection.datePickerCalendar}}" stepKey="seePopupDatePicker1"/>
18+
<click selector="{{OrderReportMainSection.selectTodayButton}}" stepKey="clickOnTodayButton1"/>
19+
<click selector="{{OrderReportMainSection.selectCloseButton}}" stepKey="clickOnCloseButton1"/>
20+
<see selector="{{OrderReportMainSection.fromDatePickerText}}" userInput="" stepKey="seeAssertNoFromButtonTextMessage"/>
21+
<!-- Verify To Date Picker Does Not Show Button Text -->
22+
<click selector="{{OrderReportMainSection.toDatePicker}}" stepKey="clickToDatePicker"/>
23+
<waitForElementVisible selector="{{OrderReportMainSection.datePickerCalendar}}" stepKey="seePopupDatePicker2"/>
24+
<click selector="{{OrderReportMainSection.selectTodayButton}}" stepKey="clickOnTodayButton2"/>
25+
<click selector="{{OrderReportMainSection.selectCloseButton}}" stepKey="clickOnCloseButton2"/>
26+
<see selector="{{OrderReportMainSection.toDatePickerText}}" userInput="" stepKey="seeAssertNoToButtonTextMessage"/>
27+
</actionGroup>
28+
</actionGroups>

‎app/code/Magento/Reports/Test/Mftf/Section/OrderReportMainSection/OrderReportMainSection.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,12 @@
1010
<section name="OrderReportMainSection">
1111
<element name="showReport" type="button" selector="#filter_form_submit" timeout="60"/>
1212
<element name="here" type="text" selector="//a[contains(text(), 'here')]" timeout="60"/>
13+
<element name="datePickerCalendar" type="text" selector="table.ui-datepicker-calendar"/>
14+
<element name="selectTodayButton" type="button" selector="button.ui-datepicker-current"/>
15+
<element name="selectCloseButton" type="button" selector="button.ui-datepicker-close"/>
16+
<element name="fromDatePicker" type="button" selector="//input[@name='report_from']/following-sibling::button"/>
17+
<element name="fromDatePickerText" type="text" selector="span#gridTotalsCustomer_period_date_from_advice"/>
18+
<element name="toDatePicker" type="button" selector="//input[@name='report_to']/following-sibling::button"/>
19+
<element name="toDatePickerText" type="text" selector="span#gridTotalsCustomer_period_date_to_advice"/>
1320
</section>
1421
</sections>

‎app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderTotalDatePickerTest.xml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
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="AdminReportsOrderTotalDatePickerTest">
12+
<annotations>
13+
<features value="Reports"/>
14+
<stories value="Calendar Date Button"/>
15+
<title value="UI issue in Order Total Report Date picker"/>
16+
<description value="Admin should be able to navigate to Reports > Order Total. And select the From/To date picker and select the date.
17+
The UI will not show 'Select Date' text"/>
18+
<severity value="AVERAGE"/>
19+
<testCaseId value="ACP2E-1104"/>
20+
<useCaseId value="AC-6529"/>
21+
</annotations>
22+
<before>
23+
<actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
24+
</before>
25+
<after>
26+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
27+
</after>
28+
<actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToReportsOrderTotalPage">
29+
<argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
30+
<argument name="submenuUiId" value="{{AdminMenuReportsCustomersOrderTotal.dataUiId}}"/>
31+
</actionGroup>
32+
<actionGroup ref="AdminVerifyOrdersTotalDatePickerActionGroup" stepKey="verifyDatePickerDoesNotShowSelectButtonText">
33+
</actionGroup>
34+
</test>
35+
</tests>

‎app/code/Magento/Reports/view/adminhtml/templates/grid.phtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
7777
$("#{$block->escapeJs($block->getSuffixId('period_date_range'))}").dateRange({
7878
dateFormat:"{$block->escapeJs($block->getDateFormat())}",
79-
buttonText:"{$block->escapeJs(__('Select Date'))}",
79+
buttonText:"",
8080
from:{
8181
id:"{$block->escapeJs($block->getSuffixId('period_date_from'))}"
8282
},

0 commit comments

Comments
 (0)