From 6e060e8ef03da150fba251e73f378b8241b3403b Mon Sep 17 00:00:00 2001
From: neeta-wagento <neeta@wagento.com>
Date: Mon, 8 Jan 2018 14:46:43 +0530
Subject: [PATCH] resolve test issues
---
.../MinimumOrderAmount/ValidationMessage.php | 4 ++--
.../ValidationMessageTest.php | 19 +++----------------
2 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/app/code/Magento/Quote/Model/Quote/Validator/MinimumOrderAmount/ValidationMessage.php b/app/code/Magento/Quote/Model/Quote/Validator/MinimumOrderAmount/ValidationMessage.php
index 791775d1108..38bfcbf1d30 100644
--- a/app/code/Magento/Quote/Model/Quote/Validator/MinimumOrderAmount/ValidationMessage.php
+++ b/app/code/Magento/Quote/Model/Quote/Validator/MinimumOrderAmount/ValidationMessage.php
@@ -37,8 +37,8 @@ class ValidationMessage
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Store\Model\StoreManagerInterface $storeManager,
- \Magento\Framework\Locale\CurrencyInterface $currency = null,
- \Magento\Framework\Pricing\Helper\Data $priceHelper
+ \Magento\Framework\Locale\CurrencyInterface $currency,
+ \Magento\Framework\Pricing\Helper\Data $priceHelper = null
) {
$this->scopeConfig = $scopeConfig;
$this->storeManager = $storeManager;
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/Validator/MinimumOrderAmount/ValidationMessageTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/Validator/MinimumOrderAmount/ValidationMessageTest.php
index fe27aa7c15f..65768b08c37 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/Quote/Validator/MinimumOrderAmount/ValidationMessageTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/Quote/Validator/MinimumOrderAmount/ValidationMessageTest.php
@@ -21,7 +21,6 @@ class ValidationMessageTest extends \PHPUnit\Framework\TestCase
/**
* @var \PHPUnit_Framework_MockObject_MockObject
- * @deprecated since 101.0.0
*/
private $storeManagerMock;
@@ -55,29 +54,17 @@ class ValidationMessageTest extends \PHPUnit\Framework\TestCase
{
$minimumAmount = 20;
$minimumAmountCurrency = '$20';
- $currencyCode = 'currency_code';
+ $this->scopeConfigMock->expects($this->at(0))->method('getValue')->with('sales/minimum_order/description', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)->willReturn(null);
- $this->scopeConfigMock->expects($this->at(0))
- ->method('getValue')
- ->with('sales/minimum_order/description', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
- ->willReturn(null);
-
- $this->scopeConfigMock->expects($this->at(1))
- ->method('getValue')
- ->with('sales/minimum_order/amount', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
- ->willReturn($minimumAmount);
+ $this->scopeConfigMock->expects($this->at(1))->method('getValue')->with('sales/minimum_order/amount', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)->willReturn($minimumAmount);
$this->priceHelperMock->expects($this->once())
->method('currency')
->with($minimumAmount, true, false)
->will($this->returnValue($minimumAmountCurrency));
- $this->assertEquals(
- __('Minimum order amount is %1', $minimumAmountCurrency),
- $this->model->getMessage()
- );
+ $this->assertEquals(__('Minimum order amount is %1', $minimumAmountCurrency), $this->model->getMessage());
}
-
public function testGetConfigMessage()
{
$configMessage = 'config_message';
--
GitLab