MTA-1413: Sync qmt repository with mainline - Sprint 4

Author: Dmytro Aponasenko

dev/tests/functional/bootstrap.php

@@ -6,6 +6,7 @@
 
 session_start();
 defined('MTF_BOOT_FILE') || define('MTF_BOOT_FILE', __FILE__);
+defined('MTF_BP') || define('MTF_BP', str_replace('\\', '/', (__DIR__)));
 require_once __DIR__ . '/../../../app/bootstrap.php';
 restore_error_handler();
 require_once __DIR__ . '/vendor/autoload.php';

dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/SuggestElement.php

@@ -59,7 +59,7 @@ public function setValue($value)
         $this->_eventManager->dispatchEvent(['set_value'], [__METHOD__, $this->getAbsoluteSelector()]);
 
         $this->clear();
-        foreach(str_split($value) as $symbol) {
+        foreach (str_split($value) as $symbol) {
             $this->find($this->suggest)->click();
             $this->_driver->keys($symbol);
             $this->waitResult();

dev/tests/functional/lib/Mtf/ObjectManagerFactory.php

@@ -42,10 +42,6 @@ class ObjectManagerFactory
      */
     public function create(array $sharedInstances = [])
     {
-        if (!defined('MTF_BP')) {
-            $basePath = str_replace('\\', '/', dirname(dirname(__DIR__)));
-            define('MTF_BP', $basePath);
-        }
         if (!defined('MTF_TESTS_PATH')) {
             define('MTF_TESTS_PATH', MTF_BP . '/tests/app/');
         }

dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryPage.php

@@ -22,11 +22,30 @@ class AssertCategoryPage extends AbstractConstraint
     const SEVERITY = 'low';
     /* end tags */
 
+    /**
+     * CMS Block display mode
+     *
+     * @var array
+     */
     protected $visibleCmsBlockMode = [
         'Static block only',
         'Static block and products'
     ];
 
+    /**
+     * Category view page
+     *
+     * @var CatalogCategoryView
+     */
+    protected $categoryViewPage;
+
+    /**
+     * Browser instance
+     *
+     * @var Browser
+     */
+    protected $browser;
+
     /**
      * Assert that displayed category data on category page equals to passed from fixture.
      *
@@ -44,6 +63,22 @@ public function processAssert(
         CatalogCategoryView $categoryView,
         Browser $browser
     ) {
+        $this->browser = $browser;
+        $this->categoryViewPage = $categoryView;
+        $categoryData = $this->prepareData($fixtureFactory, $category, $initialCategory);
+        $this->browser->open($this->getCategoryUrl($category));
+        $this->assertGeneralInformation($category, $categoryData);
+        $this->assertDisplaySetting($category, $categoryData);
+    }
+
+    /**
+     * @param FixtureFactory $fixtureFactory
+     * @param Category $category
+     * @param Category $initialCategory
+     * @return array
+     */
+    protected function prepareData(FixtureFactory $fixtureFactory, Category $category, Category $initialCategory)
+    {
         $product = $fixtureFactory->createByCode(
             'catalogProductSimple',
             [
@@ -55,25 +90,45 @@ public function processAssert(
                 ]
             ]
         );
-        $categoryData = array_merge($initialCategory->getData(), $category->getData());
+        $product->persist();
+
+        return array_merge($initialCategory->getData(), $category->getData());
+    }
+
+    /**
+     * Get category url to open
+     *
+     * @param Category $category
+     * @return string
+     */
+    protected function getCategoryUrl(Category $category)
+    {
         $categoryUrlKey = $category->hasData('url_key')
             ? strtolower($category->getUrlKey())
             : trim(strtolower(preg_replace('#[^0-9a-z%]+#i', '-', $category->getName())), '-');
-        $categoryUrl = $_ENV['app_frontend_url'] . $categoryUrlKey . '.html';
-
-        $product->persist();
-        $browser->open($categoryUrl);
+        return $_ENV['app_frontend_url'] . $categoryUrlKey . '.html';
+    }
 
+    /**
+     * Assert category general information
+     *
+     * @param Category $category
+     * @param array $categoryData
+     * @return void
+     */
+    protected function assertGeneralInformation(Category $category, array $categoryData)
+    {
+        $categoryUrl = $this->getCategoryUrl($category);
         \PHPUnit_Framework_Assert::assertEquals(
             $categoryUrl,
-            $browser->getUrl(),
+            $this->browser->getUrl(),
             'Wrong page URL.'
             . "\nExpected: " . $categoryUrl
-            . "\nActual: " . $browser->getUrl()
+            . "\nActual: " . $this->browser->getUrl()
         );
 
         if (isset($categoryData['name'])) {
-            $title = $categoryView->getTitleBlock()->getTitle();
+            $title = $this->categoryViewPage->getTitleBlock()->getTitle();
             \PHPUnit_Framework_Assert::assertEquals(
                 $categoryData['name'],
                 $title,
@@ -84,7 +139,7 @@ public function processAssert(
         }
 
         if (isset($categoryData['description'])) {
-            $description = $categoryView->getViewBlock()->getDescription();
+            $description = $this->categoryViewPage->getViewBlock()->getDescription();
             \PHPUnit_Framework_Assert::assertEquals(
                 $categoryData['description'],
                 $description,
@@ -93,7 +148,17 @@ public function processAssert(
                 . "\nActual: " . $description
             );
         }
+    }
 
+    /**
+     * Assert category display settings
+     *
+     * @param Category $category
+     * @param array $categoryData
+     * @return void
+     */
+    protected function assertDisplaySetting(Category $category, array $categoryData)
+    {
         if (
             isset($categoryData['landing_page'])
             && isset($categoryData['display_mode'])
@@ -102,7 +167,7 @@ public function processAssert(
             /** @var LandingPage $sourceLandingPage */
             $sourceLandingPage = $category->getDataFieldConfig('landing_page')['source'];
             $fixtureContent = $sourceLandingPage->getCmsBlock()->getContent();
-            $pageContent = $categoryView->getViewBlock()->getContent();
+            $pageContent = $this->categoryViewPage->getViewBlock()->getContent();
 
             \PHPUnit_Framework_Assert::assertEquals(
                 $fixtureContent,
@@ -112,10 +177,9 @@ public function processAssert(
                 . "\nActual: " . $pageContent
             );
         }
-
         if (isset($categoryData['default_sort_by'])) {
             $sortBy = strtolower($categoryData['default_sort_by']);
-            $sortType = $categoryView->getTopToolbar()->getSelectSortType();
+            $sortType = $this->categoryViewPage->getTopToolbar()->getSelectSortType();
             \PHPUnit_Framework_Assert::assertEquals(
                 $sortBy,
                 $sortType,
@@ -134,7 +198,7 @@ function (&$value) {
             );
             if ($availableSortType) {
                 $availableSortType = array_values($availableSortType);
-                $availableSortTypeOnPage = $categoryView->getTopToolbar()->getSortType();
+                $availableSortTypeOnPage = $this->categoryViewPage->getTopToolbar()->getSortType();
                 \PHPUnit_Framework_Assert::assertEquals(
                     $availableSortType,
                     $availableSortTypeOnPage,

dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests.php

@@ -97,7 +97,7 @@ private function initObjectManager()
                 ? $_ENV['testsuite_rule']
                 : 'basic';
             $confFilePath = realpath(
-                __DIR__ . '/../../../testsuites/' . $_ENV['testsuite_rule_path'] . '/' . $configurationFileName . '.xml'
+                MTF_BP . '/testsuites/' . $_ENV['testsuite_rule_path']  . '/' . $configurationFileName . '.xml'
             );
             /** @var \Mtf\TestRunner\Configuration $testRunnerConfiguration */
             $testRunnerConfiguration = $objectManagerFactory->getObjectManager()->get('\Mtf\TestRunner\Configuration');