Skip to content

Commit e029afd

Browse files
rganinrganin
committed
Merge branch 'B2B-2112' of https://github.com/magento-arcticfoxes/magento2ce into af-prs-develop
2 parents 647f7fa + 12bb9b0 commit e029afd

10 files changed

+44
-16
lines changed

‎app/code/Magento/Cms/Test/Mftf/Data/CmsPageData.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
<data key="height">1000</data>
7777
</entity>
7878
<entity name="ImageUpload3" type="uploadImage">
79-
<data key="title" unique="suffix">Image1</data>
79+
<data key="title">Title of the magento image</data>
8080
<data key="price">1.00</data>
8181
<data key="file_type">Upload File</data>
8282
<data key="shareable">Yes</data>

‎app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertImageDeletedActionGroup.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminEnhancedMediaGalleryAssertImageDoesNotExistActionGroup">
12+
<annotations>
13+
<description>Asserts that the given image does not exist in the enhanced Media Gallery grid</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="image" type="string" defaultValue="{{ImageUpload.fileName}}"/>
17+
</arguments>
18+
19+
<waitForElement selector="{{AdminEnhancedMediaGalleryImageActionsSection.imagesGrid}}" stepKey="waitForImagesGrid"/>
20+
<dontSee userInput="{{image}}" selector="{{AdminEnhancedMediaGalleryImageActionsSection.imagesGrid}}" stepKey="dontSeeImageInGrid"/>
21+
</actionGroup>
22+
</actionGroups>

‎app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminEnhancedMediaGalleryImageDeletedActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="AssertAdminEnhancedMediaGalleryImageDeletedActionGroup">
1212
<annotations>
13-
<description>Assert that an image was deleted from Enhanced Media Gallery.</description>
13+
<description>Assert that an image was deleted from Enhanced Media Gallery. Note that this actiongroup is flaky because the success message disappears rather quickly</description>
1414
</annotations>
1515
<arguments>
1616
<argument name="title"/>
1717
</arguments>
18-
<see userInput='The asset "{{title}}" has been successfully deleted' stepKey="verifyDeleteImage"/>
18+
<waitForText userInput='The asset "{{title}}" has been successfully deleted' stepKey="verifyDeleteImage"/>
1919
</actionGroup>
2020
</actionGroups>

‎app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertImageAttributesOnEnhancedMediaGalleryActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<grabTextFrom selector="{{AdminEnhancedMediaGalleryImageDescriptionSection.title}}" stepKey="grabImageTitle"/>
2020
<assertStringContainsString stepKey="verifyImageTitle">
2121
<actualResult type="variable">grabImageTitle</actualResult>
22-
<expectedResult type="string">{{image.fileName}}</expectedResult>
22+
<expectedResult type="string">{{image.title}}</expectedResult>
2323
</assertStringContainsString>
2424

2525
<grabTextFrom selector="{{AdminEnhancedMediaGalleryImageDescriptionSection.contentType}}" stepKey="grabContentType"/>

‎app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryImageActionsSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@
1515
<element name="delete" type="button" selector="//ul[@class='action-menu _active']//a[text()='Delete']"/>
1616
<element name="edit" type="button" selector="//ul[@class='action-menu _active']//a[text()='Edit']"/>
1717
<element name="imageInGrid" type="button" selector="//li[@data-ui-id='title'and text()='{{imageTitle}}']/parent::*/parent::*/parent::div//img[@class='media-gallery-image-column']" parameterized="true"/>
18+
<element name="imagesGrid" type="block" selector="//div[@class='masonry-image-grid']"/>
1819
</section>
1920
</sections>

‎app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDeleteImageContextMenuTest.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,12 @@
4747
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
4848
<argument name="image" value="ImageUpload3"/>
4949
</actionGroup>
50+
<actionGroup ref="AssertImageAttributesOnEnhancedMediaGalleryActionGroup" stepKey="assertImageUploaded">
51+
<argument name="image" value="ImageUpload3"/>
52+
</actionGroup>
5053
<actionGroup ref="AdminEnhancedMediaGalleryImageDeleteActionGroup" stepKey="deleteImage"/>
51-
<actionGroup ref="AssertAdminEnhancedMediaGalleryImageDeletedActionGroup" stepKey="assertImageDeleted">
52-
<argument name="title" value="ImageMetadata.title"/>
54+
<actionGroup ref="AdminEnhancedMediaGalleryAssertImageDoesNotExistActionGroup" stepKey="assertImageDeleted">
55+
<argument name="image" value="{{ImageUpload3.filename}}"/>
5356
</actionGroup>
5457
</test>
5558
</tests>

‎app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDeleteImageFileTest.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,18 @@
4444
</after>
4545

4646
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
47-
<argument name="image" value="ImageUpload"/>
47+
<argument name="image" value="ImageUpload3"/>
4848
</actionGroup>
4949
<actionGroup ref="AdminEnhancedMediaGalleryEnableMassActionModeActionGroup" stepKey="enableMassActionToDeleteImages"/>
5050
<actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectFirstImageToDelete">
51-
<argument name="imageName" value="{{ImageUpload.fileName}}"/>
51+
<argument name="imageName" value="{{ImageUpload3.title}}"/>
5252
</actionGroup>
5353

5454
<actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clikDeleteSelectedButton"/>
5555
<actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImages"/>
5656

57-
<actionGroup ref="AssertAdminEnhancedMediaGalleryImageDeletedActionGroup" stepKey="verifyImageIsDeleted">
58-
<argument name="title" value="ImageUpload.filename"/>
57+
<actionGroup ref="AdminEnhancedMediaGalleryAssertImageDoesNotExistActionGroup" stepKey="verifyImageIsDeleted">
58+
<argument name="image" value="{{ImageUpload3.filename}}"/>
5959
</actionGroup>
6060
</test>
6161
</tests>

‎app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryVerifyImageGridAttributesTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@
3636
</after>
3737

3838
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
39-
<argument name="image" value="ImageUpload"/>
39+
<argument name="image" value="ImageUpload3"/>
4040
</actionGroup>
4141

4242
<actionGroup ref="AssertImageAttributesOnEnhancedMediaGalleryActionGroup" stepKey="assertImageAttributes">
43-
<argument name="image" value="ImageUpload"/>
43+
<argument name="image" value="ImageUpload3"/>
4444
</actionGroup>
4545
</test>
4646
</tests>

‎app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryViewDetailsDeleteImageTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
<argument name="image" value="ImageMetadata"/>
5353
</actionGroup>
5454
<actionGroup ref="AdminEnhancedMediaGalleryImageDetailsDeleteActionGroup" stepKey="deleteImage"/>
55-
<actionGroup ref="AssertAdminEnhancedMediaGalleryImageDeletedActionGroup" stepKey="assertImageDeleted">
56-
<argument name="title" value="ImageMetadata.title"/>
55+
<actionGroup ref="AdminEnhancedMediaGalleryAssertImageDoesNotExistActionGroup" stepKey="assertImageDeleted">
56+
<argument name="image" value="{{ImageMetadata.title}}"/>
5757
</actionGroup>
5858
</test>
5959
</tests>

‎app/code/Magento/RemoteStorage/Driver/Adapter/PathUtil.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,15 @@ class PathUtil
2020
*/
2121
public function pathInfo($path)
2222
{
23+
// phpcs:disable Magento2.Functions.DiscouragedFunction
2324
$pathInfo = ['path' => $path];
2425
$dirname = dirname($path);
2526
if ('' !== $dirname) {
2627
$pathInfo['dirname'] = $dirname === '.' ? '' : $dirname;
2728
}
28-
$pathInfo['basename'] = $this->basename($path);
29-
$pathInfo += pathinfo($pathInfo['basename']);
29+
$pathInfo += pathinfo($this->basename($path));
30+
$pathInfo['basename'] = $pathInfo['filename'];
31+
// phpcs:enable Magento2.Functions.DiscouragedFunction
3032
return $pathInfo + ['dirname' => ''];
3133
}
3234

0 commit comments

Comments
 (0)