Merge remote-tracking branch 'magento-tango/MC-18038' into PR-20190718

Author: bubasuma

app/code/Magento/CatalogRule/Pricing/Price/CatalogRulePrice.php

@@ -93,7 +93,7 @@ public function getValue()
             } else {
                 $this->value = $this->getRuleResource()
                     ->getRulePrice(
-                        $this->dateTime->scopeDate($this->storeManager->getStore()->getId()),
+                        $this->dateTime->date(null, null, false),
                         $this->storeManager->getStore()->getWebsiteId(),
                         $this->customerSession->getCustomerGroupId(),
                         $this->product->getId()

app/code/Magento/CatalogRule/Test/Unit/Pricing/Price/CatalogRulePriceTest.php

@@ -155,7 +155,6 @@ protected function setUp()
      */
     public function testGetValue()
     {
-        $coreStoreId = 1;
         $coreWebsiteId = 1;
         $productId = 1;
         $customerGroupId = 1;
@@ -164,15 +163,12 @@ public function testGetValue()
         $catalogRulePrice = 55.12;
         $convertedPrice = 45.34;
 
-        $this->coreStoreMock->expects($this->once())
-            ->method('getId')
-            ->will($this->returnValue($coreStoreId));
         $this->coreStoreMock->expects($this->once())
             ->method('getWebsiteId')
             ->will($this->returnValue($coreWebsiteId));
         $this->dataTimeMock->expects($this->once())
-            ->method('scopeDate')
-            ->with($this->equalTo($coreStoreId))
+            ->method('date')
+            ->with(null, null, false)
             ->will($this->returnValue($dateTime));
         $this->customerSessionMock->expects($this->once())
             ->method('getCustomerGroupId')