Merge pull request #5488 from magento-trigger/elastic_spike

[trigger] MC-23540: Elasticsearch 7.x.x Upgrade
magento · Mar 25, 2020 · f3df323 · f3df323
2 parents 8a16cba + 547c179
commit f3df323
Show file tree

Hide file tree

Showing 112 changed files with 2,347 additions and 3,323 deletions.
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeOptionData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeOptionData.xml
@@ -101,4 +101,28 @@
     <entity name="ProductAttributeOptionTwoForExportImport" extends="productAttributeOption2" type="ProductAttributeOption">
         <data key="label">option2</data>
     </entity>
+    <entity name="ProductAttributeOption10" type="ProductAttributeOption">
+        <var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
+        <data key="label" unique="suffix">3.5</data>
+        <data key="value" unique="suffix">3.5</data>
+        <data key="is_default">false</data>
+        <data key="sort_order">1</data>
+        <requiredEntity type="StoreLabel">Option12Store1</requiredEntity>
+    </entity>
+    <entity name="ProductAttributeOption11" type="ProductAttributeOption">
+        <var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
+        <data key="label" unique="suffix">10.12</data>
+        <data key="value" unique="suffix">10.12</data>
+        <data key="is_default">false</data>
+        <data key="sort_order">2</data>
+        <requiredEntity type="StoreLabel">Option13Store1</requiredEntity>
+    </entity>
+    <entity name="ProductAttributeOption12" type="ProductAttributeOption">
+        <var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
+        <data key="label" unique="suffix">36</data>
+        <data key="value" unique="suffix">36</data>
+        <data key="is_default">false</data>
+        <data key="sort_order">3</data>
+        <requiredEntity type="StoreLabel">Option14Store1</requiredEntity>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/StoreLabelData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/StoreLabelData.xml
@@ -80,4 +80,16 @@
         <data key="store_id">1</data>
         <data key="label">Blue</data>
     </entity>
+    <entity name="Option12Store1" type="StoreLabel">
+        <data key="store_id">1</data>
+        <data key="label">3.5</data>
+    </entity>
+    <entity name="Option13Store1" type="StoreLabel">
+        <data key="store_id">1</data>
+        <data key="label">10.12</data>
+    </entity>
+    <entity name="Option14Store1" type="StoreLabel">
+        <data key="store_id">1</data>
+        <data key="label">36</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductMultiselectAttributeSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductMultiselectAttributeSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminProductMultiselectAttributeSection">
+        <element name="option" type="text" selector="//option[contains(@data-title,'{{value}}')]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontProductsDisplayUsingElasticSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontProductsDisplayUsingElasticSearchTest.xml
@@ -127,7 +127,7 @@
             </createData>
 
             <!--Enable ElasticSearch as search engine.-->
-           <magentoCLI command="config:set catalog/search/engine elasticsearch6" stepKey="enableElasticSearchAsSearchEngine"/>
+           <magentoCLI command="config:set {{SearchEngineElasticsearchConfigData.path}} {{SearchEngineElasticsearchConfigData.value}}" stepKey="enableElasticSearchAsSearchEngine"/>
             <magentoCLI command="indexer:reindex" stepKey="performReindexAfterElasticSearchEnable"/>
             <magentoCLI command="cache:flush" stepKey="cleanCacheAfterElasticSearchEnable"/>
 

diff --git a/...ode/Magento/Elasticsearch/Block/Adminhtml/System/Config/Elasticsearch5/TestConnection.php b/...ode/Magento/Elasticsearch/Block/Adminhtml/System/Config/Elasticsearch5/TestConnection.php
@@ -8,11 +8,12 @@
 /**
  * Elasticsearch 5x test connection block
  * @codeCoverageIgnore
+ * @deprecated because of EOL for Elasticsearch5
  */
 class TestConnection extends \Magento\AdvancedSearch\Block\Adminhtml\System\Config\TestConnection
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function _getFieldMapping()
     {

diff --git a/app/code/Magento/Elasticsearch/Block/Adminhtml/System/Config/TestConnection.php b/app/code/Magento/Elasticsearch/Block/Adminhtml/System/Config/TestConnection.php