Skip to content

Commit 224d8d4

Browse files
author
Mohan Ahuja
committed
Merge branch '2.4-develop' of https://github.com/magento-commerce/magento2ce into ACP2E-726
2 parents c906d24 + 28c1f28 commit 224d8d4

File tree

51 files changed

+422
-70
lines changed

Some content is hidden

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

51 files changed

+422
-70
lines changed

‎app/code/Magento/AwsS3/Driver/AwsS3.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -527,6 +527,10 @@ public function getRealPath($path)
527527
*/
528528
public function rename($oldPath, $newPath, DriverInterface $targetDriver = null): bool
529529
{
530+
if ($oldPath === $newPath) {
531+
return true;
532+
}
533+
530534
try {
531535
$this->adapter->move(
532536
$this->normalizeRelativePath($oldPath, true),

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -496,4 +496,21 @@ public function testCreateDirectory(): void
496496

497497
self::assertTrue($this->driver->createDirectory(self::URL . 'test/test2/'));
498498
}
499+
500+
public function testRename(): void
501+
{
502+
$this->adapterMock->expects(self::once())
503+
->method('move')
504+
->with('test/path', 'test/path2');
505+
506+
self::assertTrue($this->driver->rename('test/path', 'test/path2'));
507+
}
508+
509+
public function testRenameSameDestination(): void
510+
{
511+
$this->adapterMock->expects(self::never())
512+
->method('move');
513+
514+
self::assertTrue($this->driver->rename('test/path', 'test/path'));
515+
}
499516
}

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminAttributeSetSelectionTest.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,11 @@
4040

4141
<!-- Go to new product page and see a default attribute -->
4242
<!-- Switch from default attribute set to new attribute set -->
43-
<amOnPage url="{{AdminProductCreatePage.url('4', 'bundle')}}" stepKey="goToNewProductPage"/>
44-
<waitForPageLoad stepKey="wait2"/>
43+
<actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToNewProductPage">
44+
<argument name="attributeSetId" value="4"/>
45+
<argument name="productType" value="bundle"/>
46+
</actionGroup>
47+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="wait2"/>
4548

4649
<actionGroup ref="AdminSelectAttributeSetOnEditProductPageActionGroup" stepKey="startEditAttrSet">
4750
<argument name="attributeSet" value="{{ProductAttributeFrontendLabel.label}}"/>

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminBasicBundleProductAttributesTest.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,10 @@
4040
</actionGroup>
4141

4242
<!--Go to product creation page-->
43-
<actionGroup ref="AdminOpenCreateBundleProductPageActionGroup" stepKey="goToBundleProductCreationPage"/>
43+
<actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToBundleProductCreationPage">
44+
<argument name="attributeSetId" value="{{BundleProduct.set}}"/>
45+
<argument name="productType" value="{{BundleProduct.type}}"/>
46+
</actionGroup>
4447
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreationPage"/>
4548

4649
<!--Enable/Disable Toggle-->

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProductTest.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@
3131
</after>
3232

3333
<!--Create bundle product-->
34-
<actionGroup ref="AdminOpenCreateBundleProductPageActionGroup" stepKey="goToBundleProductCreationPage"/>
34+
<actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToBundleProductCreationPage">
35+
<argument name="attributeSetId" value="{{BundleProduct.set}}"/>
36+
<argument name="productType" value="{{BundleProduct.type}}"/>
37+
</actionGroup>
38+
3539
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreationPage"/>
3640
<conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems"/>
3741
<click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption3"/>

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProductTest.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@
3131
</after>
3232

3333
<!--Create bundle product-->
34-
<actionGroup ref="AdminOpenCreateBundleProductPageActionGroup" stepKey="goToBundleProductCreationPage"/>
34+
<actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToBundleProductCreationPage">
35+
<argument name="attributeSetId" value="{{BundleProduct.set}}"/>
36+
<argument name="productType" value="{{BundleProduct.type}}"/>
37+
</actionGroup>
38+
3539
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreationPage"/>
3640
<conditionalClick selector="{{AdminProductFormBundleSection.bundleItemsToggle}}" dependentSelector="{{AdminProductFormBundleSection.bundleItemsToggle}}" visible="false" stepKey="conditionallyOpenSectionBundleItems"/>
3741
<click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption3"/>

‎app/code/Magento/Bundle/Test/Mftf/Test/BundleProductFixedPricingTest.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,10 @@
3939
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4040
</after>
4141
<!--Go to bundle product creation page-->
42-
<actionGroup ref="AdminOpenCreateBundleProductPageActionGroup" stepKey="goToBundleProductCreationPage"/>
42+
<actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToBundleProductCreationPage">
43+
<argument name="attributeSetId" value="{{BundleProduct.set}}"/>
44+
<argument name="productType" value="{{BundleProduct.type}}"/>
45+
</actionGroup>
4346
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreatePageToLoad"/>
4447

4548
<!-- Add two bundle items -->

‎app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithTierPriceInCartTest.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@
3636
</actionGroup>
3737
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3838
</after>
39-
<actionGroup ref="AdminOpenCreateBundleProductPageActionGroup" stepKey="goToBundleProductCreationPage"/>
39+
<actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToBundleProductCreationPage">
40+
<argument name="attributeSetId" value="{{BundleProduct.set}}"/>
41+
<argument name="productType" value="{{BundleProduct.type}}"/>
42+
</actionGroup>
4043
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreatePageToLoad"/>
4144
<actionGroup ref="FillMainBundleProductFormActionGroup" stepKey="fillMainFieldsForBundle"/>
4245
<actionGroup ref="AddBundleOptionWithOneProductActionGroup" stepKey="addBundleOption1">

‎app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithTierPriceWithFixedAndPercentOptionsInCartTest.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@
4141
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
4242
</after>
4343

44-
<actionGroup ref="AdminOpenCreateBundleProductPageActionGroup" stepKey="goToBundleProductCreationPage"/>
44+
<actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToBundleProductCreationPage">
45+
<argument name="attributeSetId" value="{{BundleProduct.set}}"/>
46+
<argument name="productType" value="{{BundleProduct.type}}"/>
47+
</actionGroup>
4548
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreatePageToLoad"/>
4649
<click selector="{{AdminProductFormBundleSection.dynamicSkuToggle}}" stepKey="disableDynamicSku"/>
4750
<click selector="{{AdminProductFormBundleSection.dynamicPrice}}" stepKey="clickDynamicPriceSwitcher"/>

‎app/code/Magento/Bundle/Test/Mftf/Test/CurrencyChangingBundleProductInCartTest.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,10 @@
4545
<deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
4646
</after>
4747
<!--Go to bundle product creation page-->
48-
<actionGroup ref="AdminOpenCreateBundleProductPageActionGroup" stepKey="goToBundleProductCreationPage"/>
48+
<actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToBundleProductCreationPage">
49+
<argument name="attributeSetId" value="{{BundleProduct.set}}"/>
50+
<argument name="productType" value="{{BundleProduct.type}}"/>
51+
</actionGroup>
4952
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForBundleProductCreatePageToLoad"/>
5053
<actionGroup ref="FillMainBundleProductFormActionGroup" stepKey="fillMainFieldsForBundle"/>
5154
<!-- Add Option, a "Radio Buttons" type option -->

0 commit comments

Comments
 (0)