Merge branch 'develop' into patch-3

Author: liam-wiltshire

.htaccess

@@ -285,10 +285,3 @@
 ## http://developer.yahoo.com/performance/rules.html#etags
 
     #FileETag none
-
-############################################
-## Add custom headers
-<IfModule mod_headers.c>
-    Header set X-Content-Type-Options "nosniff"
-    Header set X-XSS-Protection "1; mode=block"
-</IfModule>

CHANGELOG.md

@@ -2868,7 +2868,7 @@ Tests:
   * Fixed a 404 error after saving mass update product attributes form
   * Fixed an issue when it was impossible to perform search by all tax classes on the Advanced Search page
   * Fixed an issue when attribute order for configurable product was not preserved after saving product
-  * Fixed an issue with no results for the Product Best Sellers report
+  * Fixed an issue with no results for the Product Bestsellers report
   * Fixed a fatal error when opening tax configuration page in the backend
   * Fixed an error occurring when opening the Tax Zones and Rates page in the backend
   * Fixed a 404 error occurring while searching products on the New Review page

app/code/Magento/AdminNotification/etc/acl.xml

@@ -11,11 +11,11 @@
             <resource id="Magento_Backend::admin">
                 <resource id="Magento_Backend::system">
                     <resource id="Magento_Backend::system_other_settings">
-                        <resource id="Magento_AdminNotification::adminnotification" title="Notifications" sortOrder="10">
-                            <resource id="Magento_AdminNotification::show_toolbar" title="Show Toolbar" sortOrder="10" />
-                            <resource id="Magento_AdminNotification::show_list" title="Show List" sortOrder="20" />
-                            <resource id="Magento_AdminNotification::mark_as_read" title="Mark as Read" sortOrder="30" />
-                            <resource id="Magento_AdminNotification::adminnotification_remove" title="Remove" sortOrder="40" />
+                        <resource id="Magento_AdminNotification::adminnotification" title="Notifications" translate="title" sortOrder="10">
+                            <resource id="Magento_AdminNotification::show_toolbar" title="Show Toolbar" translate="title" sortOrder="10" />
+                            <resource id="Magento_AdminNotification::show_list" title="Show List" translate="title" sortOrder="20" />
+                            <resource id="Magento_AdminNotification::mark_as_read" title="Mark as Read" translate="title" sortOrder="30" />
+                            <resource id="Magento_AdminNotification::adminnotification_remove" title="Remove" translate="title" sortOrder="40" />
                         </resource>
                     </resource>
                 </resource>

app/code/Magento/AdminNotification/etc/adminhtml/menu.xml

@@ -7,6 +7,6 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
     <menu>
-        <add id="Magento_AdminNotification::system_adminnotification" title="Notifications" module="Magento_AdminNotification" sortOrder="10" parent="Magento_Backend::system_other_settings" action="adminhtml/notification" resource="Magento_AdminNotification::adminnotification"/>
+        <add id="Magento_AdminNotification::system_adminnotification"      title="Notifications" translate="title" module="Magento_AdminNotification" sortOrder="10" parent="Magento_Backend::system_other_settings" action="adminhtml/notification" resource="Magento_AdminNotification::adminnotification"/>
     </menu>
 </config>

app/code/Magento/Authorizenet/Test/Unit/Model/DirectpostTest.php

@@ -331,7 +331,7 @@ public function testCheckResponseCodeFailure($responseCode)
         $this->dataHelperMock->expects($this->any())
             ->method('wrapGatewayError')
             ->with($reasonText)
-            ->willReturn(__('Gateway error: ' . $reasonText));
+            ->willReturn(__('Gateway error: %1', $reasonText));
 
         $this->directpost->checkResponseCode();
     }

app/code/Magento/Authorizenet/view/frontend/web/js/view/payment/method-renderer/authorizenet-directpost.js

@@ -5,65 +5,59 @@
 define(
     [
         'jquery',
-        'Magento_Payment/js/view/payment/iframe',
-        'Magento_Checkout/js/action/set-payment-information',
-        'Magento_Checkout/js/model/payment/additional-validators',
-        'Magento_Checkout/js/model/full-screen-loader'
+        'Magento_Payment/js/view/payment/iframe'
     ],
-    function ($, Component, setPaymentInformationAction, additionalValidators, fullScreenLoader) {
+    function ($, Component) {
         'use strict';
 
         return Component.extend({
             defaults: {
-                template: 'Magento_Authorizenet/payment/authorizenet-directpost'
+                template: 'Magento_Authorizenet/payment/authorizenet-directpost',
+                timeoutMessage: 'Sorry, but something went wrong. Please contact the seller.'
             },
             placeOrderHandler: null,
             validateHandler: null,
 
-            setPlaceOrderHandler: function(handler) {
+            /**
+             * @param {Object} handler
+             */
+            setPlaceOrderHandler: function (handler) {
                 this.placeOrderHandler = handler;
             },
 
-            setValidateHandler: function(handler) {
+            /**
+             * @param {Object} handler
+             */
+            setValidateHandler: function (handler) {
                 this.validateHandler = handler;
             },
 
-            context: function() {
+            /**
+             * @returns {Object}
+             */
+            context: function () {
                 return this;
             },
 
-            isShowLegend: function() {
+            /**
+             * @returns {Boolean}
+             */
+            isShowLegend: function () {
                 return true;
             },
 
-            getCode: function() {
+            /**
+             * @returns {String}
+             */
+            getCode: function () {
                 return 'authorizenet_directpost';
             },
 
-            isActive: function() {
-                return true;
-            },
-
             /**
-             * @override
+             * @returns {Boolean}
              */
-            placeOrder: function () {
-                var self = this;
-
-                if (this.validateHandler() && additionalValidators.validate()) {
-                    fullScreenLoader.startLoader();
-                    this.isPlaceOrderActionAllowed(false);
-                    $.when(setPaymentInformationAction(this.messageContainer, {
-                        'method': self.getCode()
-                    })).done(function () {
-                        self.placeOrderHandler().fail(function () {
-                            fullScreenLoader.stopLoader();
-                        });
-                    }).fail(function () {
-                        fullScreenLoader.stopLoader();
-                        self.isPlaceOrderActionAllowed(true);
-                    });
-                }
+            isActive: function () {
+                return true;
             }
         });
     }

app/code/Magento/Backend/Block/System/Account/Edit/Form.php

@@ -100,7 +100,7 @@ protected function _prepareForm()
                 'name' => 'password',
                 'label' => __('New Password'),
                 'title' => __('New Password'),
-                'class' => 'input-text validate-admin-password'
+                'class' => 'validate-admin-password admin__control-text'
             ]
         );
 
@@ -110,7 +110,7 @@ protected function _prepareForm()
             [
                 'name' => 'password_confirmation',
                 'label' => __('Password Confirmation'),
-                'class' => 'input-text validate-cpassword'
+                'class' => 'validate-cpassword admin__control-text'
             ]
         );
 
@@ -138,7 +138,7 @@ protected function _prepareForm()
                 'label' => __('Your Password'),
                 'id' => self::IDENTITY_VERIFICATION_PASSWORD_FIELD,
                 'title' => __('Your Password'),
-                'class' => 'input-text validate-current-password required-entry',
+                'class' => 'validate-current-password required-entry admin__control-text',
                 'required' => true
             ]
         );

app/code/Magento/Backend/Block/Widget/Tabs.php

@@ -112,7 +112,7 @@ public function addTabAfter($tabId, $tab, $afterTabId)
     public function addTab($tabId, $tab)
     {
         if (empty($tabId)) {
-            throw new \Exception(__('Please correct the tab configuration and try again. Tab Id should be not empry'));
+            throw new \Exception(__('Please correct the tab configuration and try again. Tab Id should be not empty'));
         }
         if (is_array($tab)) {
             $this->_tabs[$tabId] = new \Magento\Framework\DataObject($tab);

app/code/Magento/Backend/Model/Locale/Manager.php

@@ -26,22 +26,30 @@ class Manager
      * @var \Magento\Framework\TranslateInterface
      */
     protected $_translator;
+    
+    /**
+     * @var \Magento\Backend\App\ConfigInterface
+     */
+    protected $_backendConfig;
 
     /**
      * Constructor
      *
      * @param \Magento\Backend\Model\Session $session
      * @param \Magento\Backend\Model\Auth\Session $authSession
      * @param \Magento\Framework\TranslateInterface $translator
+     * @param \Magento\Backend\App\ConfigInterface $backendConfig
      */
     public function __construct(
         \Magento\Backend\Model\Session $session,
         \Magento\Backend\Model\Auth\Session $authSession,
-        \Magento\Framework\TranslateInterface $translator
+        \Magento\Framework\TranslateInterface $translator,
+        \Magento\Backend\App\ConfigInterface $backendConfig
     ) {
         $this->_session = $session;
         $this->_authSession = $authSession;
         $this->_translator = $translator;
+        $this->_backendConfig = $backendConfig;
     }
 
     /**
@@ -53,28 +61,40 @@ public function __construct(
     public function switchBackendInterfaceLocale($localeCode)
     {
         $this->_session->setSessionLocale(null);
-
+        
         $this->_authSession->getUser()->setInterfaceLocale($localeCode);
-
+        
         $this->_translator->setLocale($localeCode)->loadData(null, true);
-
+        
         return $this;
     }
 
+    /**
+     * Get general interface locale 
+     *
+     * @return string
+     */
+    public function getGeneralLocale()
+    {
+        return $this->_backendConfig->getValue('general/locale/code');
+    }
+
     /**
      * Get user interface locale stored in session data
      *
      * @return string
      */
     public function getUserInterfaceLocale()
     {
-        $interfaceLocale = \Magento\Framework\Locale\Resolver::DEFAULT_LOCALE;
-
         $userData = $this->_authSession->getUser();
+        $interfaceLocale = \Magento\Framework\Locale\Resolver::DEFAULT_LOCALE;
+        
         if ($userData && $userData->getInterfaceLocale()) {
             $interfaceLocale = $userData->getInterfaceLocale();
+        } elseif ($this->getGeneralLocale()) {
+            $interfaceLocale = $this->getGeneralLocale();
         }
-
+        
         return $interfaceLocale;
     }
 }

app/code/Magento/Backend/Test/Unit/Model/Locale/ManagerTest.php

@@ -15,7 +15,7 @@ class ManagerTest extends \PHPUnit_Framework_TestCase
     protected $_model;
 
     /**
-     * @var \Magento\Framework\TranslateInterface
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\TranslateInterface
      */
     protected $_translator;
 
@@ -25,9 +25,14 @@ class ManagerTest extends \PHPUnit_Framework_TestCase
     protected $_session;
 
     /**
-     * @var \Magento\Backend\Model\Auth\Session
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Backend\Model\Auth\Session
      */
     protected $_authSession;
+    
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Backend\App\ConfigInterface
+     */
+    protected $_backendConfig;
 
     protected function setUp()
     {
@@ -40,7 +45,9 @@ protected function setUp()
             '',
             false
         );
-
+        
+        $this->_backendConfig = $this->getMockForAbstractClass('Magento\Backend\App\ConfigInterface', [], '', false);
+        
         $userMock = new \Magento\Framework\DataObject();
 
         $this->_authSession->expects($this->any())->method('getUser')->will($this->returnValue($userMock));
@@ -54,7 +61,8 @@ protected function setUp()
         $this->_model = new \Magento\Backend\Model\Locale\Manager(
             $this->_session,
             $this->_authSession,
-            $this->_translator
+            $this->_translator,
+            $this->_backendConfig
         );
     }
 
@@ -102,4 +110,17 @@ public function testGetUserInterfaceLocale()
 
         $this->assertEquals($locale, 'de_DE');
     }
+
+    /**
+     * @covers \Magento\Backend\Model\Locale\Manager::getUserInterfaceLocale
+     */
+    public function testGetUserInterfaceGeneralLocale()
+    {
+        $this->_backendConfig->expects($this->any())
+            ->method('getValue')
+            ->with('general/locale/code')
+            ->willReturn('test_locale');
+        $locale = $this->_model->getUserInterfaceLocale();
+        $this->assertEquals($locale, 'test_locale');
+    }
 }