Merge branch '2.4-develop' into gl_pr_arrows_may16_2022

Author: ishakhsuvarov

app/code/Magento/Checkout/Controller/Sidebar/UpdateItemQty.php

@@ -14,8 +14,9 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Json\Helper\Data;
 use Psr\Log\LoggerInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 
-class UpdateItemQty extends Action
+class UpdateItemQty extends Action implements HttpPostActionInterface
 {
     /**
      * @var Sidebar
@@ -61,12 +62,12 @@ public function __construct(
     }
 
     /**
-     * @return $this
+     * @inheritdoc
      */
     public function execute()
     {
         $itemId = (int)$this->getRequest()->getParam('item_id');
-        $itemQty = $this->getRequest()->getParam('item_qty') * 1;
+        $itemQty = (float)$this->getRequest()->getParam('item_qty') * 1;
         $itemQty = $this->quantityProcessor->prepareQuantity($itemQty);
 
         try {

app/code/Magento/Checkout/Test/Unit/Controller/Sidebar/UpdateItemQtyTest.php

@@ -244,4 +244,47 @@ public function testExecuteWithException(): void
 
         $this->assertEquals('json represented', $this->updateItemQty->execute());
     }
+
+    /**
+     * @return void
+     */
+    public function testExecuteWithWrongRequestParams(): void
+    {
+        $this->requestMock
+            ->method('getParam')
+            ->withConsecutive(['item_id'], ['item_qty'])
+            ->willReturnOnConsecutiveCalls(0, 'error');
+
+        $this->sidebarMock->expects($this->once())
+            ->method('checkQuoteItem')
+            ->with(0)
+            ->willThrowException(new LocalizedException(__('Error!')));
+
+        $this->sidebarMock->expects($this->once())
+            ->method('getResponseData')
+            ->with('Error!')
+            ->willReturn(
+                [
+                    'success' => false,
+                    'error_message' => 'Error!'
+                ]
+            );
+
+        $this->jsonHelperMock->expects($this->once())
+            ->method('jsonEncode')
+            ->with(
+                [
+                    'success' => false,
+                    'error_message' => 'Error!'
+                ]
+            )
+            ->willReturn('json encoded');
+
+        $this->responseMock->expects($this->once())
+            ->method('representJson')
+            ->with('json encoded')
+            ->willReturn('json represented');
+
+        $this->assertEquals('json represented', $this->updateItemQty->execute());
+    }
 }

dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/Category/Plugin/StorageTest.php

@@ -15,6 +15,7 @@
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\Write;
 use Magento\Framework\Filesystem\Driver\File;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\ImportExport\Model\Import;
@@ -67,6 +68,9 @@ class StorageTest extends TestCase
     /** @var Data */
     private $importDataResource;
 
+    /** @var Write */
+    private $mediaDirectory;
+
     /**
      * @inheritdoc
      */
@@ -85,6 +89,7 @@ protected function setUp(): void
         $this->importDataResource = $this->objectManager->get(Data::class);
         $this->appParams = Bootstrap::getInstance()->getBootstrap()->getApplication()
             ->getInitParams()[AppBootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS];
+        $this->mediaDirectory = $this->fileSystem->getDirectoryWrite(DirectoryList::MEDIA);
     }
 
     /**
@@ -182,17 +187,14 @@ private function prepareFile(string $fileName): Csv
      */
     private function updateUploader(): void
     {
+        $mediaDir = !$this->mediaDirectory->getDriver() instanceof File ?
+            DirectoryList::MEDIA : $this->appParams[DirectoryList::MEDIA][DirectoryList::PATH];
+        $destDir = $mediaDir . DIRECTORY_SEPARATOR . $this->mediaConfig->getBaseMediaPath();
+        $tmpDir =  $mediaDir . DIRECTORY_SEPARATOR . 'import';
+        $this->mediaDirectory->create($this->mediaConfig->getBaseMediaPath());
+        $this->mediaDirectory->create('import');
+        $this->import->setParameters([Import::FIELD_NAME_IMG_FILE_DIR => $tmpDir]);
         $uploader = $this->import->getUploader();
-        $rootDirectory = $this->fileSystem->getDirectoryWrite(DirectoryList::ROOT);
-        $destDir = $rootDirectory->getRelativePath(
-            $this->appParams[DirectoryList::MEDIA][DirectoryList::PATH]
-            . DIRECTORY_SEPARATOR . $this->mediaConfig->getBaseMediaPath()
-        );
-        $tmpDir = $rootDirectory->getRelativePath(
-            $this->appParams[DirectoryList::MEDIA][DirectoryList::PATH]
-        );
-        $rootDirectory->create($destDir);
-        $rootDirectory->create($tmpDir);
         $uploader->setDestDir($destDir);
         $uploader->setTmpDir($tmpDir);
     }