merge magento/2.3-develop into magento-pangolin/community-tests-migration-pr

Author: magento-cicd2

.github/PULL_REQUEST_TEMPLATE.md

@@ -35,4 +35,4 @@
  - [ ] Pull request has a meaningful description of its purpose
  - [ ] All commits are accompanied by meaningful commit messages
  - [ ] All new or changed code is covered with unit/integration tests (if applicable)
- - [ ] All automated tests passed successfully (all builds on Travis CI are green)
+ - [ ] All automated tests passed successfully (all builds are green)

.travis.yml renamed to .travis.yml.sample

@@ -1,4 +1,3 @@
-[![Build Status](https://travis-ci.org/magento/magento2.svg?branch=2.3-develop)](https://travis-ci.org/magento/magento2)
 [![Open Source Helpers](https://www.codetriage.com/magento/magento2/badges/users.svg)](https://www.codetriage.com/magento/magento2)
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/magento/magento2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/magento-2/localized.svg)](https://crowdin.com/project/magento-2)

README.md

@@ -15,8 +15,9 @@
 use Magento\Catalog\Pricing\Price\CustomOptionPriceInterface;
 
 /**
- * Product aoptions section abstract block.
+ * Product options section abstract block.
  *
+ * phpcs:disable Magento2.Classes.AbstractApi
  * @api
  * @since 100.0.2
  */

app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php

@@ -46,6 +46,8 @@ public function prepareProductAttributes(Product $product, array $productData, a
     }
 
     /**
+     * Reset "Use Config Settings" to false in product data.
+     *
      * @param Product $product
      * @param string $attributeCode
      * @param array $productData
@@ -62,6 +64,8 @@ private function prepareConfigData(Product $product, string $attributeCode, arra
     }
 
     /**
+     * Prepare default attribute data for product.
+     *
      * @param array $attributeList
      * @param string $attributeCode
      * @param array $productData
@@ -73,7 +77,7 @@ private function prepareDefaultData(array $attributeList, string $attributeCode,
             /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */
             $attribute = $attributeList[$attributeCode];
             $attributeType = $attribute->getBackendType();
-            // For non-numberic types set the attributeValue to 'false' to trigger their removal from the db
+            // For non-numeric types set the attributeValue to 'false' to trigger their removal from the db
             if ($attributeType === 'varchar' || $attributeType === 'text' || $attributeType === 'datetime') {
                 $attribute->setIsRequired(false);
                 $productData[$attributeCode] = false;
@@ -86,6 +90,8 @@ private function prepareDefaultData(array $attributeList, string $attributeCode,
     }
 
     /**
+     * Check, whether attribute should not be updated.
+     *
      * @param Product $product
      * @param array $useDefaults
      * @param string $attribute

app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php

@@ -807,7 +807,7 @@ public function load($printQuery = false, $logQuery = false)
     }
 
     /**
-     * Processs adding product website names to result collection
+     * Process adding product website names to result collection
      *
      * @return $this
      */

app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php

@@ -96,7 +96,7 @@
     <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategory"/>
     <see selector="{{AdminCategoryBasicFieldSection.FieldError('uid')}}" userInput="This is a required field." stepKey="seeErrorMessage"/>
     <!-- Verify that the Layered navigation price step field has the required indicator -->
-    <comment userInput="Check if Layered navigation price field has required indictor icon" stepKey="comment" />
+    <comment userInput="Check if Layered navigation price field has required indicator icon" stepKey="comment" />
     <executeJS function="{{CategoryDisplaySettingsSection.RequiredFieldIndicator('filter_price_range')}}" stepKey="getRequiredFieldIndicator"/>
     <assertEquals expected='"*"' expectedType="string" actualType="variable" actual="getRequiredFieldIndicator" message="pass" stepKey="assertRequiredFieldIndicator1"/>
     </test>

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

@@ -45,11 +45,11 @@ function checkOptionsPanelVisibility(){
 
         if($('frontend_input') && ($('frontend_input').value=='select' || $('frontend_input').value=='multiselect')){
             panel.show();
-            panel.addClass(activePanelClass);
+            jQuery(panel).addClass(activePanelClass);
         }
         else {
             panel.hide();
-            panel.removeClass(activePanelClass);
+            jQuery(panel).removeClass(activePanelClass);
         }
     }
 }

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml

@@ -49,9 +49,9 @@
         <waitForLoadingMaskToDisappear stepKey="waitForPageLoad3"/>
         <!--see Insert Variable button disabled-->
         <see selector="{{VariableSection.InsertVariableBtnDisabled}}" userInput="Insert Variable" stepKey="seeInsertWidgetDisabled" />
-        <!--see Cancel button enabed-->
+        <!--see Cancel button enabled-->
         <see selector="{{VariableSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
-        <!--see 4 colums-->
+        <!--see 4 columns-->
         <see selector="{{VariableSection.ColName('Select')}}" userInput="Select" stepKey="selectCol" />
         <see selector="{{VariableSection.ColName('Variable Name')}}" userInput="Variable Name" stepKey="variableCol" />
         <see selector="{{VariableSection.ColName('Type')}}" userInput="Type" stepKey="typeCol" />

app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGBlockTest.xml

@@ -43,9 +43,9 @@
         <waitForText userInput="Insert Variable" stepKey="waitForSlideOutOpen"/>
         <!--see Insert Variable button disabled-->
         <see selector="{{VariableSection.InsertVariableBtnDisabled}}" userInput="Insert Variable" stepKey="seeInsertWidgetDisabled" />
-        <!--see Cancel button enabed-->
+        <!--see Cancel button enabled-->
         <see selector="{{VariableSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
-        <!--see 4 colums-->
+        <!--see 4 columns-->
         <see selector="{{VariableSection.ColName('Select')}}" userInput="Select" stepKey="selectCol" />
         <see selector="{{VariableSection.ColName('Variable Name')}}" userInput="Variable Name" stepKey="variableCol" />
         <see selector="{{VariableSection.ColName('Type')}}" userInput="Type" stepKey="typeCol" />