Merge branch 'MAGETWO-57835' of github.com:magento-troll/magento2ce into PR_Troll

Author: slopukhov

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

@@ -126,6 +126,30 @@ 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())
@@ -230,8 +254,8 @@ private function processFilters($name, $filterData, $expectedCondition, $uiCompo
         } else {
             $uiComponent->method('convertDate')
                 ->willReturnMap([
-                    [$filterData[$name]['from'], 0, 0, 0, new \DateTime($filterData[$name]['from'])],
-                    [$filterData[$name]['to'], 23, 59, 59, new \DateTime($filterData[$name]['to'] . ' 23:59:59')],
+                    [$filterData[$name]['from'], new \DateTime($filterData[$name]['from'])],
+                    [$filterData[$name]['to'], new \DateTime($filterData[$name]['to'] . ' 23:59:59')],
                 ]);
         }