MAGETWO-60103: [Backport] Configurable variation is displayed on category/product page when is out of stock - 2.1

Author: xmav

app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php

@@ -812,7 +812,7 @@ public function isSalable($product)
             if (!is_null($product)) {
                 $this->setStoreFilter($product->getStoreId(), $product);
             }
-            $salable = (count($this->getSalableUsedProducts($product)) > 0) ? true : false;
+            $salable = count($this->getSalableUsedProducts($product)) > 0;
         }
 
         return $salable;

dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/CartTest.php

@@ -9,6 +9,9 @@
  */
 namespace Magento\ConfigurableProduct\Controller;
 
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+
 class CartTest extends \Magento\TestFramework\TestCase\AbstractController
 {
     /**
@@ -21,7 +24,10 @@ public function testConfigureActionWithConfigurableProduct()
         /** @var $session \Magento\Checkout\Model\Session  */
         $session = $this->_objectManager->create('Magento\Checkout\Model\Session');
 
-        $quoteItem = $this->_getQuoteItemIdByProductId($session->getQuote(), 1);
+        $productRepository = Bootstrap::getObjectManager()->create(ProductRepositoryInterface::class);
+        $product = $productRepository->get('configurable');
+
+        $quoteItem = $this->_getQuoteItemIdByProductId($session->getQuote(), $product->getId());
         $this->assertNotNull($quoteItem, 'Cannot get quote item for configurable product');
 
         $this->dispatch(

dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/quote_with_configurable_product.php

@@ -8,6 +8,7 @@
 use Magento\TestFramework\Helper\Bootstrap;
 
 require 'product_configurable.php';
+/** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
 
 $productRepository = Bootstrap::getObjectManager()
     ->create(ProductRepositoryInterface::class);