Merge remote-tracking branch 'origin/MAGETWO-63175-Layered-Navigation' into Okapis-PR-8-15

Author: pdohogne-magento

app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php

@@ -175,6 +175,9 @@ public function getCurrencyRate()
      */
     protected function _renderRangeLabel($fromPrice, $toPrice)
     {
+        $fromPrice = empty($fromPrice) ? 0 : $fromPrice * $this->getCurrencyRate();
+        $toPrice = empty($toPrice) ? $toPrice : $toPrice * $this->getCurrencyRate();
+
         $formattedFromPrice = $this->priceCurrency->format($fromPrice);
         if ($toPrice === '') {
             return __('%1 and above', $formattedFromPrice);
@@ -261,10 +264,7 @@ private function prepareData($key, $count)
         if ($to == '*') {
             $to = $this->getTo($to);
         }
-        $label = $this->_renderRangeLabel(
-            empty($from) ? 0 : $from * $this->getCurrencyRate(),
-            empty($to) ? $to : $to * $this->getCurrencyRate()
-        );
+        $label = $this->_renderRangeLabel($from, $to);
         $value = $from . '-' . $to . $this->dataProvider->getAdditionalRequestData();
 
         $data = [

app/code/Magento/CatalogSearch/Test/Unit/Model/Layer/Filter/PriceTest.php

@@ -225,6 +225,7 @@ function ($field) use ($requestVar, $priceId) {
             ->with('price')
             ->will($this->returnSelf());
 
+        $this->target->setCurrencyRate(1);
         $this->target->apply($this->request);
     }
 

dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Layer/Filter/PriceTest.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\CatalogSearch\Model\Layer\Filter;
 
+use Magento\TestFramework\Helper\Bootstrap;
+
 /**
  * Test class for \Magento\CatalogSearch\Model\Layer\Filter\Price.
  *
@@ -19,26 +21,31 @@ class PriceTest extends \PHPUnit\Framework\TestCase
      */
     protected $_model;
 
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
     protected function setUp()
     {
-        $category = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        $this->objectManager = Bootstrap::getObjectManager();
+        $category = $this->objectManager->create(
             \Magento\Catalog\Model\Category::class
         );
         $category->load(4);
-        $layer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->get(\Magento\Catalog\Model\Layer\Category::class);
+        $layer = $this->objectManager->get(\Magento\Catalog\Model\Layer\Category::class);
         $layer->setCurrentCategory($category);
-        $this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create(\Magento\CatalogSearch\Model\Layer\Filter\Price::class, ['layer' => $layer]);
+        $this->_model = $this->objectManager->create(
+            \Magento\CatalogSearch\Model\Layer\Filter\Price::class,
+            ['layer' => $layer]
+        );
     }
 
     public function testApplyNothing()
     {
         $this->assertEmpty($this->_model->getData('price_range'));
-        /** @var $objectManager \Magento\TestFramework\ObjectManager */
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
         /** @var $request \Magento\TestFramework\Request */
-        $request = $objectManager->get(\Magento\TestFramework\Request::class);
+        $request = $this->objectManager->get(\Magento\TestFramework\Request::class);
         $this->_model->apply($request);
 
         $this->assertEmpty($this->_model->getData('price_range'));
@@ -47,10 +54,8 @@ public function testApplyNothing()
     public function testApplyInvalid()
     {
         $this->assertEmpty($this->_model->getData('price_range'));
-        /** @var $objectManager \Magento\TestFramework\ObjectManager */
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
         /** @var $request \Magento\TestFramework\Request */
-        $request = $objectManager->get(\Magento\TestFramework\Request::class);
+        $request = $this->objectManager->get(\Magento\TestFramework\Request::class);
         $request->setParam('price', 'non-numeric');
         $this->_model->apply($request);
 
@@ -62,12 +67,31 @@ public function testApplyInvalid()
      */
     public function testApplyManual()
     {
-        /** @var $objectManager \Magento\TestFramework\ObjectManager */
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
         /** @var $request \Magento\TestFramework\Request */
-        $request = $objectManager->get(\Magento\TestFramework\Request::class);
+        $request = $this->objectManager->get(\Magento\TestFramework\Request::class);
+        $request->setParam('price', '10-20');
+        $this->_model->apply($request);
+    }
+
+    /**
+     * Make sure that currency rate is used to calculate label for applied price filter
+     */
+    public function testApplyWithCustomCurrencyRate()
+    {
+        /** @var $request \Magento\TestFramework\Request */
+        $request = $this->objectManager->get(\Magento\TestFramework\Request::class);
+
         $request->setParam('price', '10-20');
+        $this->_model->setCurrencyRate(10);
+        
         $this->_model->apply($request);
+        
+        $filters = $this->_model->getLayer()->getState()->getFilters();
+        $this->assertArrayHasKey(0, $filters);
+        $this->assertEquals(
+            '<span class="price">$100.00</span> - <span class="price">$199.99</span>',
+            (string)$filters[0]->getLabel()
+        );
     }
 
     public function testGetSetCustomerGroupId()