From 108c2c5f6353bf977508baa20cef200521eb247d Mon Sep 17 00:00:00 2001
From: Ronak Patel <11473750+ronak2ram@users.noreply.github.com>
Date: Mon, 16 Jul 2018 21:49:04 +0530
Subject: [PATCH 1/2] Configurable Product with Only Size Options (No Color
 Options) Shows No Image in Cart

---
 app/code/Magento/Catalog/Block/Product/ImageBuilder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Block/Product/ImageBuilder.php b/app/code/Magento/Catalog/Block/Product/ImageBuilder.php
index ad62031976ee1..375b7bff050fe 100644
--- a/app/code/Magento/Catalog/Block/Product/ImageBuilder.php
+++ b/app/code/Magento/Catalog/Block/Product/ImageBuilder.php
@@ -122,7 +122,7 @@ protected function getRatio(\Magento\Catalog\Helper\Image $helper)
     public function create()
     {
         /** @var \Magento\Catalog\Model\Product\Configuration\Item\Option\OptionInterface $simpleOption */
-        $simpleOption = $this->product->getCustomOption('simple_product');
+        $simpleOption = $this->product->getOptionById('simple_product');
 
         if ($simpleOption !== null) {
             $optionProduct = $simpleOption->getProduct();

From 4e32d060defb692b768b9872d3c24f58bc72b67e Mon Sep 17 00:00:00 2001
From: Ronak Patel <11473750+ronak2ram@users.noreply.github.com>
Date: Tue, 17 Jul 2018 11:05:37 +0530
Subject: [PATCH 2/2] Do change for Unit testing

---
 .../Catalog/Test/Unit/Block/Product/ImageBuilderTest.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/ImageBuilderTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/ImageBuilderTest.php
index 7d0e38625664f..39ddd8768fedc 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Product/ImageBuilderTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Product/ImageBuilderTest.php
@@ -306,7 +306,7 @@ public function testCreateWithSimpleProduct($data, $expected)
         $simpleOptionMock = $this->createMock(\Magento\Wishlist\Model\Item\Option::class);
         $simpleProductMock = $this->createMock(\Magento\Catalog\Model\Product::class);
 
-        $productMock->expects($this->once())->method('getCustomOption')
+        $productMock->expects($this->once())->method('getOptionById')
             ->with('simple_product')->willReturn($simpleOptionMock);
 
         $simpleOptionMock->expects($this->once())->method('getProduct')->willReturn($simpleProductMock);