MAGETWO-63831: [Backport] -Product Rule Fix- for 2.0

Author: zakdma

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

@@ -602,7 +602,9 @@ public function getBindArgumentValue()
      */
     public function getMappedSqlField()
     {
-        if (!$this->isAttributeSetOrCategory()) {
+        if ($this->getAttribute() == 'sku') {
+            $mappedSqlField = 'e.sku';
+        } elseif (!$this->isAttributeSetOrCategory()) {
             $mappedSqlField = $this->getEavAttributeTableAlias() . '.value';
         } elseif ($this->getAttribute() == 'category_ids') {
             $mappedSqlField = 'e.entity_id';

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/AttributeForm.php

@@ -109,7 +109,9 @@ protected function expandAllToggles()
     {
         $closedToggles = $this->_rootElement->getElements($this->closedToggle);
         foreach ($closedToggles as $toggle) {
-            $toggle->click();
+            if ($toggle->isVisible()) {
+                $toggle->click();
+            }
         }
     }