Merge remote-tracking branch 'origin/2.3-develop' into MC-3483

Author: dmitriyprime

app/code/Magento/Backend/Test/Mftf/ActionGroup/SetAdminAccountActionGroup.xml

@@ -10,15 +10,15 @@
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="SetAdminAccountActionGroup">
         <arguments>
-            <argument name="InterfaceLocaleByValue" type="string"/>
+            <argument name="InterfaceLocaleByValue" defaultValue="en_US" type="string"/>
         </arguments>
         <!-- Navigate to admin System Account Page-->
         <amOnPage url="{{AdminSystemAccountPage.url}}" stepKey="openAdminSystemAccountPage" />
-        <waitForPageLoad stepKey="loadAdminSystemAccountPage"/>
         <!-- Change Admin locale to Français (France) / French (France) -->
         <selectOption userInput="{{InterfaceLocaleByValue}}" selector="{{AdminSystemAccountSection.interfaceLocale}}" stepKey="setInterfaceLocate"/>
         <fillField selector="{{AdminSystemAccountSection.currentPassword}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="fillPassword"/>
-        <click selector="{{AdminCustomerMainActionsSection.saveButton}}" stepKey="clickSave"/>
-        <waitForElement selector="{{AdminCustomerMessagesSection.successMessage}}" stepKey="waitSuccessMessage"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSave"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitSuccessMessage"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the account." stepKey="seeSuccessMessage"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpenCmsBlockActionGroup.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminOpenCmsBlockActionGroup">
+        <arguments>
+            <argument name="block_id" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminEditBlockPage.url(block_id)}}" stepKey="openEditCmsBlock"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpentCmsBlockActionGroup.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminOpenCmsBlockActionGroup">
+        <arguments>
+            <argument name="block_id" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminEditBlockPage.url(block_id)}}" stepKey="openEditCmsBlock"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Cms/Test/Mftf/Data/BlockPageData.xml

@@ -9,7 +9,7 @@
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="_defaultBlock" type="block">
-        <data key="title">Default Block</data>
+        <data key="title" unique="suffix">Default Block</data>
         <data key="identifier" unique="suffix" >block</data>
         <data key="content">Here is a block test. Yeah!</data>
         <data key="active">true</data>

app/code/Magento/Cms/Test/Mftf/Page/AdminCmsEditBlockPage.xml

@@ -8,7 +8,7 @@
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-    <page name="AdminEditBlockPage" url="cms/block/edit/block_id" area="admin" module="Magento_Cms">
+    <page name="AdminEditBlockPage" url="cms/block/edit/block_id/{{id}}" area="admin" module="Magento_Cms" parameterized="true">
         <section name="AdminUpdateBlockSection"/>
     </page>
 </pages>

app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridTableSection.xml

@@ -20,6 +20,6 @@
         <element name="rowViewAction" type="button" selector=".data-grid tbody > tr:nth-of-type({{row}}) .action-menu-item" parameterized="true" timeout="30"/>
         <element name="dataGridEmpty" type="block" selector=".data-grid-tr-no-data td"/>
         <element name="rowTemplateStrict" type="block" selector="//tbody/tr[td[*[text()[normalize-space()='{{text}}']]]]" parameterized="true" />
-        <element name="rowTemplate" type="block" selector="//tbody/tr[td[*[contains(.,normalize-space('{{text}}'))]]]" parameterized="true" />
+        <element name="rowTemplate" type="block" selector="//tbody/tr[td[*[contains(.,normalize-space('{{text}}'))]]]" parameterized="true" timeout="30" />
     </section>
 </sections>