Merge remote-tracking branch '30479/2.4-develop' into Aug01-comprs

Author: engcom-Charlie

app/code/Magento/SalesRule/Model/Rule/Condition/Product.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2017 Adobe
+ * Copyright 2013 Adobe
  * All Rights Reserved.
  */
 namespace Magento\SalesRule\Model\Rule\Condition;
@@ -65,9 +65,8 @@ public function loadAttributeOptions()
         $attributes = [];
         foreach ($productAttributes as $attribute) {
             /* @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
-            if (!$attribute->isAllowedForRuleCondition()
-                || !$attribute->getDataUsingMethod($this->_isUsedForRuleProperty)
-            ) {
+            if (!$attribute->getDataUsingMethod($this->_isUsedForRuleProperty)
+                || !$attribute->isAllowedForRuleCondition()) {
                 continue;
             }
             $frontLabel = $attribute->getFrontendLabel();

app/code/Magento/SalesRule/Test/Unit/Model/Rule/Condition/ProductTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2016 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -11,6 +11,7 @@
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\ProductCategoryList;
 use Magento\Catalog\Model\ProductFactory;
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
 use Magento\Catalog\Model\ResourceModel\Product;
 use Magento\Directory\Model\CurrencyFactory;
 use Magento\Eav\Model\Config;
@@ -322,6 +323,73 @@ public function testQuoteLocaleFormatPrice($isValid, $conditionValue, $operator
         $this->assertEquals($isValid, $this->model->setValue($conditionValue)->validate($item));
     }
 
+    /**
+     * Test for loadAttributeOptions
+     *
+     * @return void
+     */
+    public function testLoadAttributeOptions(): void
+    {
+        $secondAttributeCode = 'second_attribute';
+
+        $attribute = $this->getMockBuilder(Attribute::class)
+            ->onlyMethods(['getDataUsingMethod'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $attribute->expects($this->atLeastOnce())
+            ->method('getDataUsingMethod')
+            ->with('is_used_for_promo_rules')
+            ->willReturn(false);
+
+        $attributeSecond = $this->getMockBuilder(Attribute::class)
+            ->onlyMethods(['getDataUsingMethod', 'isAllowedForRuleCondition', 'getAttributeCode'])
+            ->addMethods(['getFrontendLabel'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $attributeSecond->expects($this->atLeastOnce())
+            ->method('getDataUsingMethod')
+            ->with('is_used_for_promo_rules')
+            ->willReturn(true);
+        $attributeSecond->expects($this->atLeastOnce())
+            ->method('isAllowedForRuleCondition')
+            ->willReturn(true);
+        $attributeSecond->expects($this->atLeastOnce())
+            ->method('getFrontendLabel')
+            ->willReturn('Second Attribute');
+        $attributeSecond->expects($this->atLeastOnce())
+            ->method('getAttributeCode')
+            ->willReturn($secondAttributeCode);
+
+        $attributeLoaderInterfaceMock = $this->createMock(AbstractEntity::class);
+        $attributeLoaderInterfaceMock->expects($this->atLeastOnce())
+            ->method('getAttributesByCode')
+            ->willReturn([$attribute, $attributeSecond]);
+
+        $productResourceMock = $this->createMock(Product::class);
+        $productResourceMock->expects($this->atLeastOnce())
+            ->method('loadAllAttributes')
+            ->willReturn($attributeLoaderInterfaceMock);
+
+        $model = new SalesRuleProduct(
+            $this->contextMock,
+            $this->backendHelperMock,
+            $this->configMock,
+            $this->productFactoryMock,
+            $this->productRepositoryMock,
+            $productResourceMock,
+            $this->collectionMock,
+            $this->format,
+            [],
+            $this->productCategoryListMock
+        );
+
+        $model->loadAttributeOptions();
+
+        $this->assertArrayHasKey($secondAttributeCode, $model->getAttributeOption());
+        $this->assertArrayHasKey('children::' . $secondAttributeCode, $model->getAttributeOption());
+        $this->assertArrayHasKey('parent::' . $secondAttributeCode, $model->getAttributeOption());
+    }
+
     /**
      * DataProvider for testQuoteLocaleFormatPrice
      *