#29715: Fixed tests

sivaschenko · sivaschenko · commit 253bafbc2546 · 2020-09-04T19:34:57.000+01:00
diff --git a/app/code/Magento/MediaGalleryUi/Block/Adminhtml/ImageDetails.php b/app/code/Magento/MediaGalleryUi/Block/Adminhtml/ImageDetails.php
@@ -31,16 +31,17 @@ class ImageDetails extends Template
     private $json;
 
     /**
-     * @param AuthorizationInterface $authorization
      * @param Template\Context $context
+     * @param AuthorizationInterface $authorization
+     * @param Json $json
      * @param array $data
      * @param JsonHelper|null $jsonHelper
      * @param DirectoryHelper|null $directoryHelper
      */
     public function __construct(
+        Template\Context $context,
         AuthorizationInterface $authorization,
         Json $json,
-        Template\Context $context,
         array $data = [],
         ?JsonHelper $jsonHelper = null,
         ?DirectoryHelper $directoryHelper = null
diff --git a/app/code/Magento/MediaGalleryUi/Block/Adminhtml/ImageDetailsStandalone.php b/app/code/Magento/MediaGalleryUi/Block/Adminhtml/ImageDetailsStandalone.php
@@ -31,16 +31,17 @@ class ImageDetailsStandalone extends Template
     private $json;
 
     /**
-     * @param AuthorizationInterface $authorization
      * @param Template\Context $context
+     * @param AuthorizationInterface $authorization
+     * @param Json $json
      * @param array $data
      * @param JsonHelperData|null $jsonHelper
      * @param DirectoryHelperData|null $directoryHelper
      */
     public function __construct(
+        Template\Context $context,
         AuthorizationInterface $authorization,
         Json $json,
-        Template\Context $context,
         array $data = [],
         ?JsonHelperData $jsonHelper = null,
         ?DirectoryHelperData $directoryHelper = null
@@ -57,7 +58,7 @@ public function __construct(
      */
     public function getActionsJson(): string
     {
-        $actions = [
+        $standaloneActions = [
             [
                 'title' => __('Cancel'),
                 'handler' => 'closeModal',
@@ -67,7 +68,7 @@ public function getActionsJson(): string
         ];
 
         if ($this->authorization->isAllowed('Magento_MediaGalleryUiApi::delete_assets')) {
-            $actions[] = [
+            $standaloneActions[] = [
                 'title' => __('Delete Image'),
                 'handler' => 'deleteImageAction',
                 'name' => 'delete',
@@ -76,14 +77,14 @@ public function getActionsJson(): string
         }
 
         if ($this->authorization->isAllowed('Magento_MediaGalleryUiApi::edit_assets')) {
-            $actions[] = [
+            $standaloneActions[] = [
                 'title' => __('Edit Details'),
                 'handler' => 'editImageAction',
                 'name' => 'edit',
                 'classes' => 'action-default scalable edit action-quaternary'
             ];
         }
 
-        return $this->json->serialize($actions);
+        return $this->json->serialize($standaloneActions);
     }
 }
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryCreateFolderAclTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryCreateFolderAclTest.xml
@@ -44,7 +44,7 @@
         <actionGroup ref="AdminUserClickRoleResourceTabActionGroup" stepKey="switchToRoleResourceTab"/>
         <actionGroup ref="AdminAddRestrictedRoleActionGroup" stepKey="AddMediaGalleryResource">
             <argument name="User" value="adminRole"/>
-            <argument name="restrictedRole" value="Create Folder"/>
+            <argument name="restrictedRole" value="Create folder"/>
         </actionGroup>
         <actionGroup ref="AdminAddRestrictedRoleActionGroup" stepKey="AddMediaGalleryPagesResource">
             <argument name="User" value="adminRole"/>
@@ -58,7 +58,7 @@
         </actionGroup>
 
         <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
-        
+
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsNewUser">
             <argument name="username" value="{{admin2.username}}"/>
             <argument name="password" value="{{admin2.password}}"/>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDeleteAssetsAclTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDeleteAssetsAclTest.xml
@@ -44,7 +44,7 @@
         <actionGroup ref="AdminUserClickRoleResourceTabActionGroup" stepKey="switchToRoleResourceTab"/>
         <actionGroup ref="AdminAddRestrictedRoleActionGroup" stepKey="uncheckDeleteFolder">
             <argument name="User" value="adminRole"/>
-            <argument name="restrictedRole" value="Delete Assets"/>
+            <argument name="restrictedRole" value="Delete assets"/>
         </actionGroup>
 
         <actionGroup ref="AdminAddRestrictedRoleActionGroup" stepKey="AddMediaGalleryPagesResource">
@@ -59,7 +59,7 @@
         </actionGroup>
 
         <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
-        
+
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsNewUser">
             <argument name="username" value="{{admin2.username}}"/>
             <argument name="password" value="{{admin2.password}}"/>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDeleteFolderAclTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDeleteFolderAclTest.xml
@@ -44,9 +44,9 @@
         <actionGroup ref="AdminUserClickRoleResourceTabActionGroup" stepKey="switchToRoleResourceTab"/>
         <actionGroup ref="AdminAddRestrictedRoleActionGroup" stepKey="AddMediaGalleryResource">
             <argument name="User" value="adminRole"/>
-            <argument name="restrictedRole" value="Delete Folder"/>
+            <argument name="restrictedRole" value="Delete folder"/>
         </actionGroup>
-        
+
         <actionGroup ref="AdminAddRestrictedRoleActionGroup" stepKey="AddMediaGalleryPagesResource">
             <argument name="User" value="adminRole"/>
             <argument name="restrictedRole" value="Pages"/>
@@ -59,7 +59,7 @@
         </actionGroup>
 
         <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
-        
+
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsNewUser">
             <argument name="username" value="{{admin2.username}}"/>
             <argument name="password" value="{{admin2.password}}"/>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryUploadAssetsAclTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryUploadAssetsAclTest.xml
@@ -44,7 +44,7 @@
         <actionGroup ref="AdminUserClickRoleResourceTabActionGroup" stepKey="switchToRoleResourceTab"/>
         <actionGroup ref="AdminAddRestrictedRoleActionGroup" stepKey="AddMediaGalleryUnchekDeleteAssets">
             <argument name="User" value="adminRole"/>
-            <argument name="restrictedRole" value="Upload Assets"/>
+            <argument name="restrictedRole" value="Upload assets"/>
         </actionGroup>
 
         <actionGroup ref="AdminAddRestrictedRoleActionGroup" stepKey="AddMediaGalleryPagesResource">
@@ -59,7 +59,7 @@
         </actionGroup>
 
         <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
-        
+
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsNewUser">
             <argument name="username" value="{{admin2.username}}"/>
             <argument name="password" value="{{admin2.password}}"/>
diff --git a/app/code/Magento/MediaGalleryUi/composer.json b/app/code/Magento/MediaGalleryUi/composer.json
@@ -12,7 +12,9 @@
         "magento/module-media-gallery-metadata-api": "*",
         "magento/module-media-gallery-synchronization-api": "*",
         "magento/module-media-content-api": "*",
-        "magento/module-cms": "*"
+        "magento/module-cms": "*",
+        "magento/module-directory": "*",
+        "magento/module-authorization": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_details.phtml b/app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_details.phtml
@@ -73,7 +73,7 @@ use Magento\Framework\Escaper;
                         "modalWindowSelector": ".media-gallery-image-details",
                         "imageModelName" : "media_gallery_listing.media_gallery_listing.media_gallery_columns.thumbnail_url",
                         "mediaGalleryImageDetailsName": "mediaGalleryImageDetails",
-                        "actionsList": <?= $block->getActionsJson() ?>
+                        "actionsList": <?= /* @noEscape */ $block->getActionsJson() ?>
                     }
                 }
             }
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_details_standalone.phtml b/app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_details_standalone.phtml
@@ -69,7 +69,7 @@
                         "modalWindowSelector": ".media-gallery-image-details",
                         "mediaGalleryImageDetailsName": "mediaGalleryImageDetails",
                         "imageModelName" : "standalone_media_gallery_listing.standalone_media_gallery_listing.media_gallery_columns.thumbnail_url",
-                        "actionsList": <?= $block->getActionsJson() ?>
+                        "actionsList": <?= /* @noEscape */ $block->getActionsJson() ?>
                     }
                 }
             }
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/columns/image/actions.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/columns/image/actions.js
@@ -55,7 +55,7 @@ define([
             this._super();
             this.initEvents();
 
-            this.actionsList = this.actionsList.filter(function(item) {
+            this.actionsList = this.actionsList.filter(function (item) {
                 return this.allowedActions.includes(item.name);
             }.bind(this));
 

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ use Magento\Framework\Escaper;`
`73`	`73`	`"modalWindowSelector": ".media-gallery-image-details",`
`74`	`74`	`"imageModelName" : "media_gallery_listing.media_gallery_listing.media_gallery_columns.thumbnail_url",`
`75`	`75`	`"mediaGalleryImageDetailsName": "mediaGalleryImageDetails",`
`76`		`- "actionsList": <?= $block->getActionsJson() ?>`
	`76`	`+ "actionsList": <?= /* @noEscape */ $block->getActionsJson() ?>`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@`
`69`	`69`	`"modalWindowSelector": ".media-gallery-image-details",`
`70`	`70`	`"mediaGalleryImageDetailsName": "mediaGalleryImageDetails",`
`71`	`71`	`"imageModelName" : "standalone_media_gallery_listing.standalone_media_gallery_listing.media_gallery_columns.thumbnail_url",`
`72`		`- "actionsList": <?= $block->getActionsJson() ?>`
	`72`	`+ "actionsList": <?= /* @noEscape */ $block->getActionsJson() ?>`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`	`}`