MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart

Author: vzabaznov

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

@@ -216,13 +216,11 @@
 $product->setOptions($options);
 
 /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepositoryFactory */
-$productRepositoryFactory = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-$productRepositoryFactory->save($product);
+$productRepository = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+$productRepository->save($product);
 
 $categoryLinkManagement->assignProductToCategories(
     $product->getSku(),
     [2]
 );
-
-$productRepositoryFactory->getById(1, false, null, true);
 $productRepositoryFactory->get('simple', false, null, true);

dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php

@@ -428,7 +428,7 @@ public function testReserveOrderId()
 
     /**
      * Test to verify that disabled product cannot be added to cart
-     * @magentoDataFixture Magento/Quote/_files/disabled_product.php
+     * @magentoDataFixture Magento/Quote/_files/is_not_salable_product.php
      */
     public function testAddedProductToQuoteIsSalable()
     {

dev/tests/integration/testsuite/Magento/Quote/_files/disabled_product.php renamed to dev/tests/integration/testsuite/Magento/Quote/_files/is_not_salable_product.php

@@ -36,5 +36,5 @@
     ->setHasOptions(true);
 
 /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepositoryFactory */
-$productRepositoryFactory = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+$productRepositoryFactory = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
 $productRepositoryFactory->save($product);

dev/tests/integration/testsuite/Magento/Quote/_files/is_salable_product.php

@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var $objectManager \Magento\TestFramework\ObjectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
+$product->isObjectNew(true);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+    ->setId(99)
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setName('Simple Product')
+    ->setSku('simple-99')
+    ->setPrice(10)
+    ->setWeight(1)
+    ->setShortDescription("Short description")
+    ->setTaxClassId(0)
+    ->setDescription('Description with <b>html tag</b>')
+    ->setMetaTitle('meta title')
+    ->setMetaKeyword('meta keyword')
+    ->setMetaDescription('meta description')
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setStockData(
+        [
+            'use_config_manage_stock'   => 1,
+            'qty'                       => 100,
+            'is_qty_decimal'            => 0,
+            'is_in_stock'               => 1,
+        ]
+    )
+    ->setCanSaveCustomOptions(true)
+    ->setHasOptions(true);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepositoryFactory */
+$productRepositoryFactory = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+$productRepositoryFactory->save($product);

dev/tests/integration/testsuite/Magento/SalesRule/Model/Quote/Address/Total/ShippingTest.php

@@ -31,8 +31,9 @@ protected function setUp()
     }
 
     /**
+     * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/SalesRule/_files/rule_free_shipping_by_product_weight.php
-     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDataFixture Magento/Quote/_files/is_salable_product.php
      */
     public function testRuleByProductWeightWithFreeShipping()
     {
@@ -45,8 +46,9 @@ public function testRuleByProductWeightWithFreeShipping()
     }
 
     /**
+     * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/SalesRule/_files/rule_free_shipping_by_product_weight.php
-     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDataFixture Magento/Quote/_files/is_salable_product.php
      */
     public function testRuleByProductWeightWithoutFreeShipping()
     {
@@ -94,7 +96,7 @@ private function prepareQuote($itemQty)
         $cartItem = $cartItemFactory->create();
         $cartItem->setQuoteId($cartId);
         $cartItem->setQty($itemQty);
-        $cartItem->setSku('simple');
+        $cartItem->setSku('simple-99');
         $cartItem->setProductType(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE);
 
         $this->itemRepository->save($cartItem);