Merge remote-tracking branch 'origin/FearlessKiwis-MAGETWO-44078-skip_adjustments' into FearlessKiwis-develop-no-refactoring

Author: Yu Tang

lib/internal/Magento/Framework/Pricing/Render/Amount.php

@@ -171,24 +171,18 @@ public function getAdjustmentsHtml()
      */
     protected function _toHtml()
     {
-        $adjustmentRenders = $this->getApplicableAdjustmentRenders();
+        $adjustmentRenders = $this->getAdjustmentRenders();
         if ($adjustmentRenders) {
-            $this->adjustmentsHtml = $this->getAdjustments($adjustmentRenders);
+            $adjustmentHtml = $this->getAdjustments($adjustmentRenders);
+            if (!$this->hasSkipAdjustments() ||
+                ($this->hasSkipAdjustments() && $this->getSkipAdjustments() == false)) {
+                $this->adjustmentsHtml = $adjustmentHtml;
+            }
         }
         $html = parent::_toHtml();
         return $html;
     }
 
-    /**
-     * Collect correspondent Price Adjustment Renders
-     *
-     * @return AdjustmentRenderInterface[]
-     */
-    protected function getApplicableAdjustmentRenders()
-    {
-        return (!$this->hasSkipAdjustments()) ? $this->getAdjustmentRenders() : [];
-    }
-
     /**
      * @return AdjustmentRenderInterface[]
      */

lib/internal/Magento/Framework/Pricing/Test/Unit/Render/AmountTest.php

@@ -138,14 +138,57 @@ public function testGetDisplayCurrencySymbol()
 
     /**
      * Test case for getAdjustmentRenders method through toHtml()
+     *
+     * @param bool $hasSkipAdjustments
+     * @param bool|null $skipAdjustments
+     * @param string $expected
+     * @dataProvider dataProviderToHtmlSkipAdjustments
      */
-    public function testToHtmlSkipAdjustments()
+    public function testToHtmlSkipAdjustments($hasSkipAdjustments, $skipAdjustments, $expected)
     {
-        $this->model->setData('skip_adjustments', true);
-        $this->rendererPool->expects($this->never())
-            ->method('getAdjustmentRenders');
+        if ($hasSkipAdjustments) {
+            $this->model->setData('skip_adjustments', $skipAdjustments);
+            $expectedData = [
+                'key1' => 'data1',
+                'css_classes' => 'class1 class2',
+                'module_name' => null,
+                'adjustment_css_classes' => 'class1 class2 render1 render2',
+                'skip_adjustments' => $skipAdjustments
+            ];
+        } else {
+            $expectedData = [
+                'key1'                   => 'data1',
+                'css_classes'            => 'class1 class2',
+                'module_name'            => null,
+                'adjustment_css_classes' => 'class1 class2 render1 render2',
+            ];
+        }
+
+        $this->model->setData('key1', 'data1');
+        $this->model->setData('css_classes', 'class1 class2');
+
+        $adjustmentRender1 = $this->getAdjustmentRenderMock($expectedData, 'html');
+        $adjustmentRender2 = $this->getAdjustmentRenderMock($expectedData);
+        $adjustmentRenders = ['render1' => $adjustmentRender1, 'render2' => $adjustmentRender2];
+        $this->rendererPool->expects($this->once())
+            ->method('getAdjustmentRenders')
+            ->will($this->returnValue($adjustmentRenders));
 
         $this->model->toHtml();
+        $this->assertEquals($expected, $this->model->getAdjustmentsHtml());
+    }
+
+    /**
+     * @return array
+     */
+    public function dataProviderToHtmlSkipAdjustments()
+    {
+        return [
+            [false, null, 'html'],
+            [false, null, 'html'],
+            [true, false, 'html'],
+            [true, true, ''],
+        ];
     }
 
     /**