Merge pull request #341 from magento-api/develop

[API] Sprint 49 – Test Coverage and Bugs

app/code/Magento/Backend/Block/Dashboard.php

@@ -31,15 +31,22 @@ protected function _prepareLayout()
 
         $this->addChild('sales', 'Magento\Backend\Block\Dashboard\Sales');
 
-        if ($this->_scopeConfig->getValue(self::XML_PATH_ENABLE_CHARTS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
+        $isChartEnabled = $this->_scopeConfig->getValue(
+            self::XML_PATH_ENABLE_CHARTS,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+        if ($isChartEnabled) {
             $block = $this->getLayout()->createBlock('Magento\Backend\Block\Dashboard\Diagrams');
         } else {
             $block = $this->getLayout()->createBlock(
                 'Magento\Backend\Block\Template'
             )->setTemplate(
                 'dashboard/graph/disabled.phtml'
             )->setConfigUrl(
-                $this->getUrl('adminhtml/system_config/edit', ['section' => 'admin'])
+                $this->getUrl(
+                    'adminhtml/system_config/edit',
+                    ['section' => 'admin', '_fragment' => 'admin_dashboard-link']
+                )
             );
         }
         $this->setChild('diagrams', $block);

app/code/Magento/Backend/Model/Auth.php

@@ -145,7 +145,7 @@ public function getCredentialStorage()
     public function login($username, $password)
     {
         if (empty($username) || empty($password)) {
-            self::throwException(__('Please correct the user name or password.'));
+            self::throwException(__('You did not sign in correctly or your account is temporarily disabled.'));
         }
 
         try {
@@ -162,7 +162,7 @@ public function login($username, $password)
             }
 
             if (!$this->getAuthStorage()->getUser()) {
-                self::throwException(__('Please correct the user name or password.'));
+                self::throwException(__('You did not sign in correctly or your account is temporarily disabled.'));
             }
         } catch (PluginAuthenticationException $e) {
             $this->_eventManager->dispatch(
@@ -175,7 +175,9 @@ public function login($username, $password)
                 'backend_auth_user_login_failed',
                 ['user_name' => $username, 'exception' => $e]
             );
-            self::throwException(__($e->getMessage()? : 'Please correct the user name or password.'));
+            self::throwException(
+                __($e->getMessage()? : 'You did not sign in correctly or your account is temporarily disabled.')
+            );
         }
     }
 

app/code/Magento/Backend/Test/Unit/Model/AuthTest.php

@@ -50,7 +50,7 @@ protected function setUp()
 
     /**
      * @expectedException \Magento\Framework\Exception\AuthenticationException
-     * @expectedExceptionMessage Please correct the user name or password.
+     * @expectedExceptionMessage You did not sign in correctly or your account is temporarily disabled.
      */
     public function testLoginFailed()
     {
@@ -59,8 +59,9 @@ public function testLoginFailed()
             ->method('create')
             ->with('Magento\Backend\Model\Auth\Credential\StorageInterface')
             ->will($this->returnValue($this->_credentialStorage));
-        $exceptionMock =
-            new \Magento\Framework\Exception\LocalizedException(__('Please correct the user name or password.'));
+        $exceptionMock = new \Magento\Framework\Exception\LocalizedException(
+            __('You did not sign in correctly or your account is temporarily disabled.')
+        );
         $this->_credentialStorage
             ->expects($this->once())
             ->method('login')

app/code/Magento/Backend/i18n/de_DE.csv

@@ -287,7 +287,7 @@ Synchronizing...,Synchronizing...
 "Current Month","Current Month"
 YTD,YTD
 2YTD,2YTD
-"Please correct the user name or password.","Please correct the user name or password."
+"You did not sign in correctly or your account is temporarily disabled.","You did not sign in correctly or your account is temporarily disabled."
 "Authentication error occurred.","Authentication error occurred."
 "Please specify the admin custom URL.","Please specify the admin custom URL."
 "Invalid %1. %2","Invalid %1. %2"

app/code/Magento/Backend/i18n/en_US.csv

@@ -287,7 +287,7 @@ Synchronizing...,Synchronizing...
 "Current Month","Current Month"
 YTD,YTD
 2YTD,2YTD
-"Please correct the user name or password.","Please correct the user name or password."
+"You did not sign in correctly or your account is temporarily disabled.","You did not sign in correctly or your account is temporarily disabled."
 "Authentication error occurred.","Authentication error occurred."
 "Please specify the admin custom URL.","Please specify the admin custom URL."
 "Invalid %1. %2","Invalid %1. %2"

app/code/Magento/Backend/i18n/es_ES.csv

@@ -287,7 +287,7 @@ Synchronizing...,Synchronizing...
 "Current Month","Current Month"
 YTD,YTD
 2YTD,2YTD
-"Please correct the user name or password.","Please correct the user name or password."
+"You did not sign in correctly or your account is temporarily disabled.","You did not sign in correctly or your account is temporarily disabled."
 "Authentication error occurred.","Authentication error occurred."
 "Please specify the admin custom URL.","Please specify the admin custom URL."
 "Invalid %1. %2","Invalid %1. %2"

app/code/Magento/Backend/i18n/fr_FR.csv

@@ -287,7 +287,7 @@ Synchronizing...,Synchronizing...
 "Current Month","Current Month"
 YTD,YTD
 2YTD,2YTD
-"Please correct the user name or password.","Please correct the user name or password."
+"You did not sign in correctly or your account is temporarily disabled.","You did not sign in correctly or your account is temporarily disabled."
 "Authentication error occurred.","Authentication error occurred."
 "Please specify the admin custom URL.","Please specify the admin custom URL."
 "Invalid %1. %2","Invalid %1. %2"

app/code/Magento/Backend/i18n/nl_NL.csv

@@ -287,7 +287,7 @@ Synchronizing...,Synchronizing...
 "Current Month","Current Month"
 YTD,YTD
 2YTD,2YTD
-"Please correct the user name or password.","Please correct the user name or password."
+"You did not sign in correctly or your account is temporarily disabled.","You did not sign in correctly or your account is temporarily disabled."
 "Authentication error occurred.","Authentication error occurred."
 "Please specify the admin custom URL.","Please specify the admin custom URL."
 "Invalid %1. %2","Invalid %1. %2"

app/code/Magento/Backend/i18n/pt_BR.csv

@@ -287,7 +287,7 @@ Synchronizing...,Synchronizing...
 "Current Month","Current Month"
 YTD,YTD
 2YTD,2YTD
-"Please correct the user name or password.","Please correct the user name or password."
+"You did not sign in correctly or your account is temporarily disabled.","You did not sign in correctly or your account is temporarily disabled."
 "Authentication error occurred.","Authentication error occurred."
 "Please specify the admin custom URL.","Please specify the admin custom URL."
 "Invalid %1. %2","Invalid %1. %2"

app/code/Magento/Backend/i18n/zh_CN.csv

@@ -287,7 +287,7 @@ Synchronizing...,Synchronizing...
 "Current Month","Current Month"
 YTD,YTD
 2YTD,2YTD
-"Please correct the user name or password.","Please correct the user name or password."
+"You did not sign in correctly or your account is temporarily disabled.","You did not sign in correctly or your account is temporarily disabled."
 "Authentication error occurred.","Authentication error occurred."
 "Please specify the admin custom URL.","Please specify the admin custom URL."
 "Invalid %1. %2","Invalid %1. %2"

app/code/Magento/Email/Test/Unit/Model/BackendTemplateTest.php

@@ -37,6 +37,11 @@ class BackendTemplateTest extends \PHPUnit_Framework_TestCase
      */
     protected $resourceModelMock;
 
+    /**
+     * @var \Magento\Framework\App\ObjectManager
+     */
+    protected $objectManagerBackup;
+
     protected function setUp()
     {
         $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -54,6 +59,13 @@ protected function setUp()
             ->method('get')
             ->with('Magento\Email\Model\Resource\Template')
             ->will($this->returnValue($this->resourceModelMock));
+
+        try {
+            $this->objectManagerBackup = \Magento\Framework\App\ObjectManager::getInstance();
+        } catch (\RuntimeException $e) {
+            $this->objectManagerBackup = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(BP, $_SERVER)
+                ->create($_SERVER);
+        }
         \Magento\Framework\App\ObjectManager::setInstance($objectManagerMock);
 
         $this->model = $helper->getObject(
@@ -62,6 +74,12 @@ protected function setUp()
         );
     }
 
+    protected function tearDown()
+    {
+        parent::tearDown();
+        \Magento\Framework\App\ObjectManager::setInstance($this->objectManagerBackup);
+    }
+
     public function testGetSystemConfigPathsWhereUsedAsDefaultNoTemplateCode()
     {
         $this->assertEquals([], $this->model->getSystemConfigPathsWhereUsedAsDefault());

app/code/Magento/Integration/Model/AdminTokenService.php

@@ -79,7 +79,9 @@ public function createAdminAccessToken($username, $password)
              * Constant cannot be created in Auth Model since it uses legacy translation that doesn't support it.
              * Need to make sure that this is refactored once exception handling is updated in Auth Model.
              */
-            throw new AuthenticationException(__('Please correct the user name or password.'));
+            throw new AuthenticationException(
+                __('You did not sign in correctly or your account is temporarily disabled.')
+            );
         }
         return $this->tokenModelFactory->create()->createAdminToken($this->userModel->getId())->getToken();
     }

app/code/Magento/Integration/Model/Config/Integration/Reader.php

@@ -7,6 +7,8 @@
 
 /**
  * Service config data reader.
+ *
+ * @codeCoverageIgnore
  */
 class Reader extends \Magento\Framework\Config\Reader\Filesystem
 {

app/code/Magento/Integration/Model/CredentialsValidator.php

@@ -27,7 +27,7 @@ public function validate($username, $password)
         if (!is_string($username) || strlen($username) == 0) {
             $exception->addError(__(InputException::REQUIRED_FIELD, ['fieldName' => 'username']));
         }
-        if (!is_string($username) || strlen($password) == 0) {
+        if (!is_string($password) || strlen($password) == 0) {
             $exception->addError(__(InputException::REQUIRED_FIELD, ['fieldName' => 'password']));
         }
         if ($exception->wasErrorAdded()) {

app/code/Magento/Integration/Model/IntegrationService.php

@@ -45,7 +45,7 @@ public function __construct(IntegrationFactory $integrationFactory, IntegrationO
     public function create(array $integrationData)
     {
         $this->_checkIntegrationByName($integrationData['name']);
-        $integration = $this->_integrationFactory->create($integrationData);
+        $integration = $this->_integrationFactory->create()->setData($integrationData);
         $integration->save();
         $consumerName = 'Integration' . $integration->getId();
         $consumer = $this->_oauthService->createConsumer(['name' => $consumerName]);

app/code/Magento/Integration/Model/Oauth/Consumer.php

@@ -31,12 +31,12 @@ class Consumer extends \Magento\Framework\Model\AbstractModel implements Consume
     /**
      * @var \Magento\Framework\Url\Validator
      */
-    protected $_urlValidator;
+    protected $urlValidator;
 
     /**
-     * @var \Magento\Integration\Model\Oauth\Consumer\Validator\KeyLengthFactory
+     * @var \Magento\Integration\Model\Oauth\Consumer\Validator\KeyLength
      */
-    protected $_keyLengthFactory;
+    protected $keyLengthValidator;
 
     /**
      * @var  \Magento\Integration\Helper\Oauth\Data
@@ -46,7 +46,7 @@ class Consumer extends \Magento\Framework\Model\AbstractModel implements Consume
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
-     * @param \Magento\Integration\Model\Oauth\Consumer\Validator\KeyLengthFactory $keyLengthFactory
+     * @param \Magento\Integration\Model\Oauth\Consumer\Validator\KeyLength $keyLength
      * @param \Magento\Framework\Url\Validator $urlValidator
      * @param \Magento\Integration\Helper\Oauth\Data $dataHelper
      * @param \Magento\Framework\Model\Resource\AbstractResource $resource
@@ -56,15 +56,15 @@ class Consumer extends \Magento\Framework\Model\AbstractModel implements Consume
     public function __construct(
         \Magento\Framework\Model\Context $context,
         \Magento\Framework\Registry $registry,
-        \Magento\Integration\Model\Oauth\Consumer\Validator\KeyLengthFactory $keyLengthFactory,
+        \Magento\Integration\Model\Oauth\Consumer\Validator\KeyLength $keyLength,
         \Magento\Framework\Url\Validator $urlValidator,
         \Magento\Integration\Helper\Oauth\Data $dataHelper,
         \Magento\Framework\Model\Resource\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\Db $resourceCollection = null,
         array $data = []
     ) {
-        $this->_keyLengthFactory = $keyLengthFactory;
-        $this->_urlValidator = $urlValidator;
+        $this->keyLengthValidator = $keyLength;
+        $this->urlValidator = $urlValidator;
         $this->dataHelper = $dataHelper;
         parent::__construct($context, $registry, $resource, $resourceCollection, $data);
     }
@@ -87,9 +87,7 @@ protected function _construct()
      */
     public function beforeSave()
     {
-        if (!$this->getId()) {
-            $this->setUpdatedAt(time());
-        }
+        $this->setUpdatedAt(time());
         $this->validate();
         parent::beforeSave();
         return $this;
@@ -104,29 +102,27 @@ public function validate()
             $this->setCallbackUrl(trim($this->getCallbackUrl()));
             $this->setRejectedCallbackUrl(trim($this->getRejectedCallbackUrl()));
 
-            if ($this->getCallbackUrl() && !$this->_urlValidator->isValid($this->getCallbackUrl())) {
+            if ($this->getCallbackUrl() && !$this->urlValidator->isValid($this->getCallbackUrl())) {
                 throw new \Magento\Framework\Exception\LocalizedException(__('Invalid Callback URL'));
             }
-            if ($this->getRejectedCallbackUrl() && !$this->_urlValidator->isValid($this->getRejectedCallbackUrl())) {
+            if ($this->getRejectedCallbackUrl() && !$this->urlValidator->isValid($this->getRejectedCallbackUrl())) {
                 throw new \Magento\Framework\Exception\LocalizedException(__('Invalid Rejected Callback URL'));
             }
         }
 
-        /** @var $validatorLength \Magento\Integration\Model\Oauth\Consumer\Validator\KeyLength */
-        $validatorLength = $this->_keyLengthFactory->create(
-            ['options' => ['length' => \Magento\Framework\Oauth\Helper\Oauth::LENGTH_CONSUMER_KEY]]
-        );
-
-        $validatorLength->setName('Consumer Key');
-        if (!$validatorLength->isValid($this->getKey())) {
-            $messages = $validatorLength->getMessages();
+        $this->keyLengthValidator
+            ->setLength(\Magento\Framework\Oauth\Helper\Oauth::LENGTH_CONSUMER_KEY)
+            ->setName('Consumer Key');
+        if (!$this->keyLengthValidator->isValid($this->getKey())) {
+            $messages = $this->keyLengthValidator->getMessages();
             throw new \Magento\Framework\Exception\LocalizedException(__(array_shift($messages)));
         }
 
-        $validatorLength->setLength(\Magento\Framework\Oauth\Helper\Oauth::LENGTH_CONSUMER_SECRET);
-        $validatorLength->setName('Consumer Secret');
-        if (!$validatorLength->isValid($this->getSecret())) {
-            $messages = $validatorLength->getMessages();
+        $this->keyLengthValidator
+            ->setLength(\Magento\Framework\Oauth\Helper\Oauth::LENGTH_CONSUMER_SECRET)
+            ->setName('Consumer Secret');
+        if (!$this->keyLengthValidator->isValid($this->getSecret())) {
+            $messages = $this->keyLengthValidator->getMessages();
             throw new \Magento\Framework\Exception\LocalizedException(__(array_shift($messages)));
         }
         return true;