Skip to content

Commit d2787d3

Browse files
committed
#AC-11388-Verify Deleting Folder Deletes S3 and Local File Storage Directories- updating league library made sure the s3 tests are passing
1 parent 5b91354 commit d2787d3

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

app/code/Magento/AwsS3/Test/Mftf/Helper/S3FileAssertions.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ public function __construct(ModuleContainer $moduleContainer, ?array $config = n
6565
$s3Driver = new AwsS3($adapter, new MockTestLogger(), $objectUrl, $metadataProvider);
6666

6767
$this->driver = $s3Driver;
68+
$this->adapter = $adapter;
6869
}
6970

7071
/**
@@ -196,10 +197,11 @@ public function assertGlobbedFileExists($path, $pattern, $message = ''): void
196197
* @return void
197198
*
198199
* @throws \Magento\Framework\Exception\FileSystemException
200+
* @throws \League\Flysystem\FilesystemException
199201
*/
200202
public function assertDirectoryExists($path, $message = ''): void
201203
{
202-
$this->assertTrue($this->driver->isDirectory($path), "Failed asserting $path exists. " . $message);
204+
$this->assertTrue($this->adapter->directoryExists($path), "Failed asserting $path exists. " . $message);
203205
}
204206

205207
/**

app/etc/di.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1856,7 +1856,7 @@
18561856
<type name="Magento\Framework\DB\Adapter\SqlVersionProvider">
18571857
<arguments>
18581858
<argument name="supportedVersionPatterns" xsi:type="array">
1859-
<item name="MySQL-8" xsi:type="string">^8\.0\.</item>
1859+
<item name="MySQL-8.1" xsi:type="string">^8\.1\.</item>
18601860
<item name="MySQL-5.7" xsi:type="string">^5\.7\.</item>
18611861
<item name="MariaDB-(10.2-10.6)" xsi:type="string">^10\.[2-6]\.</item>
18621862
</argument>

0 commit comments

Comments
 (0)