Merge remote-tracking branch 'origin/MC-38269' into 2.4-develop-pr44

Author: serhii-balko

app/code/Magento/Persistent/view/frontend/templates/additional.phtml

@@ -4,13 +4,9 @@
  * See COPYING.txt for license details.
  */
 ?>
-<?php if ($block->getCustomerId()) :?>
-    <span>
-        <a <?= /* @noEscape */ $block->getLinkAttributes()?>><?= $block->escapeHtml(__('Not you?'));?></a>
-    </span>
-<?php endif;?>
 <script type="application/javascript">
-    window.persistent = <?= /* @noEscape */ $block->getConfig(); ?>;
+    window.persistent = <?=/* @noEscape */ $block->getConfig()?>;
+    window.notYouLink = '<?=/* @noEscape */ $block->getLinkAttributes()?>';
 </script>
 <script type="text/x-magento-init">
     {

app/code/Magento/Persistent/view/frontend/web/js/view/additional-welcome.js

@@ -40,6 +40,7 @@ define([
 
                         $(this).attr('data-bind', html);
                         $(this).html(html);
+                        $(this).after(' <span><a ' + window.notYouLink + '>' + $t('Not you?') + '</a></span>');
                     });
                 }
             }

dev/tests/integration/testsuite/Magento/Persistent/Block/Header/AdditionalTest.php

@@ -6,41 +6,47 @@
 
 namespace Magento\Persistent\Block\Header;
 
+use Magento\Customer\Model\Session;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Persistent\Helper\Session as SessionHelper;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
 /**
  * @magentoDataFixture Magento/Persistent/_files/persistent.php
  */
-class AdditionalTest extends \PHPUnit\Framework\TestCase
+class AdditionalTest extends TestCase
 {
     /**
-     * @var \Magento\Persistent\Block\Header\Additional
+     * @var Additional
      */
     protected $_block;
 
     /**
-     * @var \Magento\Persistent\Helper\Session
+     * @var SessionHelper
      */
     protected $_persistentSessionHelper;
 
     /**
-     * @var \Magento\Customer\Model\Session
+     * @var Session
      */
     protected $_customerSession;
 
     /**
-     * @var \Magento\Framework\ObjectManagerInterface
+     * @var ObjectManagerInterface
      */
     protected $_objectManager;
 
     protected function setUp(): void
     {
-        $this->_objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->_objectManager = Bootstrap::getObjectManager();
 
-        /** @var \Magento\Persistent\Helper\Session $persistentSessionHelper */
-        $this->_persistentSessionHelper = $this->_objectManager->create(\Magento\Persistent\Helper\Session::class);
+        /** @var Session $persistentSessionHelper */
+        $this->_persistentSessionHelper = $this->_objectManager->create(Session::class);
 
-        $this->_customerSession = $this->_objectManager->get(\Magento\Customer\Model\Session::class);
+        $this->_customerSession = $this->_objectManager->get(Session::class);
 
-        $this->_block = $this->_objectManager->create(\Magento\Persistent\Block\Header\Additional::class);
+        $this->_block = $this->_objectManager->create(Additional::class);
     }
 
     /**
@@ -54,12 +60,7 @@ protected function setUp(): void
     public function testToHtml()
     {
         $this->_customerSession->loginById(1);
-        $translation = __('Not you?');
-
-        $this->assertStringContainsString(
-            '<a href="' . $this->_block->getHref() . '">' . $translation . '</a>',
-            $this->_block->toHtml()
-        );
+        $this->assertStringContainsString($this->_block->getHref(), $this->_block->toHtml());
         $this->_customerSession->logout();
     }
 }