Merge remote-tracking branch 'origin/MAGETWO-61962' into NORD-PR-INTERNAL

Author: RuslanKostiv1

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ProductList/BottomToolbar.php

@@ -23,18 +23,11 @@ class BottomToolbar extends Block
     private $nextPageSelector = '.item.current + .item a';
 
     /**
-     * Selector previous element
+     * Selector first element
      *
      * @var string
      */
-    private $previousPageSelector = '.item.pages-item-previous';
-
-    /**
-     * Selector limiter block
-     *
-     * @var string
-     */
-    private $optionBlockSelector = '.control';
+    private $firstPageSelector = '.item>.page';
 
     /**
      * Selector option element
@@ -59,15 +52,15 @@ public function nextPage()
     }
 
     /**
-     * Go to the previous page
+     * Go to the first page
      *
      * @return bool
      */
-    public function previousPage()
+    public function firstPage()
     {
-        $previousPageItem = $this->_rootElement->find($this->previousPageSelector);
-        if ($previousPageItem->isVisible()) {
-            $previousPageItem->click();
+        $firstPageItem = $this->_rootElement->find($this->firstPageSelector);
+        if ($firstPageItem->isVisible()) {
+            $firstPageItem->click();
             return true;
         }
         return false;

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

@@ -12,7 +12,7 @@
 use Magento\Catalog\Test\Fixture\Category;
 
 /**
- * Checks pagination of storefront for correct pagination and list of products
+ * Checks correct pagination for list of products on storefront.
  */
 class AssertPaginationCorrectOnStoreFront extends AbstractConstraint
 {
@@ -56,7 +56,7 @@ public function processAssert(
             $catalogCategoryView->getListProductBlock()->getProductsCount(),
             'Count of products on 2 page does not equivalent with declared in pagination (default value)'
         );
-        $catalogCategoryView->getBottomToolbar()->previousPage();
+        $catalogCategoryView->getBottomToolbar()->firstPage();
         $catalogCategoryView->getBottomToolbar()->setLimiterValueByIndex(1);
         \PHPUnit_Framework_Assert::assertEquals(
             $catalogCategoryView->getBottomToolbar()->getLimitedValueByIndex(1),