MTO-143: [Test] Captcha and lockout for Edit Account Settings page

- Defects fixed

Author: AndreiZiblitski

.travis.yml

@@ -26,12 +26,11 @@ cache:
   directories: $HOME/.composer/cache
 matrix:
   exclude:
-    - php: 7.0
+    - php: 5.6.29
       env: TEST_SUITE=static
 before_install: ./dev/travis/before_install.sh
 install: composer install --no-interaction --prefer-dist
 before_script: ./dev/travis/before_script.sh
 script:
-  - cd dev/tests/$TEST_SUITE
   - test $TEST_SUITE = "static" && TEST_FILTER='--filter "Magento\\Test\\Php\\LiveCodeTest"' || true
-  - phpunit $TEST_FILTER
+  - phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER

PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,20 @@
+<!--- Provide a general summary of the Pull Request in the Title above -->
+
+### Description
+<!--- Provide a description of the changes proposed in the pull request -->
+
+### Fixed Issues (if relevant)
+<!--- Provide a list of fixed issues in the format magento/magetno2#<issue_number>, if relevant  -->
+1. magento/magetno2#<issue_number>: Issue title
+2. ...
+
+### Manual testing scenarios
+<!--- Provide a set of unambiguous steps to test the proposed code change -->
+1. ...
+2. ...
+
+### Contribution checklist
+ - [ ] Pull request has a meaningful description of its purpose
+ - [ ] All commits are accompanied by meaningful commit messages
+ - [ ] All new or changed code is covered with unit/integration tests (if applicable)
+ - [ ] All automated tests passed successfully (all builds on Travis CI are green)

app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php

@@ -9,7 +9,7 @@
 use Magento\Store\Model\Store;
 
 /**
- * @deprecated 
+ * @deprecated
  */
 class Baseurl implements \Magento\Framework\Notification\MessageInterface
 {

app/code/Magento/AdminNotification/Setup/InstallSchema.php

@@ -120,6 +120,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
         $installer->getConnection()->createTable($table);
 
         $installer->endSetup();
-
     }
 }

app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php

@@ -13,7 +13,7 @@ class WebsiteTest extends \PHPUnit_Framework_TestCase
     /**
      * @var \Magento\Store\Model\WebSite|\PHPUnit_Framework_MockObject_MockObject
      */
-     protected $webSiteModel;
+    protected $webSiteModel;
 
     /**
      * @var \Magento\CatalogImportExport\Model\Import\Product\StoreResolver|\PHPUnit_Framework_MockObject_MockObject

app/code/Magento/Analytics/Controller/Adminhtml/Subscription/Postpone.php

@@ -55,7 +55,6 @@ public function __construct(
         $this->notificationTime = $notificationTime;
         $this->logger = $logger;
         parent::__construct($context);
-
     }
 
     /**

app/code/Magento/Analytics/Cron/CollectData.php

@@ -5,7 +5,7 @@
  */
 namespace Magento\Analytics\Cron;
 
-use Magento\Analytics\Model\ExportDataHandler;
+use Magento\Analytics\Model\ExportDataHandlerInterface;
 use Magento\Analytics\Model\SubscriptionStatusProvider;
 
 /**
@@ -16,7 +16,7 @@ class CollectData
     /**
      * Resource for the handling of a new data collection.
      *
-     * @var ExportDataHandler
+     * @var ExportDataHandlerInterface
      */
     private $exportDataHandler;
 
@@ -28,11 +28,11 @@ class CollectData
     private $subscriptionStatus;
 
     /**
-     * @param ExportDataHandler $exportDataHandler
+     * @param ExportDataHandlerInterface $exportDataHandler
      * @param SubscriptionStatusProvider $subscriptionStatus
      */
     public function __construct(
-        ExportDataHandler $exportDataHandler,
+        ExportDataHandlerInterface $exportDataHandler,
         SubscriptionStatusProvider $subscriptionStatus
     ) {
         $this->exportDataHandler = $exportDataHandler;

app/code/Magento/Analytics/Model/Connector/NotifyDataChangedCommand.php

@@ -0,0 +1,101 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model\Connector;
+
+use Magento\Analytics\Model\AnalyticsToken;
+use Magento\Framework\HTTP\ZendClient;
+use Magento\Config\Model\Config;
+use Psr\Log\LoggerInterface;
+use Magento\Store\Model\Store;
+
+/**
+ * Command notifies MBI about that data collection was finished.
+ */
+class NotifyDataChangedCommand implements CommandInterface
+{
+    /**
+     * @var string
+     */
+    private $notifyDataChangedUrlPath = 'analytics/url/notify_data_changed';
+
+    /**
+     * @var AnalyticsToken
+     */
+    private $analyticsToken;
+
+    /**
+     * @var Http\ClientInterface
+     */
+    private $httpClient;
+
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * NotifyDataChangedCommand constructor.
+     * @param AnalyticsToken $analyticsToken
+     * @param Http\ClientInterface $httpClient
+     * @param Config $config
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        AnalyticsToken $analyticsToken,
+        Http\ClientInterface $httpClient,
+        Config $config,
+        LoggerInterface $logger
+    ) {
+        $this->analyticsToken = $analyticsToken;
+        $this->httpClient = $httpClient;
+        $this->config = $config;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Notify MBI about that data collection was finished
+     * @return bool
+     */
+    public function execute()
+    {
+        $result = false;
+        try {
+            if ($this->analyticsToken->isTokenExist()) {
+                $this->httpClient->request(
+                    ZendClient::POST,
+                    $this->config->getConfigDataValue($this->notifyDataChangedUrlPath),
+                    $this->getRequestJson(),
+                    ['Content-Type: application/json']
+                );
+                $result = true;
+            }
+        } catch (\Exception $e) {
+            $this->logger->critical($e);
+        }
+        return $result;
+    }
+
+    /**
+     * Prepares request data in JSON format.
+     * @return string
+     */
+    private function getRequestJson()
+    {
+        return json_encode(
+            [
+                "access-token" => $this->analyticsToken->getToken(),
+                "url" => $this->config->getConfigDataValue(
+                    Store::XML_PATH_SECURE_BASE_URL
+                ),
+            ]
+        );
+    }
+}

app/code/Magento/Analytics/Model/ExportDataHandler.php

@@ -15,7 +15,7 @@
 /**
  * Class for the handling of a new data collection for MBI.
  */
-class ExportDataHandler
+class ExportDataHandler implements ExportDataHandlerInterface
 {
     /**
      * Subdirectory path for all temporary files.
@@ -84,9 +84,7 @@ public function __construct(
     }
 
     /**
-     * Execute collecting new data for MBI.
-     *
-     * @return bool
+     * @inheritdoc
      */
     public function prepareExportData()
     {

app/code/Magento/Analytics/Model/ExportDataHandlerInterface.php

@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Model;
+
+/**
+ * The interface represents the type of classes that handling of a new data collection for MBI.
+ */
+interface ExportDataHandlerInterface
+{
+    /**
+     * Execute collecting new data for MBI.
+     *
+     * @return bool
+     */
+    public function prepareExportData();
+}