Merge remote-tracking branch 'origin/MAGETWO-62681' into SEGFAULT_BANNERS_PR

Author: Yaroslav Onischenko

app/code/Magento/Bundle/Model/ResourceModel/Selection.php

@@ -126,7 +126,7 @@ public function getParentIdsByChild($childId)
             'e.' . $metadata->getLinkField() . ' = ' .  $this->getMainTable() . '.parent_product_id',
             ['e.entity_id as parent_product_id']
         )->where(
-            'e.entity_id IN(?)',
+            $this->getMainTable() . '.product_id IN(?)',
             $childId
         );
 

dev/tests/integration/testsuite/Magento/Bundle/Model/Product/TypeTest.php

@@ -77,4 +77,23 @@ public function testGetOptionsCollection()
         $options = $bundleType->getOptionsCollection($bundleProduct);
         $this->assertCount(5, $options->getItems());
     }
+
+    /**
+     * @magentoDataFixture Magento/Bundle/_files/product.php
+     * @covers \Magento\Bundle\Model\Product\Type::getParentIdsByChild()
+     */
+    public function testGetParentIdsByChild()
+    {
+        $productRepository = $this->objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        /** @var \Magento\Catalog\Api\Data\ProductInterface $bundleProduct */
+        $bundleProduct = $productRepository->get('bundle-product');
+        /** @var \Magento\Catalog\Api\Data\ProductInterface $simpleProduct */
+        $simpleProduct = $productRepository->get('simple');
+
+        /** @var \Magento\Bundle\Model\Product\Type $bundleType */
+        $bundleType = $bundleProduct->getTypeInstance();
+        $parentIds = $bundleType->getParentIdsByChild($simpleProduct->getId());
+        $this->assertNotEmpty($parentIds);
+        $this->assertEquals($bundleProduct->getId(), $parentIds[0]);
+    }
 }