MAGETWO-70743: Custom options are not listed in API call

- Extend test to cover all custom options types

Author: viktym

dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_options.php

@@ -35,10 +35,10 @@
     true
 )->setStockData(
     [
-        'qty' => 0,
-        'is_in_stock' => 0
+        'qty' => 100,
+        'is_in_stock' => 1
     ]
-);
+)->setHasOptions(true);
 
 $options = [
     [
@@ -204,4 +204,8 @@
     $customOptions[] = $customOption;
 }
 
-$product->setOptions($customOptions)->save();
+$product->setOptions($customOptions);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepositoryFactory */
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+$productRepository->save($product);

dev/tests/integration/testsuite/Magento/Checkout/_files/ValidatorFileMock.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Checkout\_files;
+
+use Magento\Catalog\Model\Product\Option\Type\File\ValidatorFile;
+
+/**
+ * Creates mock for ValidatorFile to replace real instance in fixtures.
+ */
+class ValidatorFileMock extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * Returns mock.
+     *
+     * @return ValidatorFile|\PHPUnit_Framework_MockObject_MockObject
+     */
+    public function getInstance()
+    {
+        $userValue = [
+            'type' => 'image/jpeg',
+            'title' => "test.jpg",
+            'quote_path' => "custom_options/quote/s/t/4624d2.jpg",
+            'order_path' => "custom_options/order/s/t/89d25b4624d2.jpg",
+            "fullpath" => "pub/media/custom_options/quote/s/t/e47389d25b4624d2.jpg",
+            "size"=> "71901",
+            "width" => 5,
+            "height" => 5,
+            "secret_key" => "10839ec1631b77e5e473",
+        ];
+        $instance = $this->getMockBuilder(ValidatorFile::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $instance->method('SetProduct')->willReturnSelf();
+        $instance->method('validate')->willReturn($userValue);
+
+        return $instance;
+    }
+}

dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_items_and_custom_options_saved.php

@@ -4,8 +4,11 @@
  * See COPYING.txt for license details.
  */
 
+use Magento\Checkout\_files\ValidatorFileMock;
+
 require __DIR__ . '/../../Checkout/_files/quote_with_address.php';
-require __DIR__ . '/../../Catalog/_files/product_simple.php';
+require __DIR__ . '/../../Catalog/_files/product_with_options.php';
+require __DIR__ . '/../../Checkout/_files/ValidatorFileMock.php';
 
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
@@ -22,6 +25,9 @@
         case \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_GROUP_SELECT:
             $value = key($option->getValues());
             break;
+        case \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_GROUP_FILE:
+            $value = 'test.jpg';
+            break;
         default:
             $value = 'test';
             break;
@@ -30,9 +36,12 @@
 }
 
 $requestInfo = new \Magento\Framework\DataObject(['qty' => 1, 'options' => $options]);
+$validatorFile = (new ValidatorFileMock())->getInstance();
+$objectManager->addSharedInstance($validatorFile, \Magento\Catalog\Model\Product\Option\Type\File\ValidatorFile::class);
+
 
-$quote->setReservedOrderId('test_order_item_with_items_and_custom_options')
-    ->addProduct($product, $requestInfo);
+$quote->setReservedOrderId('test_order_item_with_items_and_custom_options');
+$quote->addProduct($product, $requestInfo);
 $quote->collectTotals();
 $objectManager->get(\Magento\Quote\Model\QuoteRepository::class)->save($quote);
 

dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_items_and_custom_options_saved_rollback.php

@@ -4,6 +4,7 @@
  * See COPYING.txt for license details.
  */
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$objectManager->removeSharedInstance(\Magento\Catalog\Model\Product\Option\Type\File\ValidatorFile::class);
 
 /** @var \Magento\Quote\Model\Quote $quote */
 $quote = $objectManager->create(\Magento\Quote\Model\Quote::class);