MC-13732: Mainline test failure Magento\Reports\Test\TestCase\SalesOrderReportEntityTest

Author: viktorpetryk

dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertReportStatisticsNoticeMessage.php

@@ -7,8 +7,6 @@
 namespace Magento\Reports\Test\Constraint;
 
 use Magento\Reports\Test\Page\Adminhtml\SalesReport;
-use Magento\Sales\Test\Fixture\OrderInjectable;
-use DateTime;
 
 /**
  * Assert that message in Sales Reports Pages displays correct date/time.
@@ -27,23 +25,22 @@ class AssertReportStatisticsNoticeMessage extends AbstractAssertSalesReportResul
      *
      * @param array $salesReport
      * @param SalesReport $salesReportPage
-     * @param DateTime $currentDate
      * @return void
      */
     public function processAssert(
         array $salesReport,
-        SalesReport $salesReportPage,
-        DateTime $currentDate
+        SalesReport $salesReportPage
     ) {
+        $timezone = new \DateTimeZone($_ENV['magento_timezone']);
+        $initialDate = new \DateTime('now', $timezone);
         $this->salesReportPage = $salesReportPage;
         $this->searchInSalesReportGrid($salesReport);
-        $date = $this->getLastUpdatedDate();
-        $currentDate->setTimezone(new \DateTimeZone($_ENV['magento_timezone']));
-        $currentDateTime = $currentDate->format('M j, Y, g');
-        $displayedDateTime = date('M j, Y, g', strtotime($date));
-        \PHPUnit\Framework\Assert::assertEquals(
-            $currentDateTime,
-            $displayedDateTime,
+        $displayedDate = new \DateTime($this->getLastUpdatedDate(), $timezone);
+        $currentDate = new \DateTime('now', $timezone);
+
+        \PHPUnit\Framework\Assert::assertTrue(
+            $displayedDate->getTimestamp() > $initialDate->getTimestamp()
+            && $displayedDate->getTimestamp() < $currentDate->getTimestamp(),
             "Message in Sales Reports Page is displayed in an incorrect timezone."
         );
     }