Skip to content

Commit 94f37de

Browse files
magento-devops-queue-mgr-svcmagento-devops-queue-mgr-svc
authored
Merge branch '2.4-develop' into UPS_AC11811_29APR
2 parents d1c335a + 91cb4d4 commit 94f37de

File tree

45 files changed

+712
-242
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+712
-242
lines changed

‎app/code/Magento/AwsS3/Test/Mftf/Helper/DummyMetadataCache.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,4 +83,11 @@ public function updateMetadata(string $path, array $objectMetadata, bool $persis
8383
public function storeFileNotExists(string $path): void
8484
{
8585
}
86+
87+
/**
88+
* @inheirtDoc
89+
*/
90+
public function storeDirNotExists(string $path): void
91+
{
92+
}
8693
}

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ class S3FileAssertions extends Helper
2626
*/
2727
private $driver;
2828

29+
/**
30+
* @var AwsS3V3Adapter
31+
*/
32+
private $adapter;
33+
2934
/**
3035
* Call the parent constructor then create the AwsS3 driver from environment variables
3136
*
@@ -65,6 +70,7 @@ public function __construct(ModuleContainer $moduleContainer, ?array $config = n
6570
$s3Driver = new AwsS3($adapter, new MockTestLogger(), $objectUrl, $metadataProvider);
6671

6772
$this->driver = $s3Driver;
73+
$this->adapter = $adapter;
6874
}
6975

7076
/**
@@ -196,10 +202,11 @@ public function assertGlobbedFileExists($path, $pattern, $message = ''): void
196202
* @return void
197203
*
198204
* @throws \Magento\Framework\Exception\FileSystemException
205+
* @throws \League\Flysystem\FilesystemException
199206
*/
200207
public function assertDirectoryExists($path, $message = ''): void
201208
{
202-
$this->assertTrue($this->driver->isDirectory($path), "Failed asserting $path exists. " . $message);
209+
$this->assertTrue($this->adapter->directoryExists($path), "Failed asserting $path exists. " . $message);
203210
}
204211

205212
/**

‎app/code/Magento/AwsS3/Test/Unit/Driver/AwsS3Test.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -439,8 +439,8 @@ public function testSearchDirectory(): void
439439
$this->metadataProviderMock->expects(self::any())->method('getMetadata')
440440
->willReturnMap([
441441
['path', ['type' => AwsS3::TYPE_DIR]],
442-
['path/1', ['type' => AwsS3::TYPE_FILE]],
443-
['path/2', ['type' => AwsS3::TYPE_FILE]],
442+
['path/1', ['type' => AwsS3::TYPE_DIR]],
443+
['path/2', ['type' => AwsS3::TYPE_DIR]],
444444
]);
445445
$this->adapterMock->expects(self::atLeastOnce())->method('listContents')
446446
->willReturn(new \ArrayIterator($subPaths));

‎app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1912,9 +1912,7 @@ protected function _saveTitles(array $titles)
19121912
if (!isset($existingOptionIds[$optionId]) && count($storeInfo) > 0) {
19131913
$storeInfo = [Store::DEFAULT_STORE_ID => reset($storeInfo)] + $storeInfo;
19141914
}
1915-
//for use default
1916-
$uniqStoreInfo = array_unique($storeInfo);
1917-
foreach ($uniqStoreInfo as $storeId => $title) {
1915+
foreach ($storeInfo as $storeId => $title) {
19181916
$titleRows[] = ['option_id' => $optionId, 'store_id' => $storeId, 'title' => $title];
19191917
}
19201918
}

‎app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminClearCustomersFiltersActionGroup.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@
1616
<amOnPage url="{{AdminCustomerPage.url}}" stepKey="amOnCustomersPage"/>
1717
<waitForPageLoad stepKey="WaitForPageToLoad"/>
1818
<conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickOnButtonToRemoveFiltersIfPresent"/>
19+
<waitForPageLoad stepKey="waitForCustomersFilterToBeDeleted"/>
1920
</actionGroup>
2021
</actionGroups>

‎app/code/Magento/Customer/Test/Mftf/Test/AdminAddNewDefaultBillingShippingCustomerAddressTest.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<after>
3131
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
3232
<deleteData createDataKey="customer" stepKey="deleteCustomer"/>
33+
<actionGroup ref="AdminClearCustomersFiltersActionGroup" stepKey="resetCustomerFilters"/>
3334
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3435
</after>
3536
<!-- -

‎app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerAddressesFromTheGridTest.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
2929
</before>
3030
<after>
31+
<actionGroup ref="AdminClearCustomersFiltersActionGroup" stepKey="clearCustomersFilter"/>
3132
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
3233
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
3334
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

‎app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerAddressesFromTheGridViaMassActionsTest.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
2828
</before>
2929
<after>
30+
<actionGroup ref="AdminClearCustomersFiltersActionGroup" stepKey="clearCustomersFilter"/>
3031
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
3132
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
3233
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

‎app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteDefaultBillingCustomerAddressTest.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
2828
</before>
2929
<after>
30+
<actionGroup ref="AdminClearCustomersFiltersActionGroup" stepKey="clearCustomersFilter"/>
3031
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
3132
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
3233
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

‎app/code/Magento/Customer/Test/Mftf/Test/AdminEditCustomerWithAssociatedNewsletterQueueNewTest.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@
3737
<actionGroup ref="AdminMarketingOpenNewsletterTemplateFromGridActionGroup" stepKey="openTemplate"/>
3838
<actionGroup ref="AdminMarketingDeleteNewsletterTemplateActionGroup" stepKey="deleteTemplate"/>
3939

40+
<actionGroup ref="AdminClearCustomersFiltersActionGroup" stepKey="clearCustomersFilter"/>
41+
4042
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4143
</after>
4244

0 commit comments

Comments
 (0)