diff --git a/app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php b/app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php
index f42a6cec05975f100e8affe4fd145cc6a32e4cca..ff9351925c13943ec85d14753593c0706324bc29 100644
--- a/app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php
+++ b/app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php
@@ -182,6 +182,7 @@ class Currencysymbol
unset($symbols[$code]);
}
}
+ $value = [];
if ($symbols) {
$value['options']['fields']['customsymbol']['value'] = serialize($symbols);
} else {
@@ -319,6 +320,6 @@ class Currencysymbol
}
}
}
- return ksort($allowedCurrencies);
+ return array_unique($allowedCurrencies);
}
}
diff --git a/app/code/Magento/CurrencySymbol/Test/Unit/Model/System/CurrencysymbolTest.php b/app/code/Magento/CurrencySymbol/Test/Unit/Model/System/CurrencysymbolTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..2d4f08eabd86e3781a46864fdbc2878588904d01
--- /dev/null
+++ b/app/code/Magento/CurrencySymbol/Test/Unit/Model/System/CurrencysymbolTest.php
@@ -0,0 +1,333 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\CurrencySymbol\Test\Unit\Model\System;
+
+use Magento\CurrencySymbol\Model\System\Currencysymbol;
+use Magento\Store\Model\ScopeInterface;
+
+/**
+ * Class CurrencysymbolTest
+ */
+class CurrencysymbolTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * Object manager helper
+ *
+ * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+ */
+ protected $objectManagerHelper;
+
+ /**
+ * @var \Magento\Framework\Locale\ResolverInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $localeResolverMock;
+
+ /**
+ * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $scopeConfigMock;
+
+ /**
+ * @var \Magento\Store\Model\System\Store|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $systemStoreMock;
+
+ /**
+ * @var \Magento\Store\Model\Website|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $websiteMock;
+
+ /**
+ * @var \Magento\Store\Model\Group|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $groupMock;
+
+ /**
+ * @var \Magento\Store\Model\Store|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $storeMock;
+
+ /**
+ * @var \Magento\Config\Model\Config\Factory|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $configFactoryMock;
+
+ /**
+ * @var \Magento\Config\Model\Config|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $configMock;
+
+ /**
+ * @var \Magento\Framework\Event\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $eventManagerMock;
+
+ /**
+ * @var \Magento\Framework\App\Config\ReinitableConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $coreConfigMock;
+
+ /**
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $storeManagerMock;
+
+ /**
+ * @var \Magento\Framework\App\Cache\TypeListInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $cacheTypeListMock;
+
+ /**
+ * @var \Magento\CurrencySymbol\Model\System\Currencysymbol
+ */
+ protected $model;
+
+ protected function setUp()
+ {
+ $this->objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+ $this->scopeConfigMock = $this->getMock(
+ 'Magento\Framework\App\Config\ScopeConfigInterface',
+ ['getValue', 'isSetFlag'],
+ [],
+ '',
+ false
+ );
+ $this->localeResolverMock = $this->getMock(
+ 'Magento\Framework\Locale\ResolverInterface',
+ [
+ 'getLocale',
+ 'getDefaultLocalePath',
+ 'setDefaultLocale',
+ 'getDefaultLocale',
+ 'setLocale',
+ 'emulate',
+ 'revert'
+ ],
+ [],
+ '',
+ false
+ );
+ $this->systemStoreMock = $this->getMock(
+ 'Magento\Store\Model\System\Store',
+ ['getWebsiteCollection', 'getGroupCollection', 'getStoreCollection'],
+ [],
+ '',
+ false
+ );
+ $this->configFactoryMock = $this->getMock(
+ 'Magento\Config\Model\Config\Factory',
+ ['create'],
+ [],
+ '',
+ false
+ );
+ $this->eventManagerMock = $this->getMock(
+ 'Magento\Framework\Event\ManagerInterface',
+ ['dispatch'],
+ [],
+ '',
+ false
+ );
+ $this->coreConfigMock = $this->getMock(
+ 'Magento\Framework\App\Config\ReinitableConfigInterface',
+ ['reinit', 'setValue', 'getValue', 'isSetFlag'],
+ [],
+ '',
+ false
+ );
+ $this->storeManagerMock = $this->getMock(
+ 'Magento\Store\Model\StoreManagerInterface',
+ [],
+ [],
+ '',
+ false
+ );
+ $this->cacheTypeListMock = $this->getMock(
+ 'Magento\Framework\App\Cache\TypeListInterface',
+ [],
+ [],
+ '',
+ false
+ );
+ $this->configMock = $this->getMock(
+ 'Magento\Config\Model\Config',
+ ['setSection', 'setWebsite', 'setStore', 'setGroups', 'save'],
+ [],
+ '',
+ false
+ );
+ $this->websiteMock = $this->getMock('Magento\Store\Model\Website', ['getId', 'getConfig'], [], '', false);
+ $this->groupMock = $this->getMock('Magento\Store\Model\Group', ['getId', 'getWebsiteId'], [], '', false);
+ $this->storeMock = $this->getMock('Magento\Store\Model\Store', ['getGroupId'], [], '', false);
+
+
+ $this->model = $this->objectManagerHelper->getObject(
+ 'Magento\CurrencySymbol\Model\System\Currencysymbol',
+ [
+ 'scopeConfig' => $this->scopeConfigMock,
+ 'localeResolver' => $this->localeResolverMock,
+ 'systemStore' => $this->systemStoreMock,
+ 'configFactory' => $this->configFactoryMock,
+ 'eventManager' => $this->eventManagerMock,
+ 'coreConfig' => $this->coreConfigMock,
+ 'storeManager' => $this->storeManagerMock,
+ 'cacheTypeList' => $this->cacheTypeListMock,
+ ]
+ );
+ }
+
+ protected function tearDown()
+ {
+ unset($this->objectManagerHelper);
+ }
+
+ public function testGetCurrencySymbolData()
+ {
+ $expectedSymbolsData = [
+ 'EUR' => [
+ 'parentSymbol' => '€',
+ 'displayName' => 'Euro',
+ 'displaySymbol' => '€',
+ 'inherited' => true
+ ],
+ 'USD' => [
+ 'parentSymbol' => '$',
+ 'displayName' => 'US Dollar',
+ 'displaySymbol' => '$',
+ 'inherited' => true
+ ]
+ ];
+ $websiteId = 1;
+ $groupId = 2;
+ $currencies = 'USD,EUR';
+
+ $this->prepareMocksForGetCurrencySymbolsData($websiteId, $groupId, $currencies);
+ $this->assertEquals($expectedSymbolsData, $this->model->getCurrencySymbolsData());
+ }
+
+ public function testSetCurrencySymbolData()
+ {
+ $websiteId = 1;
+ $groupId = 2;
+ $currencies = 'USD,EUR';
+ $symbols = [];
+ $value['options']['fields']['customsymbol']['inherit'] = 1;
+
+ $this->prepareMocksForGetCurrencySymbolsData($websiteId, $groupId, $currencies);
+
+ $this->configFactoryMock->expects($this->any())->method('create')->willReturn($this->configMock);
+ $this->configMock->expects($this->any())
+ ->method('setSection')
+ ->with(Currencysymbol::CONFIG_SECTION)
+ ->willReturnSelf();
+ $this->configMock->expects($this->any())->method('setWebsite')->with(null)->willReturnSelf();
+ $this->configMock->expects($this->any())->method('setStore')->with(null)->willReturnSelf();
+ $this->configMock->expects($this->any())->method('setGroups')->with($value)->willReturnSelf();
+
+ $this->coreConfigMock->expects($this->once())->method('reinit');
+ $this->storeManagerMock->expects($this->once())->method('reinitStores');
+
+ $this->cacheTypeListMock->expects($this->atLeastOnce())->method('invalidate');
+
+ $this->eventManagerMock->expects($this->atLeastOnce())->method('dispatch')->willReturnMap(
+ [
+ ['admin_system_config_changed_section_currency_before_reinit', null, null],
+ ['admin_system_config_changed_section_currency', null, null]
+ ]
+ );
+
+ $this->assertInstanceOf(
+ 'Magento\CurrencySymbol\Model\System\Currencysymbol',
+ $this->model->setCurrencySymbolsData($symbols)
+ );
+ }
+
+ /**
+ * @dataProvider getCurrencySymbolDataProvider
+ */
+ public function testGetCurrencySymbol($code, $expectedSymbol, $serializedCustomSymbols)
+ {
+ $this->scopeConfigMock->expects($this->any())
+ ->method('getValue')
+ ->willReturnMap(
+ [
+ [
+ CurrencySymbol::XML_PATH_CUSTOM_CURRENCY_SYMBOL,
+ ScopeInterface::SCOPE_STORE,
+ null,
+ $serializedCustomSymbols
+ ],
+ ]
+ );
+ $currencySymbol = $this->model->getCurrencySymbol($code);
+ $this->assertEquals($expectedSymbol, $currencySymbol);
+ }
+
+ public function getCurrencySymbolDataProvider()
+ {
+ return [
+ 'existentCustomSymbol' => [
+ 'code' => 'USD',
+ 'expectedSymbol' => '$',
+ 'serializedCustomSymbols' => 'a:1:{s:3:"USD";s:1:"$";}'
+ ],
+ 'nonExistentCustomSymbol' => [
+ 'code' => 'UAH',
+ 'expectedSymbol' => false,
+ 'serializedCustomSymbols' => 'a:1:{s:3:"USD";s:1:"$";}'
+ ]
+ ];
+ }
+
+ /**
+ * Prepare mocks for getCurrencySymbolsData
+ *
+ * @param int $websiteId
+ * @param int $groupId
+ * @param string $currencies
+ */
+ protected function prepareMocksForGetCurrencySymbolsData($websiteId, $groupId, $currencies)
+ {
+ $this->systemStoreMock->expects($this->once())
+ ->method('getWebsiteCollection')
+ ->willReturn([$this->websiteMock]);
+ $this->systemStoreMock->expects($this->once())->method('getGroupCollection')->willReturn([$this->groupMock]);
+ $this->systemStoreMock->expects($this->once())->method('getStoreCollection')->willReturn([$this->storeMock]);
+ $this->websiteMock->expects($this->any())->method('getId')->willReturn($websiteId);
+ $this->groupMock->expects($this->any())->method('getWebsiteId')->willReturn($websiteId);
+ $this->groupMock->expects($this->any())->method('getId')->willReturn($groupId);
+ $this->storeMock->expects($this->any())->method('getGroupId')->willReturn($groupId);
+
+ $this->scopeConfigMock->expects($this->any())
+ ->method('getValue')
+ ->willReturnMap(
+ [
+ [CurrencySymbol::XML_PATH_CUSTOM_CURRENCY_SYMBOL, ScopeInterface::SCOPE_STORE, null, ''],
+ [
+ CurrencySymbol::XML_PATH_ALLOWED_CURRENCIES,
+ ScopeInterface::SCOPE_STORE,
+ $this->storeMock,
+ $currencies
+ ],
+ [CurrencySymbol::XML_PATH_ALLOWED_CURRENCIES, ScopeInterface::SCOPE_STORE, null, $currencies],
+ [
+ CurrencySymbol::XML_PATH_ALLOWED_CURRENCIES,
+ ScopeInterface::SCOPE_STORE,
+ $this->storeMock,
+ $currencies
+ ]
+ ]
+ );
+
+ $this->websiteMock->expects($this->any())
+ ->method('getConfig')
+ ->with(CurrencySymbol::XML_PATH_ALLOWED_CURRENCIES)
+ ->willReturn($currencies);
+ $this->localeResolverMock->expects($this->any())->method('getLocale')->willReturn('en');
+ }
+
+}