Merge branch 'ACP2E-1965' of https://github.com/magento-l3/magento2ce into PR-05242023

Author: chittima

app/code/Magento/SalesRule/Model/ResourceModel/Rule.php

@@ -312,6 +312,10 @@ public function getActiveAttributes()
             ['ea' => $this->getTable('eav_attribute')],
             'ea.attribute_id = a.attribute_id',
             []
+        )->joinInner(
+            ['sr' => $this->getTable('salesrule')],
+            'a.' . $this->getLinkField() . ' = sr.' . $this->getLinkField() . ' AND sr.is_active = 1',
+            []
         );
         return $connection->fetchAll($select);
     }

dev/tests/integration/testsuite/Magento/SalesRule/Model/ResourceModel/RuleTest.php

@@ -5,22 +5,78 @@
  */
 namespace Magento\SalesRule\Model\ResourceModel;
 
+use Magento\SalesRule\Test\Fixture\ProductCondition as ProductConditionFixture;
+use Magento\SalesRule\Test\Fixture\ProductFoundInCartConditions as ProductFoundInCartConditionsFixture;
+use Magento\SalesRule\Test\Fixture\Rule as RuleFixture;
+use Magento\TestFramework\Fixture\DataFixture;
+use Magento\TestFramework\Fixture\DataFixtureStorage;
+use Magento\TestFramework\Fixture\DataFixtureStorageManager;
+use Magento\TestFramework\Helper\Bootstrap;
+
 /**
  * @magentoDbIsolation enabled
  * @magentoAppIsolation enabled
  */
 class RuleTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @var DataFixtureStorage
+     */
+    private $fixtures;
+
+    /**
+     * @var Rule
+     */
+    private $resource;
+
+    /**
+     * @inheirtDoc
+     */
+    protected function setUp(): void
+    {
+        $this->fixtures = Bootstrap::getObjectManager()->get(
+            DataFixtureStorageManager::class
+        )->getStorage();
+        $this->resource = Bootstrap::getObjectManager()->create(
+            Rule::class
+        );
+    }
+
     /**
      * @magentoDataFixture Magento/SalesRule/_files/rule_custom_product_attribute.php
      */
     public function testAfterSave()
     {
-        $resource = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\SalesRule\Model\ResourceModel\Rule::class
-        );
-        $items = $resource->getActiveAttributes();
+        $items = $this->resource->getActiveAttributes();
 
         $this->assertEquals([['attribute_code' => 'attribute_for_sales_rule_1']], $items);
     }
+
+    #[
+        DataFixture(
+            ProductConditionFixture::class,
+            ['attribute' => 'category_ids', 'value' => '2'],
+            'cond11'
+        ),
+        DataFixture(
+            ProductFoundInCartConditionsFixture::class,
+            ['conditions' => ['$cond11$']],
+            'cond1'
+        ),
+        DataFixture(
+            RuleFixture::class,
+            ['discount_amount' => 50, 'conditions' => ['$cond1$'], 'is_active' => 0],
+            'rule1'
+        )
+    ]
+    public function testGetActiveAttributes()
+    {
+        $rule = $this->fixtures->get('rule1');
+        $items = $this->resource->getActiveAttributes();
+        $this->assertEquals([], $items);
+        $rule->setIsActive(1);
+        $rule->save();
+        $items = $this->resource->getActiveAttributes();
+        $this->assertEquals([['attribute_code' => 'category_ids']], $items);
+    }
 }