merge magento/2.3-qwerty into magento-qwerty/2.3-bugfixes-040219

Author: magento-cicd2

app/code/Magento/Backend/Block/Widget/Form/Container.php

@@ -56,6 +56,8 @@ class Container extends \Magento\Backend\Block\Widget\Container
     protected $_template = 'Magento_Backend::widget/form/container.phtml';
 
     /**
+     * Initialize form.
+     *
      * @return void
      */
     protected function _construct()
@@ -83,7 +85,7 @@ protected function _construct()
             -1
         );
 
-        $objId = $this->getRequest()->getParam($this->_objectId);
+        $objId = (int)$this->getRequest()->getParam($this->_objectId);
 
         if (!empty($objId)) {
             $this->addButton(
@@ -151,11 +153,13 @@ public function getBackUrl()
     }
 
     /**
+     * Get URL for delete button.
+     *
      * @return string
      */
     public function getDeleteUrl()
     {
-        return $this->getUrl('*/*/delete', [$this->_objectId => $this->getRequest()->getParam($this->_objectId)]);
+        return $this->getUrl('*/*/delete', [$this->_objectId => (int)$this->getRequest()->getParam($this->_objectId)]);
     }
 
     /**
@@ -183,6 +187,8 @@ public function getFormActionUrl()
     }
 
     /**
+     * Get form HTML.
+     *
      * @return string
      */
     public function getFormHtml()
@@ -192,6 +198,8 @@ public function getFormHtml()
     }
 
     /**
+     * Get form init scripts.
+     *
      * @return string
      */
     public function getFormInitScripts()
@@ -203,6 +211,8 @@ public function getFormInitScripts()
     }
 
     /**
+     * Get form scripts.
+     *
      * @return string
      */
     public function getFormScripts()
@@ -214,6 +224,8 @@ public function getFormScripts()
     }
 
     /**
+     * Get header width.
+     *
      * @return string
      */
     public function getHeaderWidth()
@@ -222,6 +234,8 @@ public function getHeaderWidth()
     }
 
     /**
+     * Get header css class.
+     *
      * @return string
      */
     public function getHeaderCssClass()
@@ -230,6 +244,8 @@ public function getHeaderCssClass()
     }
 
     /**
+     * Get header HTML.
+     *
      * @return string
      */
     public function getHeaderHtml()

app/code/Magento/Braintree/Test/Mftf/ActionGroup/StorefrontFillCartDataActionGroup.xml

@@ -6,24 +6,27 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="StorefrontFillCartDataActionGroup">
         <arguments>
             <argument name="cartData" defaultValue="PaymentAndShippingInfo"/>
         </arguments>
         <switchToIFrame selector="{{BraintreeConfigurationPaymentSection.cartFrame}}" stepKey="switchToIframe"/>
+        <waitForElementVisible selector="{{BraintreeConfigurationPaymentSection.cartCode}}" stepKey="waitCartCodeElement"/>
         <fillField selector="{{BraintreeConfigurationPaymentSection.cartCode}}" userInput="{{cartData.cardNumber}}" stepKey="setCartCode"/>
         <switchToIFrame stepKey="switchBack"/>
         <switchToIFrame selector="{{BraintreeConfigurationPaymentSection.monthFrame}}" stepKey="switchToIframe1"/>
+        <waitForElementVisible selector="{{BraintreeConfigurationPaymentSection.month}}" stepKey="waitMonthElement"/>
         <fillField selector="{{BraintreeConfigurationPaymentSection.month}}" userInput="{{cartData.month}}" stepKey="setMonth"/>
         <switchToIFrame stepKey="switchBack1"/>
         <switchToIFrame selector="{{BraintreeConfigurationPaymentSection.yearFrame}}" stepKey="switchToIframe2"/>
+        <waitForElementVisible selector="{{BraintreeConfigurationPaymentSection.year}}" stepKey="waitYearElement"/>
         <fillField selector="{{BraintreeConfigurationPaymentSection.year}}" userInput="{{cartData.year}}" stepKey="setYear"/>
         <switchToIFrame stepKey="switchBack2"/>
         <switchToIFrame selector="{{BraintreeConfigurationPaymentSection.codeFrame}}" stepKey="switchToIframe3"/>
+        <waitForElementVisible selector="{{BraintreeConfigurationPaymentSection.verificationNumber}}" stepKey="waitVerificationNumber"/>
         <fillField selector="{{BraintreeConfigurationPaymentSection.verificationNumber}}" userInput="{{cartData.cvv}}" stepKey="setVerificationNumber"/>
         <switchToIFrame stepKey="SwitchBackToWindow"/>
-
     </actionGroup>
 
 </actionGroups>

app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml

@@ -17,6 +17,9 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-93677"/>
             <group value="braintree"/>
+            <skip>
+                <issueId value="MC-13779"/>
+            </skip>
         </annotations>
 
 

app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultVideoBundleProductTest.xml

@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminAddDefaultVideoBundleProductTest" extends="AdminAddDefaultVideoSimpleProductTest">
         <annotations>
             <features value="Bundle"/>

app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultVideoBundleProductTest.xml

@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminRemoveDefaultVideoBundleProductTest"  extends="AdminRemoveDefaultVideoSimpleProductTest">
         <annotations>
             <features value="Bundle"/>

app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleProductTest.xml

@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdvanceCatalogSearchBundleByNameTest" extends="AdvanceCatalogSearchSimpleProductByNameTest">
         <annotations>
             <features value="Bundle"/>

app/code/Magento/BundleGraphQl/Model/Resolver/Options/Collection.php

@@ -61,6 +61,7 @@ public function __construct(
      * Add parent id/sku pair to use for option filter at fetch time.
      *
      * @param int $parentId
+     * @param int $parentEntityId
      * @param string $sku
      */
     public function addParentFilterData(int $parentId, int $parentEntityId, string $sku) : void

app/code/Magento/Captcha/Test/Mftf/Test/CaptchaFormsDisplayingTest.xml

@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="CaptchaFormsDisplayingTest">
         <annotations>
             <features value="Captcha"/>

app/code/Magento/Catalog/Controller/Adminhtml/Category/RefreshPath.php

@@ -1,13 +1,15 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Catalog\Controller\Adminhtml\Category;
 
 use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 
+/**
+ * Class RefreshPath
+ */
 class RefreshPath extends \Magento\Catalog\Controller\Adminhtml\Category implements HttpGetActionInterface
 {
     /**
@@ -44,6 +46,7 @@ public function execute()
                 'id' => $categoryId,
                 'path' => $category->getPath(),
                 'parentId' => $category->getParentId(),
+                'level' => $category->getLevel()
             ]);
         }
     }

app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php

@@ -147,6 +147,7 @@ public function execute()
                 $parentCategory = $this->getParentCategory($parentId, $storeId);
                 $category->setPath($parentCategory->getPath());
                 $category->setParentId($parentCategory->getId());
+                $category->setLevel(null);
             }
 
             /**

app/code/Magento/Catalog/Model/Config/CatalogClone/Media/Image.php

@@ -5,6 +5,9 @@
  */
 namespace Magento\Catalog\Model\Config\CatalogClone\Media;
 
+use Magento\Framework\Escaper;
+use Magento\Framework\App\ObjectManager;
+
 /**
  * Clone model for media images related config fields
  *
@@ -26,6 +29,11 @@ class Image extends \Magento\Framework\App\Config\Value
      */
     protected $_attributeCollectionFactory;
 
+    /**
+     * @var Escaper
+     */
+    private $escaper;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -36,6 +44,9 @@ class Image extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
+     * @param Escaper|null $escaper
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -46,8 +57,10 @@ public function __construct(
         \Magento\Eav\Model\Config $eavConfig,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        Escaper $escaper = null
     ) {
+        $this->escaper = $escaper ?? ObjectManager::getInstance()->get(Escaper::class);
         $this->_attributeCollectionFactory = $attributeCollectionFactory;
         $this->_eavConfig = $eavConfig;
         parent::__construct($context, $registry, $config, $cacheTypeList, $resource, $resourceCollection, $data);
@@ -71,10 +84,9 @@ public function getPrefixes()
         $prefixes = [];
 
         foreach ($collection as $attribute) {
-            /* @var $attribute \Magento\Eav\Model\Entity\Attribute */
             $prefixes[] = [
                 'field' => $attribute->getAttributeCode() . '_',
-                'label' => $attribute->getFrontend()->getLabel(),
+                'label' => $this->escaper->escapeHtml($attribute->getFrontend()->getLabel()),
             ];
         }
 

app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml

@@ -47,4 +47,20 @@
         <seeElement selector="{{AdminProductMessagesSection.successMessage}}"
                     stepKey="waitForSuccessMessage"/>
     </actionGroup>
+    <actionGroup name="deleteProductAttributeByLabel">
+        <arguments>
+            <argument name="ProductAttribute"/>
+        </arguments>
+        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
+        <fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}"
+                   userInput="{{ProductAttribute.default_label}}" stepKey="setAttributeCode"/>
+        <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="searchForAttributeFromTheGrid"/>
+        <click selector="{{AdminProductAttributeGridSection.FirstRow}}" stepKey="clickOnAttributeRow"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <click selector="{{AttributePropertiesSection.DeleteAttribute}}" stepKey="deleteAttribute"/>
+        <click selector="{{ModalConfirmationSection.OkButton}}" stepKey="ClickOnDeleteButton"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}"
+                    stepKey="waitForSuccessMessage"/>
+    </actionGroup>
 </actionGroups>

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

@@ -10,5 +10,6 @@
     <section name="DropdownAttributeOptionsSection">
         <element name="nthOptionAdminLabel" type="input"
                  selector="(//*[@id='manage-options-panel']//tr[{{var}}]//input[contains(@name, 'option[value]')])[1]" parameterized="true"/>
+        <element name="deleteButton" type="button" selector="(//td[@class='col-delete'])[1]" timeout="30"/>
     </section>
 </sections>

app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultVideoSimpleProductTest.xml

@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminAddDefaultVideoSimpleProductTest">
         <annotations>
             <features value="Catalog"/>

app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultVideoVirtualProductTest.xml

@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminAddDefaultVideoVirtualProductTest" extends="AdminAddDefaultVideoSimpleProductTest">
         <annotations>
             <features value="Catalog"/>

app/code/Magento/Catalog/Test/Mftf/Test/AdminProductImageAssignmentForMultipleStoresTest.xml

@@ -18,6 +18,9 @@
             <testCaseId value="MAGETWO-58718"/>
             <group value="product"/>
             <group value="WYSIWYGDisabled"/>
+            <skip>
+                <issueId value="MC-13841"/>
+            </skip>
         </annotations>
         <before>
             <!-- Login Admin -->
@@ -106,6 +109,7 @@
 
         <!-- Go to Product Page and see Default Store View-->
         <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.custom_attributes[url_key]$$)}}" stepKey="goToDefaultStorefrontProductPage"/>
+        <waitForElementVisible selector="{{StorefrontProductMediaSection.productImageActive(TestImageNew.filename)}}" time="30" stepKey="waitImageToBeLoaded"/>
         <seeElement selector="{{StorefrontProductMediaSection.productImageActive(TestImageNew.filename)}}" stepKey="seeActiveImageDefault"/>
 
         <!-- English Switch Store View and see English Store View -->
@@ -117,6 +121,7 @@
         <seeElement selector="{{StorefrontCategoryProductSection.ProductImageBySrc(ProductImage.fileName)}}" stepKey="seeThumb"/>
         <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct.name$$)}}" stepKey="openProductPage"/>
         <waitForPageLoad time="30" stepKey="waitForProductPage"/>
+        <waitForElementVisible selector="{{StorefrontProductMediaSection.productImageActive(ProductImage.filename)}}" time="30" stepKey="waitImageToBeLoaded2"/>
         <seeElement selector="{{StorefrontProductMediaSection.productImageActive(ProductImage.filename)}}" stepKey="seeActiveImageEnglish"/>
 
         <!-- Switch France Store View and see France Store View -->
@@ -128,6 +133,7 @@
         <seeElement selector="{{StorefrontCategoryProductSection.ProductImageBySrc(Magento3.fileName)}}" stepKey="seeThumb1"/>
         <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct.name$$)}}" stepKey="openProductPage1"/>
         <waitForPageLoad time="30" stepKey="waitForProductPage1"/>
+        <waitForElementVisible selector="{{StorefrontProductMediaSection.productImageActive(Magento3.filename)}}" time="30" stepKey="waitImageToBeLoaded3"/>
         <seeElement selector="{{StorefrontProductMediaSection.productImageActive(Magento3.filename)}}" stepKey="seeActiveImageFrance"/>
     </test>
 </tests>

app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultVideoSimpleProductTest.xml

@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminRemoveDefaultVideoSimpleProductTest">
         <annotations>
             <features value="Catalog"/>

app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultVideoVirtualProductTest.xml

@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminRemoveDefaultVideoVirtualProductTest" extends="AdminRemoveDefaultVideoSimpleProductTest">
         <annotations>
             <features value="Catalog"/>

app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchVirtualProductTest.xml

@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdvanceCatalogSearchVirtualProductByNameTest" extends="AdvanceCatalogSearchSimpleProductByNameTest">
         <annotations>
             <features value="Catalog"/>

app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml

@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="CheckTierPricingOfProductsTest">
         <annotations>
             <features value="Shopping Cart"/>

app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml

@@ -17,8 +17,6 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-61717"/>
             <group value="Catalog"/>
-            <!-- skip due to MAGETWO-97424 -->
-            <group value="skip"/>
         </annotations>
         <before>
             <createData entity="Simple_US_Customer" stepKey="createCustomer"/>

app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/RefreshPathTest.php

@@ -66,8 +66,8 @@ private function setObjectProperty($object, string $propertyName, $value) : void
      */
     public function testExecute() : void
     {
-        $value = ['id' => 3, 'path' => '1/2/3', 'parentId' => 2];
-        $result = '{"id":3,"path":"1/2/3","parentId":"2"}';
+        $value = ['id' => 3, 'path' => '1/2/3', 'parentId' => 2, 'level' => 2];
+        $result = '{"id":3,"path":"1/2/3","parentId":"2","level":"2"}';
 
         $requestMock = $this->getMockForAbstractClass(\Magento\Framework\App\RequestInterface::class);