MAGETWO-70327: Customer admin grid incorrectly filters by Date of Birth field

Author: slopukhov

app/code/Magento/Braintree/Test/Unit/Ui/Component/Report/Filters/Type/DateRangeTest.php

@@ -69,18 +69,14 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->dataProviderMock = $this->getMockForAbstractClass(DataProviderInterface::class);
-
         $this->contextMock->expects($this->any())
             ->method('getNamespace')
             ->willReturn(DateRange::NAME);
         $this->contextMock->expects($this->any())
             ->method('addComponentDefinition')
             ->with(DateRange::NAME, ['extends' => DateRange::NAME]);
 
-        $this->contextMock->expects($this->any())
-            ->method('getDataProvider')
-            ->willReturn($this->dataProviderMock);
+        $this->dataProviderMock = $this->getMockForAbstractClass(DataProviderInterface::class);
     }
 
     /**
@@ -95,16 +91,21 @@ protected function setUp()
      */
     public function testPrepare($name, $filterData, $expectedCondition)
     {
-        $this->contextMock->expects($this->any())
-            ->method('getFiltersParams')
-            ->willReturn($filterData);
-
+        /** @var FormDate PHPUnit_Framework_MockObject_MockObject|$uiComponent */
         $uiComponent = $this->getMockBuilder(FormDate::class)->disableOriginalConstructor()->getMock();
 
         $uiComponent->expects($this->any())
             ->method('getContext')
             ->willReturn($this->contextMock);
 
+        $this->contextMock->expects($this->any())
+            ->method('getFiltersParams')
+            ->willReturn($filterData);
+
+        $this->contextMock->expects($this->any())
+            ->method('getDataProvider')
+            ->willReturn($this->dataProviderMock);
+
         if ($expectedCondition !== null) {
             if (is_string($filterData[$name])) {
                 $uiComponent->expects(static::once())
@@ -115,11 +116,11 @@ public function testPrepare($name, $filterData, $expectedCondition)
                 $uiComponent->method('convertDate')
                     ->willReturnMap([
                         [
-                            $filterData[$name]['from'],
+                            $filterData[$name]['from'], 0, 0, 0, true,
                             new \DateTime($filterData[$name]['from'], new \DateTimeZone('UTC'))
                         ],
                         [
-                            $filterData[$name]['to'],
+                            $filterData[$name]['to'], 23, 59, 59, true,
                             new \DateTime($filterData[$name]['to'] . ' 23:59:00', new \DateTimeZone('UTC'))
                         ],
                     ]);
@@ -158,23 +159,6 @@ public function testPrepare($name, $filterData, $expectedCondition)
                         ->with($filterMock);
                     break;
             }
-        } else {
-            $uiComponent->method('convertDate')
-                ->willReturnMap([
-                    [
-                        $filterData[$name]['from'],
-                        new \DateTime($filterData[$name]['from'], new \DateTimeZone('UTC'))
-                    ],
-                    [
-                        $filterData[$name]['to'],
-                        new \DateTime($filterData[$name]['to'] . ' 23:59:00', new \DateTimeZone('UTC'))
-                    ],
-                ]);
-
-            $filterMock = $this->getFilterMockWithoutExpectedCondition();
-            $this->dataProviderMock->expects(static::exactly(2))
-                ->method('addFilter')
-                ->with($filterMock);
         }
 
         $this->uiComponentFactory->expects($this->any())
@@ -226,31 +210,6 @@ private function getFilterMock($name, $expectedType, $expectedDate, &$i)
         return $filterMock;
     }
 
-    /**
-     * Gets Filter mock without expected condition
-     *
-     * @return Filter|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private function getFilterMockWithoutExpectedCondition()
-    {
-        $this->filterBuilderMock->expects(static::exactly(2))
-            ->method('setConditionType')
-            ->willReturnSelf();
-        $this->filterBuilderMock->expects(static::exactly(2))
-            ->method('setField')
-            ->willReturnSelf();
-        $this->filterBuilderMock->expects(static::exactly(2))
-            ->method('setValue')
-            ->willReturnSelf();
-
-        $filterMock = $this->getMock(Filter::class);
-        $this->filterBuilderMock->expects(static::exactly(2))
-            ->method('create')
-            ->willReturn($filterMock);
-
-        return $filterMock;
-    }
-
     /**
      * @return array
      */

app/code/Magento/Ui/Test/Unit/Component/Filters/Type/DateTest.php

@@ -126,30 +126,6 @@ public function testPrepare($name, $filterData, $expectedCondition)
 
         if ($expectedCondition !== null) {
             $this->processFilters($name, $filterData, $expectedCondition, $uiComponent);
-        } else {
-            $uiComponent->method('convertDate')
-                ->willReturnMap([
-                    [$filterData[$name]['from'], new \DateTime($filterData[$name]['from'])],
-                    [$filterData[$name]['to'], new \DateTime($filterData[$name]['to'] . ' 23:59:59')],
-                ]);
-
-            $this->filterBuilderMock->expects(static::exactly(2))
-                ->method('setConditionType')
-                ->willReturnSelf();
-            $this->filterBuilderMock->expects(static::exactly(2))
-                ->method('setField')
-                ->willReturnSelf();
-            $this->filterBuilderMock->expects(static::exactly(2))
-                ->method('setValue')
-                ->willReturnSelf();
-
-            $filterMock = $this->getMock(Filter::class);
-            $this->filterBuilderMock->expects(static::exactly(2))
-                ->method('create')
-                ->willReturn($filterMock);
-            $this->dataProviderMock->expects(static::exactly(2))
-                ->method('addFilter')
-                ->with($filterMock);
         }
 
         $this->uiComponentFactory->expects($this->any())
@@ -252,10 +228,12 @@ private function processFilters($name, $filterData, $expectedCondition, $uiCompo
                 ->with($filterData[$name])
                 ->willReturn(new \DateTime($filterData[$name]));
         } else {
+            $from = new \DateTime($filterData[$name]['from']);
+            $to = new \DateTime($filterData[$name]['to'] . ' 23:59:59');
             $uiComponent->method('convertDate')
                 ->willReturnMap([
-                    [$filterData[$name]['from'], new \DateTime($filterData[$name]['from'])],
-                    [$filterData[$name]['to'], new \DateTime($filterData[$name]['to'] . ' 23:59:59')],
+                    [$filterData[$name]['from'], 0, 0, 0, true, $from],
+                    [$filterData[$name]['to'], 23, 59, 59, true, $to],
                 ]);
         }