MQE-1112: Bump MFTF version in Magento

Author: okolesnyk

dev/tests/functional/.gitignore

@@ -6,3 +6,4 @@
 /vendor
 phpunit.xml
 credentials.xml
+.htaccess

dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertHttpUsedOnFrontend.php

@@ -22,7 +22,7 @@ class AssertHttpUsedOnFrontend extends AbstractConstraint
      *
      * @var string
      */
-    private $unsecuredProtocol = \Magento\Framework\HTTP\PhpEnvironment\Request::SCHEME_HTTP;
+    const SCHEME_HTTP  = 'http';
 
     /**
      * Browser interface.
@@ -53,11 +53,11 @@ public function processAssert(BrowserInterface $browser, Customer $customer)
 
         // Log in to Customer Account on Storefront to assert that http is used indeed.
         $this->objectManager->create(LogInCustomerOnStorefront::class, ['customer' => $this->customer])->run();
-        $this->assertUsedProtocol($this->unsecuredProtocol);
+        $this->assertUsedProtocol(self::SCHEME_HTTP);
 
         // Log out from Customer Account on Storefront to assert that JS is deployed validly as a part of statics.
         $this->objectManager->create(LogOutCustomerOnStorefront::class)->run();
-        $this->assertUsedProtocol($this->unsecuredProtocol);
+        $this->assertUsedProtocol(self::SCHEME_HTTP);
     }
 
     /**

dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertHttpsUsedOnBackend.php

@@ -16,18 +16,10 @@
 class AssertHttpsUsedOnBackend extends AbstractConstraint
 {
     /**
-     * Secured protocol format.
-     *
-     * @var string
-     */
-    private $securedProtocol = \Magento\Framework\HTTP\PhpEnvironment\Request::SCHEME_HTTPS;
-
-    /**
-     * Unsecured protocol format.
-     *
-     * @var string
+     * Protocols
      */
-    private $unsecuredProtocol = \Magento\Framework\HTTP\PhpEnvironment\Request::SCHEME_HTTP;
+    const SCHEME_HTTP  = 'http';
+    const SCHEME_HTTPS = 'https';
 
     /**
      * Browser interface.
@@ -50,7 +42,7 @@ public function processAssert(BrowserInterface $browser, Dashboard $adminDashboa
 
         // Open specified Admin page using Navigation Menu to assert that JS is deployed validly as a part of statics.
         $adminDashboardPage->open()->getMenuBlock()->navigate($navMenuPath);
-        $this->assertUsedProtocol($this->securedProtocol);
+        $this->assertUsedProtocol(self::SCHEME_HTTPS);
         $this->assertDirectHttpUnavailable();
     }
 
@@ -80,10 +72,10 @@ protected function assertUsedProtocol($expectedProtocol)
      */
     protected function assertDirectHttpUnavailable()
     {
-        $fakeUrl = str_replace($this->securedProtocol, $this->unsecuredProtocol, $this->browser->getUrl());
+        $fakeUrl = str_replace(self::SCHEME_HTTPS, self::SCHEME_HTTP, $this->browser->getUrl());
         $this->browser->open($fakeUrl);
         \PHPUnit\Framework\Assert::assertStringStartsWith(
-            $this->securedProtocol,
+            self::SCHEME_HTTPS,
             $this->browser->getUrl(),
             'Merchant is not redirected to https if tries to access the Admin panel page directly via http.'
         );

dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.php

@@ -6,9 +6,6 @@
 
 namespace Magento\Customer\Test\TestCase;
 
-use Magento\Config\Test\Fixture\ConfigData;
-use Magento\Customer\Test\Constraint\AssertChangingWebsiteChangeCountries;
-use Magento\Framework\App\ObjectManager;
 use Magento\Mtf\Fixture\FixtureFactory;
 use Magento\Mtf\Fixture\FixtureInterface;
 use Magento\Mtf\TestCase\Injectable;

dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/FormSections.php

@@ -6,7 +6,6 @@
 
 namespace Magento\Ui\Test\Block\Adminhtml;
 
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
@@ -53,13 +52,13 @@ protected function openContainer($sectionName)
      *
      * @param string $sectionName
      * @return $this
-     * @throws LocalizedException if section is not visible
+     * @throws \Exception if section is not visible
      */
     public function openSection($sectionName)
     {
         $container = $this->getContainerElement($sectionName);
         if (!$container->isVisible()) {
-            throw new LocalizedException(__('Container is not found "' . $sectionName . '""'));
+            throw new \Exception('Container is not found "' . $sectionName . '""');
         }
         $section = $container->find($this->collapsedSection);
         if ($section->isVisible()) {

dev/tests/functional/utils/generate/repository.php

@@ -5,5 +5,4 @@
  */
 require_once dirname(__DIR__) . '/' . 'bootstrap.php';
 
-$magentoObjectManager->get(\Magento\Framework\App\State::class)->setAreaCode('frontend');
 $objectManager->create(\Magento\Mtf\Util\Generate\Repository::class)->launch();