Skip to content

Commit 8d154af

Browse files
committed
MC-32993: [2.3.5] Magento.Backend.Block.Dashboard.Tab.OrdersTest.testGetChartUrl failed after Daylight saving time
1 parent 0d1635a commit 8d154af

File tree

1 file changed

+27
-8
lines changed
  • dev/tests/integration/testsuite/Magento/Backend/Block/Dashboard/Tab

1 file changed

+27
-8
lines changed

dev/tests/integration/testsuite/Magento/Backend/Block/Dashboard/Tab/OrdersTest.php

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,18 @@ protected function setUp()
4949
* @magentoDataFixture Magento/Sales/_files/order_list_with_invoice.php
5050
* @dataProvider chartUrlDataProvider
5151
* @param string $period
52-
* @param string $expectedAxisRange
5352
* @return void
5453
*/
55-
public function testGetChartUrl(string $period, string $expectedAxisRange): void
54+
public function testGetChartUrl(string $period): void
5655
{
5756
$this->graphBlock->getRequest()->setParams(['period' => $period]);
57+
/** @var Orders $ordersBlock */
5858
$ordersBlock = $this->layout->createBlock(Orders::class);
5959
$decodedChartUrl = urldecode($ordersBlock->getChartUrl());
60-
$this->assertEquals($expectedAxisRange, $this->getUrlParamData($decodedChartUrl, 'chxr'));
60+
$this->assertEquals(
61+
$this->getExpectedAxisRange($ordersBlock),
62+
$this->getUrlParamData($decodedChartUrl, 'chxr')
63+
);
6164
}
6265

6366
/**
@@ -66,11 +69,11 @@ public function testGetChartUrl(string $period, string $expectedAxisRange): void
6669
public function chartUrlDataProvider(): array
6770
{
6871
return [
69-
'Last 24 Hours' => ['24h', '1,0,2,1'],
70-
'Last 7 Days' => ['7d', '1,0,3,1'],
71-
'Current Month' => ['1m', '1,0,3,1'],
72-
'YTD' => ['1y', '1,0,4,1'],
73-
'2YTD' => ['2y', '1,0,4,1'],
72+
'Last 24 Hours' => ['24h'],
73+
'Last 7 Days' => ['7d'],
74+
'Current Month' => ['1m'],
75+
'YTD' => ['1y'],
76+
'2YTD' => ['2y'],
7477
];
7578
}
7679

@@ -91,4 +94,20 @@ private function getUrlParamData(string $chartUrl, string $paramName): string
9194

9295
return '';
9396
}
97+
98+
/**
99+
* @param Orders $ordersBlock
100+
* @return string
101+
*/
102+
private function getExpectedAxisRange(Orders $ordersBlock): string
103+
{
104+
$dashboardOrders = $ordersBlock->getDataHelper()->getItems();
105+
$ordersQty = array_map(function ($order) {
106+
return $order->getQuantity();
107+
}, $dashboardOrders);
108+
109+
$axisPeak = max(array_values($ordersQty)) + 1;
110+
111+
return "1,0,{$axisPeak},1";
112+
}
94113
}

0 commit comments

Comments
 (0)