MAGETWO-62405: Ignoring product visibility for SalesRules

Author: pdohogne-magento

dev/tests/integration/testsuite/Magento/SalesRule/Model/Rule/Condition/ProductTest.php

@@ -19,20 +19,22 @@ protected function setUp()
     }
 
     /**
+     * Ensure that SalesRules filtering on category ignore product visibility
+     *
      * @magentoAppIsolation enabled
      * @param int $categoryId
      * @param int $visibility
      * @param bool $expectedResult
      * @magentoDataFixture Magento/Checkout/_files/quote_with_simple_product.php
      * @magentoDataFixture Magento/SalesRule/_files/rules_category.php
-     * @magentoDataFixture Magento/SalesRule/_files/category.php
      * @dataProvider validateProductConditionDataProvider
      */
     public function testValidateCategorySalesRuleIgnoresVisibility($categoryId, $visibility, $expectedResult)
     {
         /** @var $session \Magento\Checkout\Model\Session  */
         $session = $this->objectManager->create(\Magento\Checkout\Model\Session::class);
 
+        // Prepare product with given visibility and category settings
         /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
         $productRepository = $this->objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
         /** @var $product \Magento\Catalog\Model\Product */
@@ -41,6 +43,7 @@ public function testValidateCategorySalesRuleIgnoresVisibility($categoryId, $vis
         $product->setCategoryIds([$categoryId]);
         $product->save();
 
+        // Load the SalesRule looking for products in a category and assert that the validation is as expected
         /** @var $rule \Magento\SalesRule\Model\Rule */
         $rule = $this->objectManager->get(\Magento\Framework\Registry::class)
             ->registry('_fixture/Magento_SalesRule_Category');

dev/tests/integration/testsuite/Magento/SalesRule/_files/category.php

@@ -56,6 +56,30 @@
 
 $salesRule->save();
 
+$category = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Category::class);
+$category->isObjectNew(true);
+$category->setId(
+    66
+)->setCreatedAt(
+    '2014-06-23 09:50:07'
+)->setName(
+    'Category 1'
+)->setParentId(
+    2
+)->setPath(
+    '1/2/333'
+)->setLevel(
+    2
+)->setAvailableSortBy(
+    ['position', 'name']
+)->setDefaultSortBy(
+    'name'
+)->setIsActive(
+    true
+)->setPosition(
+    1
+)->save();
+
 /** @var Magento\Framework\Registry $registry */
 $registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);