Merge remote-tracking branch 'origin/MC-41576' into 2.4-develop-pr58

Author: Serhii Balko

app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php

@@ -34,8 +34,8 @@ public function execute()
                 /** @var $export \Magento\ImportExport\Model\Export */
                 $export = $this->_objectManager->create(\Magento\ImportExport\Model\Export::class);
                 $export->setData($data);
-                $attrFilterBlock->prepareCollection(
-                    $export->filterAttributeCollection($export->getEntityAttributeCollection())
+                $export->filterAttributeCollection(
+                    $attrFilterBlock->prepareCollection($export->getEntityAttributeCollection())
                 );
                 return $resultLayout;
             } catch (\Exception $e) {

dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/ExportTest.php

@@ -5,10 +5,13 @@
  */
 namespace Magento\ImportExport\Controller\Adminhtml;
 
+use Magento\TestFramework\Helper\Xpath;
+use Magento\TestFramework\TestCase\AbstractBackendController;
+
 /**
  * @magentoAppArea adminhtml
  */
-class ExportTest extends \Magento\TestFramework\TestCase\AbstractBackendController
+class ExportTest extends AbstractBackendController
 {
     /**
      * Set value of $_SERVER['HTTP_X_REQUESTED_WITH'] parameter here
@@ -18,20 +21,8 @@ class ExportTest extends \Magento\TestFramework\TestCase\AbstractBackendControll
     protected $_httpXRequestedWith;
 
     /**
-     * Get possible entity types
-     *
-     * @return array
+     * @inheritdoc
      */
-    public function getEntityTypesDataProvider()
-    {
-        return [
-            'products' => ['$entityType' => 'catalog_product'],
-            'customers' => ['$entityType' => 'customer'],
-            // customer entities
-            'customers_customer_entities' => ['$entityType' => 'customer', '$customerEntityType' => 'customer']
-        ];
-    }
-
     protected function setUp(): void
     {
         parent::setUp();
@@ -41,6 +32,9 @@ protected function setUp(): void
         }
     }
 
+    /**
+     * @inheritdoc
+     */
     protected function tearDown(): void
     {
         if ($this->_httpXRequestedWith !== null) {
@@ -56,10 +50,14 @@ protected function tearDown(): void
      * @dataProvider getEntityTypesDataProvider
      *
      * @param string $entityType
-     * @param string $customerEntityType
+     * @param string|null $customerEntityType
+     * @param array $expectedAttributes
      */
-    public function testGetFilterAction($entityType, $customerEntityType = null)
-    {
+    public function testGetFilterAction(
+        string $entityType,
+        string $customerEntityType = null,
+        array $expectedAttributes = []
+    ) {
         $this->getRequest()->setParam('isAjax', true);
 
         // Provide X_REQUESTED_WITH header in response to mark next action as ajax
@@ -72,7 +70,35 @@ public function testGetFilterAction($entityType, $customerEntityType = null)
         }
         $this->dispatch($url);
 
-        $this->assertStringContainsString('<div id="export_filter_grid"', $this->getResponse()->getBody());
+        $body = $this->getResponse()->getBody();
+        $this->assertStringContainsString('<div id="export_filter_grid"', $body);
+        foreach ($expectedAttributes as $attribute) {
+            $this->assertStringContainsString("name=\"export_filter[{$attribute}]\"", $body);
+        }
+    }
+
+    /**
+     * Get possible entity types
+     *
+     * @return array
+     */
+    public function getEntityTypesDataProvider()
+    {
+        return [
+            'products' => [
+                'entityType' => 'catalog_product',
+                'customerEntityType' => null,
+                'expectedAttributes' => ['category_ids']
+            ],
+            'customers' => [
+                'entityType' => 'customer'
+            ],
+            // customer entities
+            'customers_customer_entities' => [
+                'entityType' => 'customer',
+                'customerEntityType' => 'customer'
+            ]
+        ];
     }
 
     /**
@@ -86,14 +112,14 @@ public function testIndexAction()
 
         $this->assertEquals(
             1,
-            \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath(
+            Xpath::getElementsCountForXpath(
                 '//fieldset[@id="base_fieldset"]',
                 $body
             )
         );
         $this->assertEquals(
             3,
-            \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath(
+            Xpath::getElementsCountForXpath(
                 '//fieldset[@id="base_fieldset"]/div[contains(@class,"field")]',
                 $body
             )