MAGETWO-65458: Cart Rules are not excluding Bundle Products

Author: DianaRusin

app/code/Magento/Bundle/composer.json

@@ -26,7 +26,7 @@
     "suggest": {
         "magento/module-webapi": "*",
         "magento/module-bundle-sample-data": "*",
-        "magento/module-sales-rule": "101.0.*"
+        "magento/module-sales-rule": "*"
     },
     "type": "magento2-module",
     "license": [

app/code/Magento/SalesRule/Model/RulesApplier.php

@@ -42,7 +42,7 @@ class RulesApplier
      * @param \Magento\SalesRule\Model\Rule\Action\Discount\CalculatorFactory $calculatorFactory
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\SalesRule\Model\Utility $utility
-     * @param ChildrenValidationLocator $childrenValidationLocator
+     * @param ChildrenValidationLocator|null $childrenValidationLocator
      */
     public function __construct(
         \Magento\SalesRule\Model\Rule\Action\Discount\CalculatorFactory $calculatorFactory,

app/code/Magento/SalesRule/Test/Unit/Model/Quote/ChildrenValidationLocatorTest.php

@@ -0,0 +1,104 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\SalesRule\Test\Unit\Model\Quote;
+
+use Magento\SalesRule\Model\Quote\ChildrenValidationLocator;
+use Magento\Quote\Model\Quote\Item\AbstractItem as QuoteItem;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Catalog\Model\Product;
+
+/**
+ * Test for Magento\SalesRule\Model\Quote\ChildrenValidationLocator
+ */
+class ChildrenValidationLocatorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var array
+     */
+    private $productTypeChildrenValidationMap;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var ChildrenValidationLocator
+     */
+    private $model;
+
+    /**
+     * @var QuoteItem|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $quoteItemMock;
+
+    /**
+     * @var Product|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $productMock;
+
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+
+        $this->productTypeChildrenValidationMap = [
+            'type1' => true,
+            'type2' => false,
+        ];
+
+        $this->quoteItemMock = $this->getMockBuilder(QuoteItem::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getProduct'])
+            ->getMockForAbstractClass();
+
+        $this->productMock = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getTypeId'])
+            ->getMock();
+
+        $this->model = $this->objectManager->getObject(
+            ChildrenValidationLocator::class,
+            [
+                'productTypeChildrenValidationMap' => $this->productTypeChildrenValidationMap,
+            ]
+        );
+    }
+
+    /**
+     * @dataProvider productTypeDataProvider
+     * @param string $type
+     * @param bool $expected
+     *
+     * @return void
+     */
+    public function testIsChildrenValidationRequired(string $type, bool $expected): void
+    {
+        $this->quoteItemMock->expects($this->once())
+            ->method('getProduct')
+            ->willReturn($this->productMock);
+
+        $this->productMock->expects($this->once())
+            ->method('getTypeId')
+            ->willReturn($type);
+
+        $this->assertEquals($this->model->isChildrenValidationRequired($this->quoteItemMock), $expected);
+    }
+
+    /**
+     * @return array
+     */
+    public function productTypeDataProvider(): array
+    {
+        return [
+            ['type1', true],
+            ['type2', false],
+            ['type3', true],
+        ];
+    }
+}

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

@@ -35,7 +35,7 @@
         'website_ids' => [
             \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
                 \Magento\Store\Model\StoreManagerInterface::class
-            )->getWebsite()->getId()
+            )->getWebsite()->getId(),
         ],
     ]
 );
@@ -49,24 +49,24 @@
     'aggregator' => 'all',
     'conditions' =>
         [
-                [
-                    'type' => \Magento\SalesRule\Model\Rule\Condition\Product\Found::class,
-                    'attribute' => null,
-                    'operator' => null,
-                    'value' => '1',
-                    'is_value_processed' => null,
-                    'aggregator' => 'all',
-                    'conditions' =>
+            [
+                'type' => \Magento\SalesRule\Model\Rule\Condition\Product\Found::class,
+                'attribute' => null,
+                'operator' => null,
+                'value' => '1',
+                'is_value_processed' => null,
+                'aggregator' => 'all',
+                'conditions' =>
+                    [
                         [
-                                [
-                                    'type' => \Magento\SalesRule\Model\Rule\Condition\Product::class,
-                                    'attribute' => 'sku',
-                                    'operator' => '!=',
-                                    'value' => 'product-bundle',
-                                    'is_value_processed' => false,
-                                ],
+                            'type' => \Magento\SalesRule\Model\Rule\Condition\Product::class,
+                            'attribute' => 'sku',
+                            'operator' => '!=',
+                            'value' => 'product-bundle',
+                            'is_value_processed' => false,
                         ],
-                ],
+                    ],
+            ],
         ],
 ]);