MAGETWO-61962: Pagination broken in the storefront category page when Flat Category is enabled

Author: slamking

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

@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Test\Constraint;
+
+use Magento\Mtf\Client\BrowserInterface;
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Catalog\Test\Fixture\Category;
+
+class AssertPaginationCorrectOnStoreFront extends AbstractConstraint
+{
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    /**
+     * @param BrowserInterface $browser
+     * @param Category $category
+     */
+    public function processAssert(BrowserInterface $browser, Category $category)
+    {
+        $browser->open($_ENV['app_frontend_url'] . $category->getUrlKey() . '.html');
+    }
+
+    /**
+     * Return string representation of object.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Attribute is visible with HTML tags on frontend.';
+    }
+}

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateFlatCatalogProduct.php

@@ -0,0 +1,119 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Test\TestCase\Product;
+
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestCase\Injectable;
+use Magento\Catalog\Test\Fixture\Category;
+
+class CreateFlatCatalogProduct extends Injectable
+{
+    /* tags */
+    const MVP = 'yes';
+    /* end tags */
+
+    /**
+     * Configuration data.
+     *
+     * @var string
+     */
+    protected $configData;
+
+    /**
+     * Factory for Fixtures.
+     *
+     * @var FixtureFactory
+     */
+    private $fixtureFactory;
+
+    /**
+     * Category fixture
+     *
+     * @var Category
+     */
+    protected $category;
+
+    /**
+     * Prepare data
+     *
+     * @param Category $category
+     * @return array
+     */
+    public function __prepare(Category $category)
+    {
+        $category->persist();
+        return [
+            'category' => $category
+        ];
+    }
+
+    /**
+     * Injection data
+     *
+     * @param Category $category
+     * @param FixtureFactory $fixtureFactory
+     * @return void
+     */
+    public function __inject(
+        Category $category,
+        FixtureFactory $fixtureFactory
+    ) {
+        $this->category = $category;
+        $this->fixtureFactory = $fixtureFactory;
+    }
+
+    /**
+     * Run mass update product simple entity test.
+     *
+     * @param string $configData
+     * @param string $productsCount
+     * @return array
+     */
+    public function test($configData, $productsCount)
+    {
+        $this->createBulkOfProducts($productsCount);
+        $this->configData = $configData;
+        return ['category' => $this->category];
+    }
+
+    /**
+     * Clear data after test.
+     *
+     * @return void
+     */
+    public function tearDown()
+    {
+        $this->objectManager->create(
+            \Magento\Config\Test\TestStep\SetupConfigurationStep::class,
+            ['configData' => $this->configData, 'rollback' => true]
+        )->run();
+    }
+
+    /**
+     * @param $productsCount
+     */
+    private function createBulkOfProducts($productsCount)
+    {
+        foreach (range(1, $productsCount) as $element) {
+            /**
+             * @product FixtureInterface
+             */
+            $product = $this->fixtureFactory->createByCode(
+                'catalogProductSimple',
+                [
+                    'dataset' => 'default',
+                    'data' => [
+                        'category_ids' => [
+                            'category' => $this->category
+                        ]
+                    ]
+                ]
+            );
+            $product->persist();
+        }
+    }
+}

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateFlatCatalogProduct.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
+    <testCase name="Magento\Catalog\Test\TestCase\Product\CreateFlatCatalogProduct" summary="Create flat catalog Product" ticketId="MAGETWO-67570">
+        <variation name="CheckPaginationInStorefront">
+            <data name="configData" xsi:type="string">category_flat,product_flat</data>
+            <data name="productsCount" xsi:type="number">2</data>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertPaginationCorrectOnStoreFront" />
+        </variation>
+    </testCase>
+</config>