File tree Expand file tree Collapse file tree 3 files changed +22
-1
lines changed
RemoteStorage/Driver/Adapter Expand file tree Collapse file tree 3 files changed +22
-1
lines changed Original file line number Diff line number Diff line change 129129 </actionGroup >
130130
131131 <!-- Verify Images & Directories in S3 & Local File System -->
132+ <helper class =" Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method =" assertDirectoryExists" stepKey =" assertS31stCreatedBaseFolderExists" >
133+ <argument name =" path" >media/wysiwyg/{{AdminMediaGalleryFolderData.name}}</argument >
134+ </helper >
135+ <helper class =" Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method =" assertDirectoryDoesNotExist" stepKey =" assertS32ndCreatedBaseFolderDoesNotExist" >
136+ <argument name =" path" >media/wysiwyg/{{AdminMediaGalleryFolderData.name}}/{{AdminMediaGalleryFolder2Data.name}}</argument >
137+ </helper >
138+ <helper class =" Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method =" assertFileExists" stepKey =" assertS3ThumbnailImageExists3" >
139+ <argument name =" filePath" >media/.thumbswysiwyg/{{AdminMediaGalleryFolderData.name}}/{{AdminMediaGalleryFolder2Data.name}}/{{ImageUpload.file}}</argument >
140+ </helper >
132141 <helper class =" Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method =" assertDirectoryExists" stepKey =" assertLocal1stCreatedBaseFolderExists" >
133142 <argument name =" path" >pub/media/.renditions/wysiwyg/{{AdminMediaGalleryFolderData.name}}</argument >
134143 </helper >
Original file line number Diff line number Diff line change 121121 </actionGroup >
122122
123123 <!-- Verify Images & Directories in S3 & Local File System -->
124+ <helper class =" Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method =" assertDirectoryExists" stepKey =" assertS3CreatedBaseFolderExists" >
125+ <argument name =" path" >media/wysiwyg/{{AdminMediaGalleryFolderData.name}}</argument >
126+ </helper >
127+ <helper class =" Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method =" assertFileDoesNotExist" stepKey =" assertS3BaseImageDoesNotExist" >
128+ <argument name =" filePath" >media/wysiwyg/{{AdminMediaGalleryFolderData.name}}/{{ImageUpload.file}}</argument >
129+ </helper >
130+ <helper class =" Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method =" assertDirectoryExists" stepKey =" assertS3ThumbnailDirectoryExists" >
131+ <argument name =" path" >media/.thumbswysiwyg/{{AdminMediaGalleryFolderData.name}}</argument >
132+ </helper >
133+ <helper class =" Magento\AwsS3\Test\Mftf\Helper\S3FileAssertions" method =" assertFileDoesNotExist" stepKey =" assertS3ThumbnailImageDoesNotExist" >
134+ <argument name =" filePath" >media/.thumbswysiwyg/{{AdminMediaGalleryFolderData.name}}/{{ImageUpload.file}}</argument >
135+ </helper >
124136 <helper class =" Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method =" assertDirectoryExists" stepKey =" assertLocalCreatedBaseFolderExists" >
125137 <argument name =" path" >pub/media/.renditions/wysiwyg/{{AdminMediaGalleryFolderData.name}}</argument >
126138 </helper >
Original file line number Diff line number Diff line change @@ -50,7 +50,7 @@ public function __construct(
5050 private function isDirectory ($ path ): bool
5151 {
5252 try {
53- return iterator_count ( $ this ->adapter ->listContents ($ path, false )) > 0 ;
53+ return $ this ->adapter ->directoryExists ($ path) ;
5454 } catch (\Throwable $ e ) {
5555 // catch closed iterator
5656 return false ;
You can’t perform that action at this time.
0 commit comments