Merge remote-tracking branch 'mainline/develop' into FearlessKiwis-MAGETWO-66402-mov-get-allids

Author: cpartica

app/code/Magento/Catalog/Model/ProductRepository.php

@@ -564,6 +564,9 @@ public function save(\Magento\Catalog\Api\Data\ProductInterface $product, $saveO
                 $this->resourceModel->getLinkField(),
                 $existingProduct->getData($this->resourceModel->getLinkField())
             );
+            if (!$product->hasData(Product::STATUS)) {
+                $product->setStatus($existingProduct->getStatus());
+            }
         } catch (NoSuchEntityException $e) {
             $existingProduct = null;
         }

app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml

@@ -193,6 +193,7 @@
                         <item name="add_variables" xsi:type="boolean">false</item>
                         <item name="add_widgets" xsi:type="boolean">false</item>
                         <item name="add_images" xsi:type="boolean">false</item>
+                        <item name="add_directives" xsi:type="boolean">true</item>
                     </item>
                     <item name="source" xsi:type="string">category</item>
                 </item>

app/code/Magento/Cron/Observer/ProcessCronQueueObserver.php

@@ -10,7 +10,7 @@
 namespace Magento\Cron\Observer;
 
 use Magento\Framework\App\State;
-use Magento\Framework\Console\CLI;
+use Magento\Framework\Console\Cli;
 use Magento\Framework\Event\ObserverInterface;
 use \Magento\Cron\Model\Schedule;
 
@@ -188,7 +188,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
                     ) == 1
                 )) {
                 $this->_shell->execute(
-                    $phpPath . ' %s cron:run --group=' . $groupId . ' --' . CLI::INPUT_KEY_BOOTSTRAP . '='
+                    $phpPath . ' %s cron:run --group=' . $groupId . ' --' . Cli::INPUT_KEY_BOOTSTRAP . '='
                     . self::STANDALONE_PROCESS_STARTED . '=1',
                     [
                         BP . '/bin/magento'

app/code/Magento/Theme/view/frontend/templates/html/breadcrumbs.phtml

@@ -13,9 +13,7 @@
         <?php foreach ($crumbs as $crumbName => $crumbInfo) : ?>
             <li class="item <?php /* @escapeNotVerified */ echo $crumbName ?>">
             <?php if ($crumbInfo['link']) : ?>
-                <a href="<?php /* @escapeNotVerified */ echo $crumbInfo['link'] ?>" title="<?php echo $block->escapeHtml($crumbInfo['title']) ?>">
-                    <?php echo $block->escapeHtml($crumbInfo['label']) ?>
-                </a>
+                <a href="<?php /* @escapeNotVerified */ echo $crumbInfo['link'] ?>" title="<?php echo $block->escapeHtml($crumbInfo['title']) ?>"><?php echo $block->escapeHtml($crumbInfo['label']) ?></a>
             <?php elseif ($crumbInfo['last']) : ?>
                 <strong><?php echo $block->escapeHtml($crumbInfo['label']) ?></strong>
             <?php else: ?>

dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php

@@ -1266,4 +1266,34 @@ public function testSpecialPrice()
         $this->assertEquals(0, count(array_intersect($attributeCodes, $missingAttributes)));
         $this->assertEquals(2, count(array_intersect($attributeCodes, $expectedAttribute)));
     }
+
+    public function testUpdateStatus()
+    {
+        // Create simple product
+        $productData = [
+            ProductInterface::SKU => "product_simple_502",
+            ProductInterface::NAME => "Product Simple 502",
+            ProductInterface::VISIBILITY => 4,
+            ProductInterface::TYPE_ID => 'simple',
+            ProductInterface::PRICE => 100,
+            ProductInterface::STATUS => 0,
+            ProductInterface::TYPE_ID => 'simple',
+            ProductInterface::ATTRIBUTE_SET_ID => 4,
+        ];
+
+        // Save product with status disabled
+        $this->saveProduct($productData);
+        $response = $this->getProduct($productData[ProductInterface::SKU]);
+        $this->assertEquals(0, $response['status']);
+
+        // Update the product
+        $productData[ProductInterface::PRICE] = 200;
+        $this->saveProduct($productData);
+        $response = $this->getProduct($productData[ProductInterface::SKU]);
+
+        // Status should still be disabled
+        $this->assertEquals(0, $response['status']);
+        // Price should be updated
+        $this->assertEquals(200, $response['price']);
+    }
 }

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',

lib/internal/Magento/Framework/Exception/LocalizedException.php

@@ -26,15 +26,14 @@ class LocalizedException extends \Exception
     protected $logMessage;
 
     /**
-     * Constructor
-     *
      * @param \Magento\Framework\Phrase $phrase
      * @param \Exception $cause
+     * @param int $code
      */
-    public function __construct(Phrase $phrase, \Exception $cause = null)
+    public function __construct(Phrase $phrase, \Exception $cause = null, $code = 0)
     {
         $this->phrase = $phrase;
-        parent::__construct($phrase->render(), 0, $cause);
+        parent::__construct($phrase->render(), intval($code), $cause);
     }
 
     /**

lib/internal/Magento/Framework/Exception/Test/Unit/LocalizedExceptionTest.php

@@ -150,4 +150,16 @@ public function testGetLogMessage()
         $expectedLogMessage = 'message parameter1 parameter2';
         $this->assertEquals($expectedLogMessage, $localizeException->getLogMessage());
     }
+
+    public function testGetCode()
+    {
+        $expectedCode = 42;
+        $localizedException = new LocalizedException(
+            new Phrase("message %1", ['test']),
+            new \Exception(),
+            $expectedCode
+        );
+
+        $this->assertEquals($expectedCode, $localizedException->getCode());
+    }
 }