[#19908] Fix WebapiAyncTest

magento · Dec 27, 2018 · 29b4b39 · 29b4b39
1 parent ef724a6
commit 29b4b39
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 11 deletions.
diff --git a/app/code/Magento/Webapi/Test/Unit/Controller/PathProcessorTest.php b/app/code/Magento/Webapi/Test/Unit/Controller/PathProcessorTest.php
@@ -50,7 +50,7 @@ protected function setUp()
      *
      * @param string $storeCodeInPath
      * @param string $storeCodeSet
-     * @param int    $setCurrentStoreCallCtr
+     * @param int $setCurrentStoreCallCtr
      */
     public function testAllStoreCode($storeCodeInPath, $storeCodeSet, $setCurrentStoreCallCtr = 1)
     {

diff --git a/app/code/Magento/WebapiAsync/Test/Unit/Controller/PathProcessorTest.php b/app/code/Magento/WebapiAsync/Test/Unit/Controller/PathProcessorTest.php
@@ -15,6 +15,9 @@ class PathProcessorTest extends \PHPUnit\Framework\TestCase
     /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Store\Model\StoreManagerInterface */
     private $storeManagerMock;
 
+    /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Locale\ResolverInterface */
+    private $localeResolverMock;
+
     /** @var \Magento\Webapi\Controller\PathProcessor */
     private $model;
 
@@ -26,16 +29,22 @@ class PathProcessorTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $this->storeManagerMock = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
-           ->disableOriginalConstructor()
-           ->getMock();
-        $this->storeManagerMock->expects($this->once())
-           ->method('getStores')
-           ->willReturn([
-               $this->arbitraryStoreCode => 'store object',
-               'default' => 'default store object',
-           ]);
-        $this->model = new \Magento\Webapi\Controller\PathProcessor($this->storeManagerMock);
+        $store = $this->createMock(\Magento\Store\Api\Data\StoreInterface::class);
+        $store->method('getId')->willReturn(2);
+
+        $this->storeManagerMock = $this->createConfiguredMock(
+            \Magento\Store\Model\StoreManagerInterface::class,
+            [
+                'getStores' => [$this->arbitraryStoreCode => 'store object', 'default' => 'default store object'],
+                'getStore'  => $store,
+            ]
+        );
+        $this->storeManagerMock->expects($this->once())->method('getStores');
+
+        $this->localeResolverMock = $this->createMock(\Magento\Framework\Locale\ResolverInterface::class);
+        $this->localeResolverMock->method('emulate')->with(2);
+
+        $this->model = new \Magento\Webapi\Controller\PathProcessor($this->storeManagerMock, $this->localeResolverMock);
     }
 
     /**