Merge branch 'MC-40116' of https://github.com/magento-l3/magento2ce into TANGO_PR-02-03-2021_24

Author: thiaramus

app/code/Magento/Review/view/frontend/templates/customer/view.phtml

@@ -38,18 +38,22 @@ $product = $block->getProductData();
                 <?php foreach ($block->getRating() as $_rating): ?>
                     <?php if ($_rating->getPercent()): ?>
                         <?php $rating = ceil($_rating->getPercent()) ?>
+                        <?php $ratingId = $_rating->getRatingId() ?>
                         <div class="rating-summary item">
                             <span class="rating-label">
                                 <span><?= $block->escapeHtml($_rating->getRatingCode()) ?></span>
                             </span>
-                            <div class="rating-result" title="<?= /* @noEscape */ $rating ?>%">
+                            <div class="rating-result"
+                                 id="rating-div-<?= $block->escapeHtml($ratingId) ?>"
+                                 title="<?= /* @noEscape */ $rating ?>%">
                                 <span>
                                     <span><?= /* @noEscape */ $rating ?>%</span>
                                 </span>
                             </div>
                             <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
                                 "width:" . /* @noEscape */ $rating . "%",
-                                'div.rating-result>span:first-child'
+                                'div#rating-div-'.$_rating->getRatingId().
+                                '>span:first-child'
                             ) ?>
                         </div>
                     <?php endif; ?>

dev/tests/integration/testsuite/Magento/Review/Block/Customer/ViewTest.php

@@ -81,13 +81,12 @@ public function testCustomerProductReviewBlock(): void
         $ratings = $this->block->getRating();
         $this->assertCount(2, $ratings);
         foreach ($ratings as $rating) {
+            $this->assertNotEmpty($rating->getRatingId());
             $this->assertEquals(
                 1,
                 Xpath::getElementsCountForXpath(
                     sprintf(
-                        "//div[contains(@class, 'rating-summary')]//span[contains(text(), '%s')]"
-                        . "/../..//span[contains(text(), '%s%%')]",
-                        $rating->getRatingCode(),
+                        "//div[contains(@id, 'rating-div-".$rating->getRatingId()."')]//span[contains(text(), '%s')]",
                         $rating->getPercent()
                     ),
                     $blockHtml