MAGETWO-36955: Pull request, Nord team sprint 20

magento · May 15, 2015 · 5bf96e4 · 5bf96e4
1 parent 723222a
commit 5bf96e4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 44 deletions.
diff --git a/dev/tests/integration/testsuite/Magento/Review/Model/Resource/Rating/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Review/Model/Resource/Rating/CollectionTest.php
@@ -20,7 +20,7 @@ protected function setUp()
     }
 
     /**
-     * @magentoDataFixture Magento/Review/_files/customer_rating.php
+     * @magentoDataFixture Magento/Review/_files/customer_review_with_rating.php
      */
     public function testAddEntitySummaryToItem()
     {
@@ -32,6 +32,9 @@ public function testAddEntitySummaryToItem()
         $this->assertEquals($this->collection, $result);
     }
 
+    /**
+     * @magentoDbIsolation enabled
+     */
     public function testAddEntitySummaryToItemEmpty()
     {
         foreach ($this->collection->getItems() as $item) {

diff --git a/dev/tests/integration/testsuite/Magento/Review/_files/customer_rating.php b/dev/tests/integration/testsuite/Magento/Review/_files/customer_rating.php
diff --git a/dev/tests/integration/testsuite/Magento/Review/_files/customer_review_with_rating.php b/dev/tests/integration/testsuite/Magento/Review/_files/customer_review_with_rating.php
@@ -37,6 +37,7 @@
     $review
 );
 
+/** @var \Magento\Review\Model\Resource\Review\Collection $ratingCollection */
 $ratingCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
     '\Magento\Review\Model\Rating'
 )->getCollection()
@@ -58,3 +59,8 @@
     $rating->setReviewId($review->getId())
         ->addOptionVote($ratingOption->getId(), $product->getId());
 }
+
+\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Framework\Registry')->register(
+    'rating_data',
+    $ratingCollection->getFirstItem()
+);