Merge remote-tracking branch 'remotes/origin/MAGETWO-51256' into PR-3

Author: aohorodnyk

app/code/Magento/Catalog/Model/Product/Option.php

@@ -562,7 +562,7 @@ protected function _getValidationRulesBeforeSave()
     public function getProductSku()
     {
         $productSku = $this->_getData(self::KEY_PRODUCT_SKU);
-        if (!$productSku) {
+        if (!$productSku && $this->getProduct()) {
             $productSku = $this->getProduct()->getSku();
         }
         return $productSku;

app/code/Magento/Catalog/Model/Product/Option/Repository.php

@@ -125,7 +125,11 @@ public function duplicate(
      */
     public function save(\Magento\Catalog\Api\Data\ProductCustomOptionInterface $option)
     {
-        $product = $this->productRepository->get($option->getProductSku());
+        $productSku = $option->getProductSku();
+        if (!$productSku) {
+            throw new CouldNotSaveException(__('ProductSku should be specified'));
+        }
+        $product = $this->productRepository->get($productSku);
         $metadata = $this->getMetadataPool()->getMetadata(ProductInterface::class);
         $option->setData('product_id', $product->getData($metadata->getLinkField()));
         $option->setOptionId(null);

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

@@ -9,6 +9,7 @@
 
 namespace Magento\Catalog\Api;
 
+use Magento\Catalog\Model\ProductRepository;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\WebapiAbstract;
 
@@ -39,7 +40,7 @@ protected function setUp()
     public function testRemove()
     {
         $sku = 'simple';
-        /** @var \Magento\Catalog\Model\ProductRepository $productRepository */
+        /** @var ProductRepository $productRepository */
         $productRepository = $this->objectManager->create(
             'Magento\Catalog\Model\ProductRepository'
         );
@@ -142,7 +143,7 @@ public function testGetList()
      * @magentoApiDataFixture Magento/Catalog/_files/product_without_options.php
      * @magentoAppIsolation enabled
      * @dataProvider optionDataProvider
-     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     * @param array $optionData
      */
     public function testSave($optionData)
     {
@@ -166,7 +167,7 @@ public function testSave($optionData)
         unset($result['product_sku']);
         unset($result['option_id']);
         if (!empty($result['values'])) {
-            foreach ($result['values'] as $key => $value) {
+            foreach (array_keys($result['values']) as $key) {
                 unset($result['values'][$key]['option_type_id']);
             }
         }
@@ -240,7 +241,7 @@ public function optionNegativeDataProvider()
     public function testUpdate()
     {
         $productSku = 'simple';
-        /** @var \Magento\Catalog\Model\ProductRepository $productRepository */
+        /** @var ProductRepository $productRepository */
         $productRepository = $this->objectManager->create(
             'Magento\Catalog\Model\ProductRepository'
         );
@@ -306,7 +307,7 @@ public function testUpdateOptionAddingNewValue($optionType)
             'sort_order' => 100,
         ];
 
-        /** @var \Magento\Catalog\Model\ProductRepository $productRepository */
+        /** @var ProductRepository $productRepository */
         $productRepository = $this->objectManager->create(
             'Magento\Catalog\Model\ProductRepository'
         );
@@ -380,4 +381,48 @@ public function validOptionDataProvider()
             'multiple' => ['multiple']
         ];
     }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/product_with_options.php
+     * @magentoAppIsolation enabled
+     * @dataProvider optionNegativeUpdateDataProvider
+     * @param array $optionData
+     * @param string $message
+     */
+    public function testUpdateNegative($optionData, $message)
+    {
+        $productSku = 'simple';
+        /** @var ProductRepository $productRepository */
+        $productRepository = $this->objectManager->create(ProductRepository::class);
+        $options = $productRepository->get($productSku, true)->getOptions();
+        $option = array_shift($options);
+        $optionId = $option->getOptionId();
+
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => '/V1/products/options/' . $optionId,
+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_PUT,
+            ],
+            'soap' => [
+                'service' => self::SERVICE_NAME,
+                'serviceVersion' => 'V1',
+                'operation' => self::SERVICE_NAME . 'Save',
+            ],
+        ];
+
+        if (TESTS_WEB_API_ADAPTER == self::ADAPTER_SOAP) {
+            $this->setExpectedException('SoapFault');
+        } else {
+            $this->setExpectedException('Exception', $message, 400);
+        }
+        $this->_webApiCall($serviceInfo, ['option' => $optionData]);
+    }
+
+    /**
+     * @return array
+     */
+    public function optionNegativeUpdateDataProvider()
+    {
+        return include '_files/product_options_update_negative.php';
+    }
 }

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

@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+return [
+    'missed_product_sku' =>
+        [
+            [
+                'title' => 'title',
+                'type' => 'field',
+                'sort_order' => 1,
+                'is_require' => 1,
+                'price' => 10.0,
+                'price_type' => 'fixed',
+                'sku' => 'sku1',
+                'max_characters' => 10,
+            ],
+            'ProductSku should be specified',
+        ]
+];