Merge branch 'MC-30188' into 2.3-develop-com-pr16

mykhailomatiola · mykhailomatiola · commit 271016881a80 · 2020-02-18T10:09:14.000+02:00
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/bundle_product_checkbox_options.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/bundle_product_checkbox_options.php
@@ -34,7 +34,7 @@
 $bundleProduct->setTypeId(Type::TYPE_BUNDLE)
     ->setAttributeSetId($bundleProduct->getDefaultAttributeSetId())
     ->setWebsiteIds([$baseWebsiteId])
-    ->setName('Bundle Product')
+    ->setName('Bundle Product Checkbox Options')
     ->setSku('bundle-product-checkbox-options')
     ->setVisibility(Visibility::VISIBILITY_BOTH)
     ->setStatus(Status::STATUS_ENABLED)
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/bundle_product_checkbox_required_option.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/bundle_product_checkbox_required_option.php
@@ -33,7 +33,7 @@
 $bundleProduct->setTypeId(Type::TYPE_BUNDLE)
     ->setAttributeSetId($bundleProduct->getDefaultAttributeSetId())
     ->setWebsiteIds([$baseWebsiteId])
-    ->setName('Bundle Product')
+    ->setName('Bundle Product Checkbox Required Option')
     ->setSku('bundle-product-checkbox-required-option')
     ->setVisibility(Visibility::VISIBILITY_BOTH)
     ->setStatus(Status::STATUS_ENABLED)
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/bundle_product_checkbox_required_options.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/bundle_product_checkbox_required_options.php
@@ -34,7 +34,7 @@
 $bundleProduct->setTypeId(Type::TYPE_BUNDLE)
     ->setAttributeSetId($product->getDefaultAttributeSetId())
     ->setWebsiteIds([$baseWebsiteId])
-    ->setName('Bundle Product')
+    ->setName('Bundle Product Checkbox Required Options')
     ->setSku('bundle-product-checkbox-required-options')
     ->setVisibility(Visibility::VISIBILITY_BOTH)
     ->setStatus(Status::STATUS_ENABLED)
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/bundle_product_dropdown_options.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/bundle_product_dropdown_options.php
@@ -34,7 +34,7 @@
 $bundleProduct->setTypeId(Type::TYPE_BUNDLE)
     ->setAttributeSetId($product->getDefaultAttributeSetId())
     ->setWebsiteIds([$baseWebsiteId])
-    ->setName('Bundle Product')
+    ->setName('Bundle Product Dropdown options')
     ->setSku('bundle-product-dropdown-options')
     ->setVisibility(Visibility::VISIBILITY_BOTH)
     ->setStatus(Status::STATUS_ENABLED)
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/bundle_product_dropdown_required_options.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/bundle_product_dropdown_required_options.php
@@ -34,7 +34,7 @@
 $bundleProduct->setTypeId(Type::TYPE_BUNDLE)
     ->setAttributeSetId($product->getDefaultAttributeSetId())
     ->setWebsiteIds([$baseWebsiteId])
-    ->setName('Bundle Product')
+    ->setName('Bundle Product Dropdown Required options')
     ->setSku('bundle-product-dropdown-required-options')
     ->setVisibility(Visibility::VISIBILITY_BOTH)
     ->setStatus(Status::STATUS_ENABLED)
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/bundle_product_multiselect_options.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/bundle_product_multiselect_options.php
@@ -34,7 +34,7 @@
 $bundleProduct->setTypeId(Type::TYPE_BUNDLE)
     ->setAttributeSetId($product->getDefaultAttributeSetId())
     ->setWebsiteIds([$baseWebsiteId])
-    ->setName('Bundle Product')
+    ->setName('Bundle Product Multiselect Options')
     ->setSku('bundle-product-multiselect-options')
     ->setVisibility(Visibility::VISIBILITY_BOTH)
     ->setStatus(Status::STATUS_ENABLED)
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/bundle_product_multiselect_required_option.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/bundle_product_multiselect_required_option.php
@@ -33,7 +33,7 @@
 $bundleProduct->setTypeId(Type::TYPE_BUNDLE)
     ->setAttributeSetId($product->getDefaultAttributeSetId())
     ->setWebsiteIds([$baseWebsiteId])
-    ->setName('Bundle Product')
+    ->setName('Bundle Product Multiselect Required Option')
     ->setSku('bundle-product-multiselect-required-option')
     ->setVisibility(Visibility::VISIBILITY_BOTH)
     ->setStatus(Status::STATUS_ENABLED)
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/bundle_product_multiselect_required_options.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/bundle_product_multiselect_required_options.php
@@ -34,7 +34,7 @@
 $bundleProduct->setTypeId(Type::TYPE_BUNDLE)
     ->setAttributeSetId($product->getDefaultAttributeSetId())
     ->setWebsiteIds([$baseWebsiteId])
-    ->setName('Bundle Product')
+    ->setName('Bundle Product Multiselect Required Options')
     ->setSku('bundle-product-multiselect-required-options')
     ->setVisibility(Visibility::VISIBILITY_BOTH)
     ->setStatus(Status::STATUS_ENABLED)
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/bundle_product_radio_options.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/bundle_product_radio_options.php
@@ -34,7 +34,7 @@
 $bundleProduct->setTypeId(Type::TYPE_BUNDLE)
     ->setAttributeSetId($product->getDefaultAttributeSetId())
     ->setWebsiteIds([$baseWebsiteId])
-    ->setName('Bundle Product')
+    ->setName('Bundle Product Radio Options')
     ->setSku('bundle-product-radio-options')
     ->setVisibility(Visibility::VISIBILITY_BOTH)
     ->setStatus(Status::STATUS_ENABLED)
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/bundle_product_radio_required_option.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/bundle_product_radio_required_option.php
@@ -33,7 +33,7 @@
 $bundleProduct->setTypeId(Type::TYPE_BUNDLE)
     ->setAttributeSetId($product->getDefaultAttributeSetId())
     ->setWebsiteIds([$baseWebsiteId])
-    ->setName('Bundle Product')
+    ->setName('Bundle Product Radio Required Option')
     ->setSku('bundle-product-radio-required-option')
     ->setVisibility(Visibility::VISIBILITY_BOTH)
     ->setStatus(Status::STATUS_ENABLED)
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/bundle_product_radio_required_options.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/bundle_product_radio_required_options.php
@@ -34,7 +34,7 @@
 $bundleProduct->setTypeId(Type::TYPE_BUNDLE)
     ->setAttributeSetId($product->getDefaultAttributeSetId())
     ->setWebsiteIds([$baseWebsiteId])
-    ->setName('Bundle Product')
+    ->setName('Bundle Product Radio Required Options')
     ->setSku('bundle-product-radio-required-options')
     ->setVisibility(Visibility::VISIBILITY_BOTH)
     ->setStatus(Status::STATUS_ENABLED)
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/dynamic_and_fixed_bundle_products_in_category.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/dynamic_and_fixed_bundle_products_in_category.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\CategoryLinkManagementInterface;
+use Magento\Catalog\Helper\DefaultCategory;
+
+require __DIR__ . '/product.php';
+require __DIR__ . '/bundle_product_dropdown_options.php';
+require __DIR__ . '/../../Catalog/_files/category.php';
+
+/** @var CategoryLinkManagementInterface $categoryLinkManagement */
+$categoryLinkManagement = $objectManager->create(CategoryLinkManagementInterface::class);
+/** @var DefaultCategory $categoryHelper */
+$categoryHelper = $objectManager->get(DefaultCategory::class);
+$categoryLinkManagement->assignProductToCategories('bundle-product', [2, $category->getId()]);
+$categoryLinkManagement->assignProductToCategories(
+    'bundle-product-dropdown-options',
+    [$categoryHelper->getId(), $category->getId()]
+);
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/dynamic_and_fixed_bundle_products_in_category_rollback.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/dynamic_and_fixed_bundle_products_in_category_rollback.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require __DIR__ . '/product_rollback.php';
+require __DIR__ . '/bundle_product_dropdown_options_rollback.php';
+require __DIR__ . '/../../Catalog/_files/category_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/AbstractFiltersTest.php b/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/AbstractFiltersTest.php
@@ -140,7 +140,7 @@ protected function getSearchFiltersAndAssert(
         $this->updateAttribute($attributeData);
         $this->updateProducts($products, $this->getAttributeCode());
         $this->clearInstanceAndReindexSearch();
-        $this->navigationBlock->getRequest()->setParams(['q' => 'Simple Product']);
+        $this->navigationBlock->getRequest()->setParams(['q' => $this->getSearchString()]);
         $this->navigationBlock->setLayout($this->layout);
         $filter = $this->getFilterByCode($this->navigationBlock->getFilters(), $this->getAttributeCode());
 
@@ -293,4 +293,14 @@ protected function createNavigationBlockInstance(): void
             $this->navigationBlock = $this->objectManager->create(CategoryNavigationBlock::class);
         }
     }
+
+    /**
+     * Returns search query for filters on search page.
+     *
+     * @return string
+     */
+    protected function getSearchString(): string
+    {
+        return 'Simple Product';
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/Bundle/MultiselectFilterTest.php b/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/Bundle/MultiselectFilterTest.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LayeredNavigation\Block\Navigation\Category\Bundle;
+
+use Magento\Catalog\Model\Layer\Resolver;
+use Magento\Framework\Module\Manager;
+use Magento\LayeredNavigation\Block\Navigation\AbstractFiltersTest;
+use Magento\Catalog\Model\Layer\Filter\AbstractFilter;
+
+/**
+ * Provides tests for custom multiselect filter in navigation block on category page with bundle products.
+ *
+ * @magentoAppArea frontend
+ * @magentoAppIsolation enabled
+ * @magentoDbIsolation disabled
+ */
+class MultiselectFilterTest extends AbstractFiltersTest
+{
+    /**
+     * @var Manager
+     */
+    private $moduleManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->moduleManager = $this->objectManager->get(Manager::class);
+        //This check is needed because LayeredNavigation independent of Magento_Bundle
+        if (!$this->moduleManager->isEnabled('Magento_Bundle')) {
+            $this->markTestSkipped('Magento_Bundle module disabled.');
+        }
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/multiselect_attribute.php
+     * @magentoDataFixture Magento/Bundle/_files/dynamic_and_fixed_bundle_products_in_category.php
+     * @dataProvider getFiltersWithCustomAttributeDataProvider
+     * @param array $products
+     * @param array $attributeData
+     * @param array $expectation
+     * @return void
+     */
+    public function testGetFiltersWithCustomAttribute(array $products, array $attributeData, array $expectation): void
+    {
+        $this->getCategoryFiltersAndAssert($products, $attributeData, $expectation, 'Category 1');
+    }
+
+    /**
+     * @return array
+     */
+    public function getFiltersWithCustomAttributeDataProvider(): array
+    {
+        return [
+            'not_used_in_navigation' => [
+                'products_data' => [],
+                'attribute_data' => ['is_filterable' => 0],
+                'expectation' => [],
+            ],
+            'used_in_navigation_with_results' => [
+                'products_data' => [
+                    'bundle-product' => 'Option 1',
+                    'bundle-product-dropdown-options' => 'Option 2',
+                ],
+                'attribute_data' => ['is_filterable' => AbstractFilter::ATTRIBUTE_OPTIONS_ONLY_WITH_RESULTS],
+                'expectation' => [
+                    ['label' => 'Option 1', 'count' => 1],
+                    ['label' => 'Option 2', 'count' => 1],
+                ],
+            ],
+            'used_in_navigation_without_results' => [
+                'products_data' => [
+                    'bundle-product' => 'Option 1',
+                    'bundle-product-dropdown-options' => 'Option 2',
+                ],
+                'attribute_data' => ['is_filterable' => 2],
+                'expectation' => [
+                    ['label' => 'Option 1', 'count' => 1],
+                    ['label' => 'Option 2', 'count' => 1],
+                    ['label' => 'Option 3', 'count' => 0],
+                    ['label' => 'Option 4 "!@#$%^&*', 'count' => 0],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getLayerType(): string
+    {
+        return Resolver::CATALOG_LAYER_CATEGORY;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getAttributeCode(): string
+    {
+        return 'multiselect_attribute';
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/Bundle/PriceFilterTest.php b/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/Bundle/PriceFilterTest.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LayeredNavigation\Block\Navigation\Category\Bundle;
+
+use Magento\Catalog\Model\Layer\Resolver;
+use Magento\Framework\Module\Manager;
+use Magento\LayeredNavigation\Block\Navigation\AbstractFiltersTest;
+use Magento\Catalog\Model\Layer\Filter\AbstractFilter;
+use Magento\Catalog\Model\Layer\Filter\Item;
+
+/**
+ * Provides price filter tests for bundle products in navigation block on category page.
+ *
+ * @magentoAppArea frontend
+ * @magentoAppIsolation enabled
+ * @magentoDbIsolation disabled
+ */
+class PriceFilterTest extends AbstractFiltersTest
+{
+    /**
+     * @var Manager
+     */
+    private $moduleManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->moduleManager = $this->objectManager->get(Manager::class);
+        //This check is needed because LayeredNavigation independent of Magento_Bundle
+        if (!$this->moduleManager->isEnabled('Magento_Bundle')) {
+            $this->markTestSkipped('Magento_Bundle module disabled.');
+        }
+    }
+
+    /**
+     * @magentoDataFixture Magento/Bundle/_files/dynamic_and_fixed_bundle_products_in_category.php
+     * @magentoConfigFixture current_store catalog/layered_navigation/price_range_calculation manual
+     * @magentoConfigFixture current_store catalog/layered_navigation/price_range_step 10
+     * @return void
+     */
+    public function testGetFilters(): void
+    {
+        $this->getCategoryFiltersAndAssert(
+            ['bundle-product' => 20.00],
+            ['is_filterable' => '1'],
+            [
+                ['label' => '$10.00 - $19.99', 'value' => '10-20', 'count' => 1],
+                ['label' => '$20.00 and above', 'value' => '20-', 'count' => 1],
+            ],
+            'Category 1'
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getLayerType(): string
+    {
+        return Resolver::CATALOG_LAYER_CATEGORY;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getAttributeCode(): string
+    {
+        return 'price';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function prepareFilterItems(AbstractFilter $filter): array
+    {
+        $items = [];
+        /** @var Item $item */
+        foreach ($filter->getItems() as $item) {
+            $item = [
+                'label' =>  strip_tags(__($item->getData('label'))->render()),
+                'value' => $item->getData('value'),
+                'count' => $item->getData('count'),
+            ];
+            $items[] = $item;
+        }
+
+        return $items;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/Bundle/SelectFilterTest.php b/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/Bundle/SelectFilterTest.php
diff --git a/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Search/Bundle/PriceFilterTest.php b/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Search/Bundle/PriceFilterTest.php
