From 8f1020af9f5cca737bb24696769f7eb81958556a Mon Sep 17 00:00:00 2001
From: Jack Krielen <jackkrielen@bluebirdday.nl>
Date: Wed, 15 Apr 2020 19:39:19 +0200
Subject: [PATCH] Fix testing.

---
 .../Unit/Block/Product/View/Type/ConfigurableTest.php    | 9 +++++++++
 .../Product/Type/Configurable/Variations/PricesTest.php  | 7 +++++--
 .../Block/Product/Renderer/Configurable/PriceTest.php    | 3 +++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Product/View/Type/ConfigurableTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Product/View/Type/ConfigurableTest.php
index 36fda4ef3245c..7fd66541adc7b 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Product/View/Type/ConfigurableTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Product/View/Type/ConfigurableTest.php
@@ -323,6 +323,9 @@ public function testGetJsonConfig()
             ->with($priceInfoMock)
             ->willReturn(
                 [
+                    'baseOldPrice' => [
+                        'amount' => $amount,
+                    ],
                     'oldPrice' => [
                         'amount' => $amount,
                     ],
@@ -362,6 +365,9 @@ private function getExpectedArray($productId, $amount, $priceQty, $percentage):
             'currencyFormat' => '%s',
             'optionPrices' => [
                 $productId => [
+                    'baseOldPrice' => [
+                        'amount' => $amount,
+                    ],
                     'oldPrice' => [
                         'amount' => $amount,
                     ],
@@ -385,6 +391,9 @@ private function getExpectedArray($productId, $amount, $priceQty, $percentage):
             ],
             'priceFormat' => [],
             'prices' => [
+                'baseOldPrice' => [
+                    'amount' => $amount,
+                ],
                 'oldPrice' => [
                     'amount' => $amount,
                 ],
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/Configurable/Variations/PricesTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/Configurable/Variations/PricesTest.php
index b4e7689498fe6..cab1e8f45e659 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/Configurable/Variations/PricesTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/Configurable/Variations/PricesTest.php
@@ -33,6 +33,9 @@ protected function setUp()
     public function testGetFormattedPrices()
     {
         $expected = [
+            'baseOldPrice' => [
+                'amount' => 1000
+            ],
             'oldPrice' => [
                 'amount' => 500
             ],
@@ -54,8 +57,8 @@ public function testGetFormattedPrices()
 
         $this->localeFormatMock->expects($this->atLeastOnce())
             ->method('getNumber')
-            ->withConsecutive([500], [1000], [500])
-            ->will($this->onConsecutiveCalls(500, 1000, 500));
+            ->withConsecutive([1000],[500], [1000], [500])
+            ->will($this->onConsecutiveCalls(1000,500, 1000, 500));
 
         $this->assertEquals($expected, $this->model->getFormattedPrices($priceInfoMock));
     }
diff --git a/dev/tests/integration/testsuite/Magento/Swatches/Block/Product/Renderer/Configurable/PriceTest.php b/dev/tests/integration/testsuite/Magento/Swatches/Block/Product/Renderer/Configurable/PriceTest.php
index 2c5bf805f92de..75834b8ba6c28 100644
--- a/dev/tests/integration/testsuite/Magento/Swatches/Block/Product/Renderer/Configurable/PriceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Swatches/Block/Product/Renderer/Configurable/PriceTest.php
@@ -116,6 +116,7 @@ public function childProductsDataProvider(): array
                 ],
                 'expected_data' => [
                     [
+                        'baseOldPrice' => ['amount' => 150],
                         'oldPrice' => ['amount' => 150],
                         'basePrice' => ['amount' => 50],
                         'finalPrice' => ['amount' => 50],
@@ -123,6 +124,7 @@ public function childProductsDataProvider(): array
                         'msrpPrice' => ['amount' => null],
                     ],
                     [
+                        'baseOldPrice' => ['amount' => 150],
                         'oldPrice' => ['amount' => 150],
                         'basePrice' => ['amount' => 58.55],
                         'finalPrice' => ['amount' => 58.55],
@@ -130,6 +132,7 @@ public function childProductsDataProvider(): array
                         'msrpPrice' => ['amount' => null],
                     ],
                     [
+                        'baseOldPrice' => ['amount' => 150],
                         'oldPrice' => ['amount' => 150],
                         'basePrice' => ['amount' => 75],
                         'finalPrice' => ['amount' => 75],