Merge remote-tracking branch '39722/bug/39692-block-selection-in-widget' into blprs

Author: engcom-Charlie

app/code/Magento/Cms/Block/Adminhtml/Block/Widget/Chooser.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Cms\Block\Adminhtml\Block\Widget;
 
@@ -100,7 +100,7 @@ public function getRowClickCallback()
         $js = '
             function (grid, event) {
                 var trElement = Event.findElement(event, "tr");
-                var blockId = trElement.down("td").next().next().innerHTML.replace(/^\s+|\s+$/g,"");
+                var blockId = trElement.down("td").innerHTML.replace(/^\s+|\s+$/g,"");
                 var blockTitle = trElement.down("td").next().innerHTML;
                 ' .
             $chooserJsObject .

app/code/Magento/Cms/Test/Mftf/Test/AdminAddBlockWidgetToCMSPageTest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2020 Adobe
+  * All Rights Reserved.
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -51,7 +51,7 @@
         <!-- Assert block_id value in page content -->
         <actionGroup ref="AdminAssertCMSPageContentParamValueActionGroup" stepKey="assertBlockId">
             <argument name="param" value="block_id"/>
-            <argument name="value" value="$$createPreReqBlock.identifier$$"/>
+            <argument name="value" value="$$createPreReqBlock.id$$"/>
         </actionGroup>
     </test>
 </tests>

app/code/Magento/Cms/Test/Unit/Block/Adminhtml/Block/Widget/ChooserTest.php

@@ -1,16 +1,18 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
 namespace Magento\Cms\Test\Unit\Block\Adminhtml\Block\Widget;
 
 use Magento\Backend\Block\Template\Context;
+use Magento\Backend\Helper\Data;
 use Magento\Cms\Block\Adminhtml\Block\Widget\Chooser;
 use Magento\Cms\Model\Block;
 use Magento\Cms\Model\BlockFactory;
+use Magento\Cms\Model\ResourceModel\Block\CollectionFactory;
 use Magento\Framework\Data\Form\Element\AbstractElement;
 use Magento\Framework\Escaper;
 use Magento\Framework\Math\Random;
@@ -77,6 +79,16 @@ class ChooserTest extends TestCase
      */
     protected $chooserMock;
 
+    /**
+     * @var Data|MockObject
+     */
+    protected $backendHelperMock;
+
+    /**
+     * @var CollectionFactory|MockObject
+     */
+    protected $collectionFactoryMock;
+
     protected function setUp(): void
     {
         $this->layoutMock = $this->getMockBuilder(LayoutInterface::class)
@@ -93,6 +105,7 @@ protected function setUp(): void
             ->onlyMethods(
                 [
                     'escapeHtml',
+                    'escapeJs'
                 ]
             )
             ->getMock();
@@ -138,6 +151,13 @@ protected function setUp(): void
             )
             ->onlyMethods(['toHtml'])
             ->getMockForAbstractClass();
+        $this->backendHelperMock = $this->getMockBuilder(Data::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->collectionFactoryMock = $this->getMockBuilder(CollectionFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $objectManager = new ObjectManager($this);
         $objectManager->prepareObjectManager();
@@ -286,4 +306,33 @@ public function testGetGridUrl()
 
         $this->assertEquals($url, $this->this->getGridUrl());
     }
+
+    /**
+     * @covers \Magento\Cms\Block\Adminhtml\Block\Widget\Chooser::testGetRowClickCallback
+     */
+    public function testGetRowClickCallback(): void
+    {
+        $chooserBlock = new Chooser(
+            $this->context,
+            $this->backendHelperMock,
+            $this->blockFactoryMock,
+            $this->collectionFactoryMock
+        );
+        $this->escaper->expects($this->once())
+            ->method('escapeJs')
+            ->willReturnCallback(function ($input) {
+                return $input;
+            });
+        $jsCallback = $chooserBlock->getRowClickCallback();
+
+        $this->assertStringContainsString(
+            'blockId = trElement.down("td").innerHTML.replace(/^\s+|\s+$/g,"")',
+            $jsCallback,
+            'JavaScript callback should use first TD cell for block ID'
+        );
+
+        $this->assertStringContainsString('setElementValue(blockId)', $jsCallback);
+        $this->assertStringContainsString('setElementLabel(blockTitle)', $jsCallback);
+        $this->assertStringContainsString('close()', $jsCallback);
+    }
 }