[Magento Community Engineering] Community Contributions - 2.3-develop

 - merged latest code from mainline branch

Author: magento-engcom-team

app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductActionSection.xml

@@ -9,7 +9,7 @@
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontProductActionSection">
         <element name="quantity" type="input" selector="#qty"/>
-        <element name="addToCart" type="button" selector="#product-addtocart-button"/>
+        <element name="addToCart" type="button" selector="#product-addtocart-button" timeout="60"/>
         <element name="addToCartButtonTitleIsAdding" type="text" selector="//button/span[text()='Adding...']"/>
         <element name="addToCartButtonTitleIsAdded" type="text" selector="//button/span[text()='Added']"/>
         <element name="addToCartButtonTitleIsAddToCart" type="text" selector="//button/span[text()='Add to Cart']"/>

app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartSummarySection.xml

@@ -20,7 +20,7 @@
         <element name="totalAmount" type="text" selector="//*[@id='cart-totals']//tr[@class='grand totals']//td//span[@class='price' and contains(text(), '{{amount}}')]" parameterized="true"/>
         <element name="proceedToCheckout" type="button" selector=".action.primary.checkout span" timeout="30"/>
         <element name="discountAmount" type="text" selector="td[data-th='Discount']"/>
-        <element name="shippingHeading" type="button" selector="#block-shipping-heading"/>
+        <element name="shippingHeading" type="button" selector="#block-shipping-heading" timeout="60"/>
         <element name="postcode" type="input" selector="input[name='postcode']" timeout="10"/>
         <element name="stateProvince" type="select" selector="select[name='region_id']" timeout="10"/>
         <element name="stateProvinceInput" type="input" selector="input[name='region']"/>

app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingMethodsSection.xml

@@ -14,7 +14,7 @@
         <element name="shippingMethodRow" type="text" selector=".form.methods-shipping table tbody tr"/>
         <element name="checkShippingMethodByName" type="radio" selector="//div[@id='checkout-shipping-method-load']//td[contains(., '{{var1}}')]/..//input" parameterized="true"/>
         <element name="shippingMethodFlatRate" type="radio" selector="#checkout-shipping-method-load input[value='flatrate_flatrate']"/>
-        <element name="shippingMethodFreeShipping" type="radio" selector="#checkout-shipping-method-load input[value='freeshipping_freeshipping']"/>
+        <element name="shippingMethodFreeShipping" type="radio" selector="#checkout-shipping-method-load input[value='freeshipping_freeshipping']" timeout="60"/>
         <element name="shippingMethodRowByName" type="text" selector="//div[@id='checkout-shipping-method-load']//td[contains(., '{{var1}}')]/.." parameterized="true"/>
         <element name="shipHereButton" type="button" selector="//div/following-sibling::div/button[contains(@class, 'action-select-shipping-item')]"/>
         <element name="shippingMethodLoader" type="button" selector="//div[contains(@class, 'checkout-shipping-method')]/following-sibling::div[contains(@class, 'loading-mask')]"/>

app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMiniCartSection.xml

@@ -16,7 +16,7 @@
         <element name="productName" type="text" selector=".product-item-name"/>
         <element name="productOptionsDetailsByName" type="button" selector="//header//ol[@id='mini-cart']//div[@class='product-item-details'][.//a[contains(text(), '{{var1}}')]]//span[.='See Details']"  parameterized="true"/>
         <element name="productOptionByNameAndAttribute" type="text" selector="//header//ol[@id='mini-cart']//div[@class='product-item-details'][.//a[contains(text(), '{{var1}}')]]//dt[@class='label' and .='{{var2}}']/following-sibling::dd[@class='values']//span"  parameterized="true"/>
-        <element name="showCart" type="button" selector="a.showcart"/>
+        <element name="showCart" type="button" selector="a.showcart" timeout="60"/>
         <element name="quantity" type="button" selector="span.counter-number"/>
         <element name="miniCartOpened" type="button" selector="a.showcart.active"/>
         <element name="goToCheckout" type="button" selector="#top-cart-btn-checkout" timeout="30"/>

app/code/Magento/Config/Test/Mftf/Section/GeneralSection.xml

@@ -9,11 +9,11 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="ContentManagementSection">
-        <element name="WYSIWYGOptions" type="button" selector="#cms_wysiwyg-head"/>
+        <element name="WYSIWYGOptions" type="button" selector="#cms_wysiwyg-head" timeout="60"/>
         <element name="CheckIfTabExpand" type="button" selector="#cms_wysiwyg-head:not(.open)"/>
         <element name="EnableSystemValue" type="button" selector="#cms_wysiwyg_enabled_inherit"/>
         <element name="EnableWYSIWYG" type="button" selector="#cms_wysiwyg_enabled"/>
-        <element name="SwitcherSystemValue" type="button" selector="#cms_wysiwyg_editor_inherit"/>
+        <element name="SwitcherSystemValue" type="button" selector="#cms_wysiwyg_editor_inherit" timeout="60"/>
         <element name="Switcher" type="button" selector="#cms_wysiwyg_editor" />
         <element name="StaticURL" type="button" selector="#cms_wysiwyg_use_static_urls_in_catalog" />
         <element name="Save" type="button" selector="#save" timeout="30"/>

app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerLogoutActionGroup.xml

@@ -10,6 +10,7 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="StorefrontCustomerLogoutActionGroup">
         <amOnPage url="{{StorefrontCustomerLogoutPage.url}}" stepKey="storefrontSignOut"/>
+        <waitForPageLoad stepKey="waitForSignOut"/>
     </actionGroup>
 
     <actionGroup name="StorefrontSignOutActionGroup">

app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSidebarSection.xml

@@ -9,7 +9,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontCustomerSidebarSection">
-        <element name="sidebarTab" type="text" selector="//div[@id='block-collapsible-nav']//a[text()='{{tabName}}']" parameterized="true"/>
+        <element name="sidebarTab" type="text" selector="//div[@id='block-collapsible-nav']//a[text()='{{tabName}}']" parameterized="true" timeout="60"/>
         <element name="sidebarCurrentTab" type="text" selector="//div[@id='block-collapsible-nav']//*[contains(text(), '{{var}}')]" parameterized="true"/>
     </section>
 </sections>

app/code/Magento/Customer/Test/Mftf/Test/VerifyDisabledCustomerGroupFieldTest.xml

@@ -27,6 +27,7 @@
         <!-- 2. Navigate to Customers > Customer Groups -->
         <amOnPage url="{{AdminCustomerGroupPage.url}}" stepKey="amOnCustomerGroupPage" />
         <waitForPageLoad stepKey="waitForCustomerGroupsPageLoad" />
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearFilters"/>
 
         <!-- 3. Select system Customer Group specified in data set from grid -->
         <click selector="{{AdminCustomerGroupMainSection.editButtonByCustomerGroupCode(NotLoggedInCustomerGroup.code)}}" stepKey="clickOnEditCustomerGroup" />

app/code/Magento/Multishipping/view/frontend/templates/checkout/item/default.phtml

@@ -12,7 +12,7 @@
         <?php foreach ($_options as $_option) : ?>
             <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
             <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-            <dd<?= (isset($_formatedOptionValue['full_view']) ? ' class="tooltip wrapper"' : '') ?>
+            <dd<?= (isset($_formatedOptionValue['full_view']) ? ' class="tooltip wrapper"' : '') ?>>
                 <?= $block->escapeHtml($_formatedOptionValue['value']) ?>
                 <?php if (isset($_formatedOptionValue['full_view'])) : ?>
                     <dl class="item options tooltip content">

app/code/Magento/Newsletter/Test/Mftf/Section/NewsletterTemplateSection.xml

@@ -12,14 +12,14 @@
         <element name="templateSubject" type="input" selector="#subject"/>
         <element name="senderName" type="input" selector="#sender_name"/>
         <element name="senderEmail" type="input" selector="#sender_email"/>
-        <element name="save" type="button" selector="button[data-role='template-save']"/>
+        <element name="save" type="button" selector="button[data-role='template-save']" timeout="60"/>
         <element name="searchButton" type="button" selector=".admin__filter-actions button[title=Search]"/>
         <element name="searchInput" type="input" selector="input[name=code]"/>
     </section>
     <section name="NewsletterWYSIWYGSection">
         <element name="TextArea" type="text" selector="#text" />
         <element name="TinyMCE4" type="text" selector=".mce-branding-powered-by" />
-        <element name="ShowHideBtn" type="button" selector="#toggletext"/>
+        <element name="ShowHideBtn" type="button" selector="#toggletext" timeout="60"/>
         <element name="InsertWidgetBtn" type="button" selector=".action-add-widget"/>
         <element name="InsertWidgetIcon" type="button" selector="div[aria-label='Insert Widget']"/>
         <element name="InsertVariableIcon" type="button" selector="div[aria-label='Insert Variable']"/>
@@ -51,6 +51,6 @@
         <element name="InsertImage" type="button" selector=".mce-i-image" />
         <element name="InsertTable" type="button" selector=".mce-i-table" />
         <element name="SpecialCharacter" type="button" selector=".mce-i-charmap" />
-        <element name="Preview" type="text" selector="//td[contains(text(),'{{var1}}')]//following-sibling::td/select//option[contains(text(), 'Preview')]" parameterized="true"/>
+        <element name="Preview" type="text" selector="//td[contains(text(),'{{var1}}')]//following-sibling::td/select//option[contains(text(), 'Preview')]" parameterized="true" timeout="60"/>
     </section>
 </sections>

app/code/Magento/Newsletter/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnNewsletterTest.xml

@@ -29,6 +29,7 @@
         <fillField selector="{{BasicFieldNewsletterSection.senderName}}" userInput="{{_defaultNewsletter.senderName}}" stepKey="fillSenderName" />
         <fillField selector="{{BasicFieldNewsletterSection.senderEmail}}" userInput="{{_defaultNewsletter.senderEmail}}" stepKey="fillSenderEmail" />
         <conditionalClick selector="#toggletext" dependentSelector=".mce-tinymce" visible="false" stepKey="clickBtnIfTinyMCEHidden"/>
+        <waitForPageLoad stepKey="waitForTinyMce"/>
         <actionGroup ref="VerifyTinyMCEActionGroup" stepKey="verifyTinyMCE4"/>
         <actionGroup ref="VerifyMagentoEntityActionGroup" stepKey="verifyMagentoEntities"/>
         <executeJS function="tinyMCE.get('text').setContent('Hello World From Newsletter Template!');" stepKey="executeJSFillContent"/>

app/code/Magento/Reports/Test/Mftf/Section/OrderReportMainSection.xml

@@ -9,8 +9,8 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="OrderReportMainSection">
-        <element name="showReport" type="button" selector="#filter_form_submit"/>
-        <element name="here" type="text" selector="//a[contains(text(), 'here')]"/>
+        <element name="showReport" type="button" selector="#filter_form_submit" timeout="60"/>
+        <element name="here" type="text" selector="//a[contains(text(), 'here')]" timeout="60"/>
     </section>
 
     <section name="OrderReportFilterSection">

app/code/Magento/Reports/Test/Mftf/Test/CancelOrdersInOrderSalesReportTest.xml

@@ -17,9 +17,6 @@
             <severity value="MAJOR"/>
             <testCaseId value="MAGETWO-95960"/>
             <useCaseId value="MAGETWO-95823"/>
-            <skip>
-                <issueId value="MC-17274"/>
-            </skip>
         </annotations>
 
         <before>
@@ -69,6 +66,7 @@
 
         <!-- Generate Order report for statuses  -->
         <amOnPage url="{{OrdersReportPage.url}}" stepKey="goToOrdersReportPage1"/>
+        <waitForPageLoad stepKey="waitForOrdersReportPageLoad1"/>
         <!-- Get date -->
         <generateDate stepKey="generateEndDate" date="+0 day" format="m/d/Y"/>
         <generateDate stepKey="generateStartDate" date="-1 day" format="m/d/Y"/>
@@ -81,6 +79,7 @@
         <grabTextFrom selector="{{GeneratedReportSection.ordersCount}}" stepKey="grabCanceledOrdersSpecified"/>
         <!-- Generate Order report -->
         <amOnPage url="{{OrdersReportPage.url}}" stepKey="goToOrdersReportPage2"/>
+        <waitForPageLoad stepKey="waitForOrdersReportPageLoad2"/>
         <!-- Get date -->
         <actionGroup ref="GenerateOrderReportActionGroup" stepKey="generateReportAfterCancelOrder">
             <argument name="orderFromDate" value="$generateStartDate"/>

app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml

@@ -418,13 +418,15 @@
         <click selector="{{OrdersGridSection.addProducts}}" stepKey="clickOnAddProducts"/>
         <waitForPageLoad stepKey="waitForProductsListForOrder"/>
         <click selector="{{AdminOrdersGridSection.productForOrder(product.sku)}}" stepKey="chooseTheProduct"/>
+        <waitForPageLoad stepKey="waitForClickProduct"/>
         <click selector="{{AdminOrderFormItemsSection.addSelected}}" stepKey="addSelectedProductToOrder"/>
         <waitForPageLoad stepKey="waitForProductAddedInOrder"/>
         <click selector="{{AdminInvoicePaymentShippingSection.getShippingMethodAndRates}}" stepKey="openShippingMethod"/>
         <waitForPageLoad stepKey="waitForShippingMethods"/>
         <click selector="{{AdminInvoicePaymentShippingSection.shippingMethod}}" stepKey="chooseShippingMethod"/>
         <waitForPageLoad stepKey="waitForShippingMethodsThickened"/>
         <click selector="{{OrdersGridSection.submitOrder}}" stepKey="submitOrder"/>
+        <waitForPageLoad stepKey="waitForSubmitOrder"/>
         <see stepKey="seeSuccessMessageForOrder" userInput="You created the order."/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderGridActionGroup.xml

@@ -14,10 +14,14 @@
             <argument name="orderId" type="string"/>
         </arguments>
         <amOnPage url="{{AdminOrdersPage.url}}" stepKey="navigateToOrderGridPage"/>
+        <waitForPageLoad stepKey="waitForOrdersPage"/>
         <conditionalClick selector="{{AdminOrdersGridSection.clearFilters}}" dependentSelector="{{AdminOrdersGridSection.clearFilters}}" visible="true" stepKey="clearExistingOrderFilters"/>
+        <waitForPageLoad stepKey="waitForClearFilters"/>
         <click selector="{{AdminOrdersGridSection.filters}}" stepKey="openOrderGridFilters"/>
+        <waitForPageLoad stepKey="waitForClickFilters"/>
         <fillField selector="{{AdminOrdersGridSection.idFilter}}" userInput="{{orderId}}" stepKey="fillOrderIdFilter"/>
         <click selector="{{AdminOrdersGridSection.applyFilters}}" stepKey="clickOrderApplyFilters"/>
+        <waitForPageLoad stepKey="waitForApplyFilters"/>
     </actionGroup>
 
     <!--Filter order grid by the billing name field-->

app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicePaymentShippingSection.xml

@@ -15,7 +15,7 @@
         <element name="ShippingMethod" type="text" selector=".order-shipping-address .shipping-description-title"/>
         <element name="ShippingPrice" type="text" selector=".order-shipping-address .shipping-description-content .price"/>
         <element name="CreateShipment" type="checkbox" selector=".order-shipping-address input[name='invoice[do_shipment]']"/>
-        <element name="getShippingMethodAndRates" type="button" selector="//span[text()='Get shipping methods and rates']"/>
-        <element name="shippingMethod" type="button" selector="//label[contains(text(), 'Fixed')]"/>
+        <element name="getShippingMethodAndRates" type="button" selector="//span[text()='Get shipping methods and rates']" timeout="60"/>
+        <element name="shippingMethod" type="button" selector="//label[contains(text(), 'Fixed')]" timeout="60"/>
     </section>
 </sections>

app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStatusGridSection.xml

@@ -19,6 +19,6 @@
         <element name="search" type="button" selector="[data-action='grid-filter-apply']" timeout="30"/>
         <element name="gridCell" type="text" selector="//tr['{{row}}']//td[count(//div[contains(concat(' ',normalize-space(@class),' '),' admin__data-grid-wrap ')]//tr//th[contains(., '{{cellName}}')]/preceding-sibling::th) +1 ]" parameterized="true" timeout="30"/>
         <element name="stateCodeAndTitleDataColumn" type="input" selector="[data-role=row] [data-column=state]"/>
-        <element name="unassign" type="text" selector="[data-role=row] [data-column=unassign]"/>
+        <element name="unassign" type="text" selector="[data-role=row] [data-column=unassign]" timeout="60"/>
     </section>
 </sections>

app/code/Magento/Sales/Test/Mftf/Section/AdminOrdersGridSection.xml

@@ -16,7 +16,7 @@
         <element name="submitSearch22" type="button" selector=".//*[@class=&quot;admin__data-grid-filters-wrap&quot;]/parent::*/div[@class=&quot;data-grid-search-control-wrap&quot;]/button"/>
         <element name="filters" type="button" selector="button[data-action='grid-filter-expand']" timeout="30"/>
         <element name="idFilter" type="input" selector=".admin__data-grid-filters input[name='increment_id']"/>
-        <element name="selectStatus" type="select" selector="select[name='status']"/>
+        <element name="selectStatus" type="select" selector="select[name='status']" timeout="60"/>
         <element name="billToNameFilter" type="input" selector=".admin__data-grid-filters input[name='billing_name']"/>
         <element name="enabledFilters" type="block" selector=".admin__data-grid-header .admin__data-grid-filters-current._show"/>
         <element name="clearFilters" type="button" selector=".admin__data-grid-header [data-action='grid-filter-reset']" timeout="30"/>
@@ -30,14 +30,14 @@
         <element name="viewBookmark" type="button" selector="//div[contains(@class, 'admin__data-grid-action-bookmarks')]/ul/li/div/a[text() = '{{label}}']" parameterized="true" timeout="30"/>
         <element name="columnsDropdown" type="button" selector="div.admin__data-grid-action-columns button" timeout="30"/>
         <element name="viewColumnCheckbox" type="checkbox" selector="//div[contains(@class,'admin__data-grid-action-columns')]//div[contains(@class, 'admin__field-option')]//label[text() = '{{column}}']/preceding-sibling::input" parameterized="true"/>
-        <element name="customerInOrdersSection" type="button" selector="(//td[contains(text(),'{{customer}}')])[1]" parameterized="true"/>
-        <element name="productForOrder" type="button" selector="//td[contains(text(),'{{var}}')]" parameterized="true"/>
+        <element name="customerInOrdersSection" type="button" selector="(//td[contains(text(),'{{customer}}')])[1]" parameterized="true" timeout="60"/>
+        <element name="productForOrder" type="button" selector="//td[contains(text(),'{{var}}')]" parameterized="true" timeout="60"/>
         <element name="selectActions" type="button" selector=".action-select-wrap > .action-select" timeout="30"/>
         <element name="dropdownActionItem" type="button" selector="(//div[contains(@class, 'action-menu-items')]//span[text()='{{action}}'])[1]" timeout="30" parameterized="true"/>
         <element name="checkOrder" type="input" selector="//td[count(//div[@data-role='grid-wrapper'])]//input"/>
-        <element name="orderActions" type="button" selector="//div[contains(concat(' ',normalize-space(@class),' '),' row-gutter ')]//button[@title='Select Items']"/>
+        <element name="orderActions" type="button" selector="//div[contains(concat(' ',normalize-space(@class),' '),' row-gutter ')]//button[@title='Select Items']" timeout="60"/>
         <element name="changeOrderStatus" type="button" selector="//div[contains(concat(' ',normalize-space(@class),' '),' row-gutter ')]//span[text()='{{status}}']" parameterized="true" timeout="30"/>
         <element name="viewLink" type="text" selector="//td/div[contains(.,'{{orderID}}')]/../..//a[@class='action-menu-item']" parameterized="true"/>
-        <element name="selectOrderID" type="checkbox" selector="//td/div[text()='{{orderId}}']/../preceding-sibling::td//input" parameterized="true"/>
+        <element name="selectOrderID" type="checkbox" selector="//td/div[text()='{{orderId}}']/../preceding-sibling::td//input" parameterized="true" timeout="60"/>
     </section>
 </sections>