Merge pull request #51 from magento-epam/EPAM-MAGETWO-91620

Epam magetwo 91620
magento · Aug 14, 2018 · 8db43e7 · 8db43e7
2 parents 05f9df7 + 279e1f5
commit 8db43e7
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Collection.php b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Collection.php
@@ -222,7 +222,7 @@ public function setInAllAttributeSetsFilter(array $setIds)
                     $setIds
                 )
                 ->group('entity_attribute.attribute_id')
-                ->having('count = ' . count($setIds));
+                ->having(new \Zend_Db_Expr('COUNT(*)') . ' = ' . count($setIds));
         }
 
         //$this->getSelect()->distinct(true);

diff --git a/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/Entity/Attribute/CollectionTest.php b/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/Entity/Attribute/CollectionTest.php
@@ -150,7 +150,7 @@ public function testSetInAllAttributeSetsFilter()
         $this->selectMock->expects($this->atLeastOnce())->method('group')->with('entity_attribute.attribute_id')
             ->willReturnSelf();
 
-        $this->selectMock->expects($this->atLeastOnce())->method('having')->with('count = ' . count($setIds))
+        $this->selectMock->expects($this->atLeastOnce())->method('having')->with(new \Zend_Db_Expr('COUNT(*)') . ' = ' . count($setIds))
             ->willReturnSelf();
 
         $this->model->setInAllAttributeSetsFilter($setIds);

diff --git a/...integration/testsuite/Magento/Eav/Model/ResourceModel/Entity/Attribute/CollectionTest.php b/...integration/testsuite/Magento/Eav/Model/ResourceModel/Entity/Attribute/CollectionTest.php
@@ -52,6 +52,20 @@ public function testSetAttributeGroupFilter()
         $this->assertEquals([$includeGroupId], $groups);
     }
 
+    /**
+     * Test if getAllIds method return results after using setInAllAttributeSetsFilter method
+     *
+     * @covers \Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection::setInAllAttributeSetsFilter()
+     * @covers \Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection::getAllIds()
+     */
+    public function testSetInAllAttributeSetsFilterWithGetAllIds()
+    {
+        $sets = [1];
+        $this->_model->setInAllAttributeSetsFilter($sets);
+        $attributeIds = $this->_model->getAllIds();
+        $this->assertGreaterThan(0, count($attributeIds));
+    }
+
     /**
      * Returns array of group ids, present in collection attributes
      *