MAGETWO-94407: [2.3.0] Cart Price Rule for configurable products

- Fix static tests

Author: stkorf

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

@@ -66,9 +66,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->isAllowedForRuleCondition()
+                || !$attribute->getDataUsingMethod($this->_isUsedForRuleProperty)
             ) {
                 continue;
             }

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

@@ -100,22 +100,7 @@ protected function _isValid($entity)
 
         foreach ($this->getConditions() as $cond) {
             if ($entity instanceof \Magento\Framework\Model\AbstractModel) {
-                $attributeScope = $cond->getAttributeScope();
-                if ($attributeScope === 'parent') {
-                    $validateEntities = [$entity];
-                } elseif ($attributeScope === 'children') {
-                    $validateEntities = $entity->getChildren() ?: [$entity];
-                } else {
-                    $validateEntities = $entity->getChildren() ?: [];
-                    $validateEntities[] = $entity;
-                }
-                $validated = !$true;
-                foreach ($validateEntities as $validateEntity) {
-                    $validated = $cond->validate($validateEntity);
-                    if ($validated === $true) {
-                        break;
-                    }
-                }
+                $validated = $this->validateEntity($cond, $entity);
             } else {
                 $validated = $cond->validateByEntityId($entity);
             }
@@ -127,4 +112,44 @@ protected function _isValid($entity)
         }
         return $all ? true : false;
     }
+
+    /**
+     * @param object $cond
+     * @param \Magento\Framework\Model\AbstractModel $entity
+     * @return bool
+     */
+    private function validateEntity($cond, \Magento\Framework\Model\AbstractModel $entity)
+    {
+        $true = (bool)$this->getValue();
+        $validated = !$true;
+        foreach ($this->retrieveValidateEntities($cond->getAttributeScope(), $entity) as $validateEntity) {
+            $validated = $cond->validate($validateEntity);
+            if ($validated === $true) {
+                break;
+            }
+        }
+
+        return $validated;
+    }
+
+    /**
+     * Retrieve entities for validation by attribute scope
+     *
+     * @param $attributeScope
+     * @param \Magento\Framework\Model\AbstractModel $entity
+     * @return \Magento\Framework\Model\AbstractModel[]
+     */
+    private function retrieveValidateEntities($attributeScope, \Magento\Framework\Model\AbstractModel $entity)
+    {
+        if ($attributeScope === 'parent') {
+            $validateEntities = [$entity];
+        } elseif ($attributeScope === 'children') {
+            $validateEntities = $entity->getChildren() ?: [$entity];
+        } else {
+            $validateEntities = $entity->getChildren() ?: [];
+            $validateEntities[] = $entity;
+        }
+
+        return $validateEntities;
+    }
 }