MAGETWO-70052: Fix not detecting current store using store code in url #9429O

 - Unit test updated

Author: ishakhsuvarov

app/code/Magento/Checkout/Block/Checkout/DirectoryDataProcessor.php

@@ -6,8 +6,8 @@
 namespace Magento\Checkout\Block\Checkout;
 
 use Magento\Directory\Helper\Data as DirectoryHelper;
-use Magento\Store\Api\StoreResolverInterface;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Directory data processor.
@@ -50,21 +50,21 @@ class DirectoryDataProcessor implements \Magento\Checkout\Block\Checkout\LayoutP
     /**
      * @param \Magento\Directory\Model\ResourceModel\Country\CollectionFactory $countryCollection
      * @param \Magento\Directory\Model\ResourceModel\Region\CollectionFactory $regionCollection
-     * @param StoreResolverInterface $storeResolver
+     * @param @deprecated $storeResolver
      * @param DirectoryHelper $directoryHelper
      * @param StoreManagerInterface $storeManager
      */
     public function __construct(
         \Magento\Directory\Model\ResourceModel\Country\CollectionFactory $countryCollection,
         \Magento\Directory\Model\ResourceModel\Region\CollectionFactory $regionCollection,
-        StoreResolverInterface $storeResolver,
+        $storeResolver,
         DirectoryHelper $directoryHelper,
         StoreManagerInterface $storeManager = null
     ) {
         $this->countryCollectionFactory = $countryCollection;
         $this->regionCollectionFactory = $regionCollection;
         $this->directoryHelper = $directoryHelper;
-        $this->storeManager = $storeManager ?: \Magento\Framework\App\ObjectManager::getInstance()->get(StoreManagerInterface::class);
+        $this->storeManager = $storeManager ?: ObjectManager::getInstance()->get(StoreManagerInterface::class);
     }
 
     /**

app/code/Magento/Checkout/Test/Unit/Block/Checkout/DirectoryDataProcessorTest.php

@@ -45,7 +45,7 @@ class DirectoryDataProcessorTest extends \PHPUnit_Framework_TestCase
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $directoryDataHelperMock;
+    private $directoryDataHelperMock;
 
     protected function setUp()
     {
@@ -80,9 +80,9 @@ protected function setUp()
         $this->storeResolverMock = $this->getMock(
             \Magento\Store\Api\StoreResolverInterface::class
         );
-        $this->storeManagerMock = $this->getMock(
-            \Magento\Store\Model\StoreManagerInterface::class
-        );
+        $this->storeManagerMock = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->directoryDataHelperMock = $this->getMock(
             \Magento\Directory\Helper\Data::class,
             [],
@@ -107,6 +107,12 @@ public function testProcess()
             'region_id' => [],
         ];
 
+        $storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $storeMock->expects($this->atLeastOnce())->method('getId')->willReturn(42);
+        $this->storeManagerMock->expects($this->atLeastOnce())->method('getStore')->willReturn($storeMock);
+
         $this->countryCollectionFactoryMock->expects($this->once())
             ->method('create')
             ->willReturn($this->countryCollectionMock);