MAGETWO-32250: Header

- Fixed static and integration tests

Author: Bogdan Plieshka

app/code/Magento/Backend/view/adminhtml/templates/admin/login_buttons.phtml

@@ -5,7 +5,10 @@
  */
 ?>
 <div class="actions">
-    <button <?php $block->getUiId(); ?> class="action-login action-primary" title="<?php echo __('Log in')?>" type="submit">
+    <button
+        <?php $block->getUiId(); ?>
+        class="action-login action-primary"
+        title="<?php echo __('Log in')?>" type="submit">
         <span><?php echo __('Sign in')?></span>
     </button>
 </div>

app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml

@@ -16,7 +16,7 @@
             href="<?php echo $block->getHomeLink() ?>"
             <?php echo $edition; ?>
             class="logo"
-            title="<?php echo $this->escapeHtml(__('Magento Admin Panel')) ?>">
+            title="<?php echo $block->escapeHtml(__('Magento Admin Panel')) ?>">
             <img class="logo-img" src="<?php echo $block->getViewFileUrl($logoSrc) ?>" alt="<?php echo __('Magento Admin Panel') ?>"/>
         </a>
     <?php break; ?>
@@ -25,7 +25,7 @@
             <a
                 href="<?php echo $block->getUrl('adminhtml/system_account/index') ?>"
                 class="admin-user-account"
-                title="<?php echo $this->escapeHtml(__('My Account')) ?>"
+                title="<?php echo $block->escapeHtml(__('My Account')) ?>"
                 data-mage-init='{"dropdown":{}}'
                 data-toggle="dropdown">
                 <span class="admin-user-account-text-wrapper">
@@ -38,15 +38,15 @@
                     <a
                         href="<?php echo $block->getUrl('adminhtml/system_account/index') ?>"
                         <?php echo $block->getUiId('user', 'account', 'settings')?>
-                        title="<?php echo $this->escapeHtml(__('Account Setting')) ?>">
+                        title="<?php echo $block->escapeHtml(__('Account Setting')) ?>">
                         <?php echo __('Account Setting') ?> (<span class="admin-user-name"><?php echo $block->escapeHtml($block->getUser()->getUsername()); ?></span>)
                     </a>
                 </li>
                 <?php endif; ?>
                 <li>
                     <a
                         href="<?php echo $block->getBaseUrl(); ?>"
-                        title="<?php echo $this->escapeHtml(__('Customer View')); ?>"
+                        title="<?php echo $block->escapeHtml(__('Customer View')); ?>"
                         target="_blank" class="store-front">
                         <?php echo __('Customer View'); ?>
                     </a>
@@ -55,7 +55,7 @@
                     <a
                         href="<?php echo $block->getLogoutLink() ?>"
                         class="account-signout"
-                        title="<?php echo $this->escapeHtml(__('Sign Out')) ?>">
+                        title="<?php echo $block->escapeHtml(__('Sign Out')) ?>">
                         <?php echo __('Sign Out') ?>
                     </a>
                 </li>

app/code/Magento/Email/composer.json

@@ -8,7 +8,6 @@
         "magento/module-store": "0.42.0-beta10",
         "magento/module-cms": "0.42.0-beta10",
         "magento/module-backend": "0.42.0-beta10",
-        "magento/module-theme": "0.42.0-beta10",
         "magento/module-variable": "0.42.0-beta10",
         "magento/framework": "0.42.0-beta10",
         "magento/magento-composer-installer": "*"

app/code/Magento/User/composer.json

@@ -7,9 +7,7 @@
         "magento/module-authorization": "0.42.0-beta10",
         "magento/module-backend": "0.42.0-beta10",
         "magento/module-integration": "0.42.0-beta10",
-        "magento/module-theme": "0.42.0-beta10",
         "magento/framework": "0.42.0-beta10",
-        "magento/module-require-js": "0.42.0-beta10",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",

dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/AuthTest.php

@@ -19,7 +19,7 @@ class AuthTest extends \Magento\Backend\Utility\Controller
     public function testFormForgotpasswordAction()
     {
         $this->dispatch('backend/admin/auth/forgotpassword');
-        $expected = 'Forgot your user name or password?';
+        $expected = 'Password Help';
         $this->assertContains($expected, $this->getResponse()->getBody());
     }