MTA-1602: Sync qmt repository with mainline - Sprint 6

Author: Dmytro Aponasenko

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Category/ProductPagination.php

@@ -7,26 +7,24 @@
 namespace Magento\Catalog\Test\Block\Category;
 
 use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\ElementInterface;
 
 /**
- * Class ProductPagination
- * Pagination page product list
- *
- * @package Magento\Catalog\Test\Block\Category
+ * Pagination page product list.
  */
 class ProductPagination extends Block
 {
     /**
-     * Selector next active element
+     * Selector next active element.
      *
      * @var string
      */
     protected $nextPageSelector = '.item.current + .item a';
 
     /**
-     * Getting the active element to go to the next page
+     * Getting the active element to go to the next page.
      *
-     * @return \Magento\Mtf\Client\ElementInterface|null
+     * @return ElementInterface|null
      */
     public function getNextPage()
     {

dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Items.php

@@ -78,15 +78,15 @@ public function getPrice(InjectableFixture $product)
                 $valueKey = $checkoutOption['value'];
                 $attributeName = $attributesData[$titleKey]['frontend_label'];
                 $optionLabel = $attributesData[$titleKey]['options'][$valueKey]['label'];
-                $optionsDetails[] = "{$attributeName} {$optionLabel}";
+                $optionsDetails[] = "{$attributeName}{$optionLabel}";
                 $matrixKey[] = "{$titleKey}:{$valueKey}";
 
                 $optionsPrice += $attributesData[$titleKey]['options'][$valueKey]['pricing_value'];
             }
             $optionsDetails = implode(' ', $optionsDetails);
             $matrixKey = implode(' ', $matrixKey);
 
-            $productDisplay = $productName . ' SKU: ' . $matrix[$matrixKey]['sku'] . ' ' . $optionsDetails;
+            $productDisplay = $productName . 'SKU: ' . $matrix[$matrixKey]['sku'] . $optionsDetails;
         } else {
             $productDisplay = $productName . 'SKU: ' . $product->getSku();
         }