Merge remote-tracking branch 'origin/MAGETWO-45887' into BUGS

Author: slavvka

lib/internal/Magento/Framework/View/Page/Config/Renderer.php

@@ -106,7 +106,7 @@ public function renderHeadContent()
      */
     public function renderTitle()
     {
-        return '<title>' . $this->pageConfig->getTitle()->get() . '</title>' . "\n";
+        return '<title>' . $this->escaper->escapeHtml($this->pageConfig->getTitle()->get()) . '</title>' . "\n";
     }
 
     /**

lib/internal/Magento/Framework/View/Test/Unit/Page/Config/RendererTest.php

@@ -179,11 +179,15 @@ public function testRenderTitle()
 
         $this->pageConfigMock->expects($this->any())
             ->method('getTitle')
-            ->will($this->returnValue($this->titleMock));
+            ->willReturn($this->titleMock);
 
         $this->titleMock->expects($this->once())
             ->method('get')
-            ->will($this->returnValue($title));
+            ->willReturn($title);
+
+        $this->escaperMock->expects($this->once())
+            ->method('escapeHtml')
+            ->willReturnArgument(0);
 
         $this->assertEquals($expected, $this->renderer->renderTitle());
     }