Merge remote-tracking branch 'magento-l3/ACP2E-159' into L3_PR_21-10-10

Author: veloraven

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

@@ -65,36 +65,26 @@ class Data extends AbstractHelper
     const XML_PATH_WEIGHT_UNIT = 'general/locale/weight_unit';
 
     /**
-     * Country collection
-     *
      * @var Collection
      */
     protected $_countryCollection;
 
     /**
-     * Region collection
-     *
      * @var \Magento\Directory\Model\ResourceModel\Region\Collection
      */
     protected $_regionCollection;
 
     /**
-     * Json representation of regions data
-     *
      * @var string
      */
     protected $_regionJson;
 
     /**
-     * Currency cache
-     *
      * @var array
      */
     protected $_currencyCache = [];
 
     /**
-     * ISO2 country codes which have optional Zip/Postal pre-configured
-     *
      * @var array
      */
     protected $_optZipCountries = null;
@@ -409,6 +399,7 @@ public function getWeightUnit()
      * Get current scope from request
      *
      * @return array
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     private function getCurrentScope(): array
     {
@@ -432,6 +423,14 @@ private function getCurrentScope(): array
                 'type' => ScopeInterface::SCOPE_STORE,
                 'value' => $request->getParam(self::STORE_ID),
             ];
+        } else {
+            $storeId = $this->_storeManager->getStore()->getId() ?? null;
+            if ($storeId) {
+                $scope = [
+                    'type' => ScopeInterface::SCOPE_STORE,
+                    'value' => $storeId,
+                ];
+            }
         }
 
         return $scope;

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

@@ -294,4 +294,28 @@ public function topCountriesDataProvider()
             ['US,RU', ['US', 'RU']],
         ];
     }
+
+    /**
+     * Test private method `getCurrentScope`, if no request parameter `scope type` sent.
+     *
+     * @throws \ReflectionException
+     */
+    public function testGetCurrentScopeWithoutRequestParameters()
+    {
+        $storeId = 1;
+        $scope = [
+            'type' => ScopeInterface::SCOPE_STORE,
+            'value' => $storeId,
+        ];
+
+        $this->_store->expects($this->atLeastOnce())->method('getId')->willReturn($storeId);
+
+        $reflector = new \ReflectionClass($this->_object);
+        $method = $reflector->getMethod('getCurrentScope');
+        $method->setAccessible(true);
+
+        $result = $method->invoke($this->_object);
+        $this->assertIsArray($result);
+        $this->assertEquals($scope, $result);
+    }
 }