Merge remote-tracking branch 'arcticfoxes/B2B-2017' into 2.4-develop-pr

Author: joanhe

dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Export/File/DownloadTest.php

@@ -65,7 +65,7 @@ protected function setUp(): void
         $this->backendUrl->turnOnSecretKey();
         $this->sourceFilePath = __DIR__ . '/../../Import/_files' . DIRECTORY_SEPARATOR . $this->fileName;
         //Refers to tests 'var' directory
-        $this->varDirectory = $this->fileSystem->getDirectoryRead(DirectoryList::VAR_DIR);
+        $this->varDirectory = $this->fileSystem->getDirectoryWrite(DirectoryList::VAR_IMPORT_EXPORT);
     }
 
     /**
@@ -124,9 +124,11 @@ public function testExecute($file): void
      */
     private function copyFile($destinationFilePath): void
     {
-        //Refers to application root directory
-        $rootDirectory = $this->fileSystem->getDirectoryWrite(DirectoryList::ROOT);
-        $rootDirectory->copyFile($this->sourceFilePath, $this->varDirectory->getAbsolutePath($destinationFilePath));
+        $driver = $this->varDirectory->getDriver();
+        $absolutePath = $this->varDirectory->getAbsolutePath($destinationFilePath);
+
+        $driver->createDirectory(dirname($absolutePath));
+        $driver->filePutContents($absolutePath, file_get_contents($this->sourceFilePath));
     }
 
     /**

dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/ConsumerTest.php

@@ -124,7 +124,7 @@ private function getSkuPosition(array $csvFileData): ?int
     private function getCsvData(string $filePath): array
     {
         $driver = $this->directory->getDriver();
-        $fileResource = $driver->fileOpen($filePath, null);
+        $fileResource = $driver->fileOpen($filePath, 'r');
 
         $data = [];
         while ($rowData = $driver->fileGetCsv($fileResource, 100000)) {