Merge branch 'MAGETWO-69056' into BUGS

Author: Sergii Kovalenko

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

@@ -213,17 +213,14 @@ public function execute()
                 $category->save();
                 $this->messageManager->addSuccess(__('You saved the category.'));
             } catch (\Magento\Framework\Exception\AlreadyExistsException $e) {
-                var_dump($e->getMessage());
                 $this->messageManager->addError($e->getMessage());
                 $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
                 $this->_getSession()->setCategoryData($categoryPostData);
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                var_dump($e->getMessage());
                 $this->messageManager->addError($e->getMessage());
                 $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
                 $this->_getSession()->setCategoryData($categoryPostData);
             } catch (\Exception $e) {
-                var_dump($e->getMessage());
                 $this->messageManager->addError(__('Something went wrong while saving the category.'));
                 $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
                 $this->_getSession()->setCategoryData($categoryPostData);

dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SuggestSearchingResultEntityTest.xml

@@ -8,13 +8,11 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\CatalogSearch\Test\TestCase\SuggestSearchingResultEntityTest" summary="Suggest Searching Results" ticketId="MAGETWO-24671, MAGETWO-23186">
         <variation name="SuggestSearchingResultEntityTestVariation1" summary="Auto-complete search with product name" ticketId="MAGETWO-24671">
-            <data name="tag" xsi:type="string">stable:no</data>
             <data name="searchTerm/data/query_text/value" xsi:type="string">catalogProductSimple::name</data>
             <data name="searchTerm/data/num_results" xsi:type="string">-</data>
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertSuggestSearchingResult" />
         </variation>
         <variation name="SuggestSearchingResultEntityTestVariation2" summary="Auto-complete search with product sku" ticketId="MAGETWO-24671">
-            <data name="tag" xsi:type="string">stable:no</data>
             <data name="searchTerm/data/query_text/value" xsi:type="string">catalogProductSimple::sku</data>
             <data name="searchTerm/data/num_results" xsi:type="string">1</data>
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertSuggestSearchingResult" />

dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php

@@ -22,7 +22,7 @@ class CustomerForm extends FormTabs
      *
      * @var string
      */
-    protected $spinner = '[data-role="spinner"]';
+    protected $spinner = '#container [data-role="spinner"]';
 
     /**
      * Customer form to load.
@@ -46,7 +46,7 @@ class CustomerForm extends FormTabs
     protected $fieldWrapperControl = './/*[contains(@class, "admin__field")]/*[contains(@class,"control")]';
 
     /**
-     * Selector for wainting tab content to load.
+     * Selector for waiting tab content to load.
      *
      * @var string
      */
@@ -179,6 +179,8 @@ public function getJsErrors()
      */
     public function getPersonalInformation($title)
     {
-        return $this->_rootElement->find(sprintf($this->information, $title), Locator::SELECTOR_XPATH)->getText();
+        return $this->_rootElement
+            ->find(sprintf($this->information, $title), Locator::SELECTOR_XPATH)
+            ->getText();
     }
 }

dev/tests/functional/tests/app/Magento/Store/Test/Handler/StoreGroup/Curl.php

@@ -84,7 +84,7 @@ protected function prepareData(FixtureInterface $fixture)
                 'root_category_id' => $categoryId,
                 'website_id' => $websiteId,
                 'group_id' => $fixture->hasData('group_id') ? $fixture->getGroupId() : '',
-                'code' => $fixture->getData()['code'],
+                'code' => $fixture->hasData('code') ? $fixture->getData()['code'] : '',
             ],
             'store_action' => 'add',
             'store_type' => 'group',

dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php

@@ -2521,4 +2521,5 @@
     ['getDataFormTab', 'Magento\Backend\Test\Block\Widget\Tab', 'Magento\Ui\Test\Block\Adminhtml\AbstractContainer::getFieldsData'],
     ['getBunchImages', 'Magento\CatalogImportExport\Model\Import\Product'],
     ['_isAttributeValueEmpty', 'Magento\Catalog\Model\ResourceModel\AbstractResource'],
+    ['var_dump', '']
 ];