fixed storeId param name

Author: engcom-Charlie

app/code/Magento/Directory/Helper/Data.php

@@ -190,8 +190,8 @@ public function getRegionJson()
         \Magento\Framework\Profiler::start('TEST: ' . __METHOD__, ['group' => 'TEST', 'method' => __METHOD__]);
         if (!$this->_regionJson) {
             $scope = $this->getCurrentScope();
-            $scopeKey = $scope['value'] ? '_' . implode('_', $scope) : '';
-            $cacheKey = 'DIRECTORY_REGIONS_JSON' . $scopeKey;
+            $scopeKey = $scope['value'] ? '_' . implode('_', $scope) : null;
+            $cacheKey = 'DIRECTORY_REGIONS_JSON_STORE' . $scopeKey;
             $json = $this->_configCacheType->load($cacheKey);
             if (empty($json)) {
                 $regions = $this->getRegionData();
@@ -406,30 +406,23 @@ public function getWeightUnit()
      * Get current scope from request
      *
      * @return array
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     private function getCurrentScope(): array
     {
-        $scope = $this->_storeManager->getStore()
-            ? [
-                'type' => ScopeInterface::SCOPE_STORE,
-                'value' => $this->_storeManager->getStore()->getId(),
-            ]
-            : [
-                'type' => ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
-                'value' => null,
-            ];
+        $scope = [
+            'type' => ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
+            'value' => null,
+        ];
         $request = $this->_getRequest();
-
         if ($request->getParam(ScopeInterface::SCOPE_WEBSITE)) {
             $scope = [
                 'type' => ScopeInterface::SCOPE_WEBSITE,
                 'value' => $request->getParam(ScopeInterface::SCOPE_WEBSITE),
             ];
-        } elseif ($request->getParam(ScopeInterface::SCOPE_STORE)) {
+        } elseif ($request->getParam('store_id')) {
             $scope = [
                 'type' => ScopeInterface::SCOPE_STORE,
-                'value' => $request->getParam(ScopeInterface::SCOPE_STORE),
+                'value' => $request->getParam('store_id'),
             ];
         }
 

app/code/Magento/Directory/Test/Unit/Helper/DataTest.php

@@ -7,7 +7,6 @@
 
 namespace Magento\Directory\Test\Unit\Helper;
 
-use ArrayIterator;
 use Magento\Directory\Helper\Data;
 use Magento\Directory\Model\AllowedCountries;
 use Magento\Directory\Model\CurrencyFactory;
@@ -53,16 +52,6 @@ class DataTest extends TestCase
      */
     protected $_store;
 
-    /**
-     * @var RequestInterface|MockObject
-     */
-    protected $_request;
-
-    /**
-     * @var StoreManagerInterface|MockObject
-     */
-    protected $_storeManager;
-
     /**
      * @var ScopeConfigInterface|MockObject
      */
@@ -78,10 +67,10 @@ protected function setUp(): void
         $objectManager = new ObjectManager($this);
         $this->scopeConfigMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
         $this->scopeConfigMock->expects($this->any())->method('isSetFlag')->willReturn(false);
-        $this->_request = $this->getMockForAbstractClass(RequestInterface::class);
+        $requestMock = $this->getMockForAbstractClass(RequestInterface::class);
         $context = $this->createMock(Context::class);
         $context->method('getRequest')
-            ->willReturn($this->_request);
+            ->willReturn($requestMock);
         $context->expects($this->any())
             ->method('getScopeConfig')
             ->willReturn($this->scopeConfigMock);
@@ -105,7 +94,8 @@ protected function setUp(): void
         $this->jsonHelperMock = $this->createMock(JsonDataHelper::class);
 
         $this->_store = $this->createMock(Store::class);
-        $this->_storeManager = $this->getMockForAbstractClass(StoreManagerInterface::class);
+        $storeManager = $this->getMockForAbstractClass(StoreManagerInterface::class);
+        $storeManager->expects($this->any())->method('getStore')->willReturn($this->_store);
 
         $currencyFactory = $this->createMock(CurrencyFactory::class);
 
@@ -115,151 +105,45 @@ protected function setUp(): void
             'countryCollection' => $this->_countryCollection,
             'regCollectionFactory' => $regCollectionFactory,
             'jsonHelper' => $this->jsonHelperMock,
-            'storeManager' => $this->_storeManager,
+            'storeManager' => $storeManager,
             'currencyFactory' => $currencyFactory,
         ];
         $this->_object = $objectManager->getObject(Data::class, $arguments);
     }
 
-    /**
-     * @return array
-     */
-    public function regionJsonProvider(): array
-    {
-        $countries = [
-            'Country1' => [
-                'r1' => ['code' => 'r1-code', 'name' => 'r1-name'],
-                'r2' => ['code' => 'r2-code', 'name' => 'r2-name']
-            ],
-            'Country2' => [
-                'r3' => ['code' => 'r3-code', 'name' => 'r3-name'],
-            ],
-            'Country3' => [],
-        ];
-
-        return [
-            [
-                null,
-                $countries,
-            ],
-            [
-                null,
-                [
-                    'Country1' => $countries['Country1'],
-                ],
-                [ScopeInterface::SCOPE_WEBSITE => 1],
-            ],
-            [
-                1,
-                [
-                    'Country2' => $countries['Country2'],
-                ],
-            ],
-            [
-                null,
-                [
-                    'Country2' => $countries['Country2'],
-                ],
-                [
-                    ScopeInterface::SCOPE_WEBSITE => null,
-                    ScopeInterface::SCOPE_STORE => 1,
-                ],
-            ],
-            [
-                2,
-                [
-                    'Country3' => $countries['Country3'],
-                ],
-            ],
-            [
-                null,
-                [
-                    'Country3' => $countries['Country3'],
-                ],
-                [ScopeInterface::SCOPE_STORE => 2],
-            ],
-        ];
-    }
-
-    /**
-     * @param int|null $currentStoreId
-     * @param array $allowedCountries
-     * @param array $requestParams
-     * @dataProvider regionJsonProvider
-     */
-    public function testGetRegionJson(?int $currentStoreId, array $allowedCountries, array $requestParams = [])
+    public function testGetRegionJson()
     {
-        if ($currentStoreId) {
-            $this->_store->method('getId')->willReturn($currentStoreId);
-            $this->_storeManager->expects($this->any())->method('getStore')->willReturn($this->_store);
-        } else {
-            $this->_storeManager->expects($this->any())->method('getStore')->willReturn(null);
-        }
-
-        if ($requestParams) {
-            $map = [];
-
-            foreach ($requestParams as $name => $value) {
-                $map[] = [$name, null, $value];
-            }
-
-            $this->_request
-                ->method('getParam')
-                ->willReturnMap($map);
-        }
-
-        $expectedDataToEncode = array_merge([
-            'config' => ['show_all_regions' => false, 'regions_required' => []],
-        ], array_filter($allowedCountries));
-
         $this->scopeConfigMock->method('getValue')
             ->willReturnMap(
                 [
                     [
                         AllowedCountries::ALLOWED_COUNTRIES_PATH,
                         ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
                         null,
-                        'Country1,Country2,Country3'
-                    ],
-                    [
-                        AllowedCountries::ALLOWED_COUNTRIES_PATH,
-                        ScopeInterface::SCOPE_WEBSITE,
-                        1,
-                        'Country1'
-                    ],
-                    [
-                        AllowedCountries::ALLOWED_COUNTRIES_PATH,
-                        ScopeInterface::SCOPE_STORE,
-                        1,
-                        'Country2'
-                    ],
-                    [
-                        AllowedCountries::ALLOWED_COUNTRIES_PATH,
-                        ScopeInterface::SCOPE_STORE,
-                        2,
-                        'Country3'
+                        'Country1,Country2'
                     ],
                     [Data::XML_PATH_STATES_REQUIRED, ScopeInterface::SCOPE_STORE, null, '']
                 ]
             );
-
         $regions = [
-            new DataObject(['country_id' => 'Country1', 'region_id' => 'r1', 'code' => 'r1-code', 'name' => 'r1-name']),
-            new DataObject(['country_id' => 'Country1', 'region_id' => 'r2', 'code' => 'r2-code', 'name' => 'r2-name']),
-            new DataObject(['country_id' => 'Country2', 'region_id' => 'r3', 'code' => 'r3-code', 'name' => 'r3-name']),
+            new DataObject(
+                ['country_id' => 'Country1', 'region_id' => 'r1', 'code' => 'r1-code', 'name' => 'r1-name']
+            ),
+            new DataObject(
+                ['country_id' => 'Country1', 'region_id' => 'r2', 'code' => 'r2-code', 'name' => 'r2-name']
+            ),
+            new DataObject(
+                ['country_id' => 'Country2', 'region_id' => 'r3', 'code' => 'r3-code', 'name' => 'r3-name']
+            )
         ];
-        $regions = array_filter($regions, function (DataObject $region) use ($allowedCountries) {
-            return array_key_exists($region->getData('country_id'), $allowedCountries);
-        });
-
-        $regionIterator = new ArrayIterator($regions);
+        $regionIterator = new \ArrayIterator($regions);
 
         $this->_regionCollection->expects(
             $this->once()
         )->method(
             'addCountryFilter'
         )->with(
-            array_keys($allowedCountries)
+            ['Country1', 'Country2']
         )->willReturnSelf();
         $this->_regionCollection->expects($this->once())->method('load');
         $this->_regionCollection->expects(
@@ -270,6 +154,14 @@ public function testGetRegionJson(?int $currentStoreId, array $allowedCountries,
             $regionIterator
         );
 
+        $expectedDataToEncode = [
+            'config' => ['show_all_regions' => false, 'regions_required' => []],
+            'Country1' => [
+                'r1' => ['code' => 'r1-code', 'name' => 'r1-name'],
+                'r2' => ['code' => 'r2-code', 'name' => 'r2-name']
+            ],
+            'Country2' => ['r3' => ['code' => 'r3-code', 'name' => 'r3-name']]
+        ];
         $this->jsonHelperMock->expects(
             $this->once()
         )->method(