Skip to content

Commit 087fd8d

Browse files
committed
MAGETWO-34253: CLONE - Postal code is still mandatory for Non-US addresses that don't use it
- Fix for unit tests
1 parent ecac1bb commit 087fd8d

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

app/code/Magento/Directory/Model/Resource/Country/Collection.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
5959
* @param \Magento\Directory\Model\Resource\CountryFactory $countryFactory
6060
* @param \Magento\Framework\Stdlib\ArrayUtils $arrayUtils
6161
* @param \Magento\Framework\Locale\ResolverInterface $localeResolver
62+
* @param \Magento\Framework\App\Helper\AbstractHelper $helperData
6263
* @param mixed $connection
6364
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
6465
* @SuppressWarnings(PHPMD.ExcessiveParameterList)

app/code/Magento/Directory/Test/Unit/Model/Resource/Country/CollectionTest.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,13 @@ protected function setUp()
4747
'',
4848
false
4949
);
50+
$helperDataMock = $this->getMock(
51+
'Magento\Directory\Helper\Data',
52+
[],
53+
[],
54+
'',
55+
false
56+
);
5057
$objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
5158
$arguments = [
5259
'logger' => $logger,
@@ -57,6 +64,7 @@ protected function setUp()
5764
'scopeConfig' => $scopeConfigMock,
5865
'countryFactory' => $countryFactory,
5966
'resource' => $resource,
67+
'helperData' => $helperDataMock
6068
];
6169
$this->_model = $objectManager->getObject('Magento\Directory\Model\Resource\Country\Collection', $arguments);
6270
}

0 commit comments

Comments
 (0)