Skip to content

Commit 6f6c628

Browse files
ENGCOM-6364: [FIXES] #25674: Elasticsearch version selections in admin are overly … #25838
2 parents da5a069 + 366ada1 commit 6f6c628

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

app/code/Magento/Elasticsearch/Test/Mftf/Test/ProductQuickSearchUsingElasticSearchTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<test name="ProductQuickSearchUsingElasticSearchTest">
1212
<annotations>
1313
<features value="Search"/>
14-
<stories value="Quick Search of products on Storefront when ES 5.0+ is enabled"/>
14+
<stories value="Quick Search of products on Storefront when ES 5.x is enabled"/>
1515
<title value="Product quick search doesn't throw exception after ES is chosen as search engine"/>
1616
<description value="Verify no elastic search exception is thrown when searching for product before catalogsearch reindexing"/>
1717
<severity value="CRITICAL"/>
@@ -36,7 +36,7 @@
3636
</after>
3737

3838
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
39-
<comment userInput="Change Catalog search engine option to Elastic Search 5.0+" stepKey="chooseElasticSearch5"/>
39+
<comment userInput="Change Catalog search engine option to Elastic Search 5.x" stepKey="chooseElasticSearch5"/>
4040
<actionGroup ref="ChooseElasticSearchAsSearchEngine" stepKey="chooseES5"/>
4141
<actionGroup ref="ClearPageCacheActionGroup" stepKey="clearing"/>
4242
<actionGroup ref="updateIndexerBySchedule" stepKey="updateAnIndexerBySchedule">
@@ -57,4 +57,4 @@
5757
<comment userInput="End of searching products" stepKey="endOfSearchingProducts"/>
5858
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin2"/>
5959
</test>
60-
</tests>
60+
</tests>

app/code/Magento/Elasticsearch/etc/adminhtml/system.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<comment><![CDATA[<a href="https://docs.magento.com/m2/ce/user_guide/catalog/search-elasticsearch.html">Learn more</a> about valid syntax.]]></comment>
7272
<backend_model>Magento\Elasticsearch\Model\Config\Backend\MinimumShouldMatch</backend_model>
7373
</field>
74-
<!-- Elasticsearch 5.0+ -->
74+
<!-- Elasticsearch 5.x -->
7575
<field id="elasticsearch5_server_hostname" translate="label" type="text" sortOrder="61" showInDefault="1" showInWebsite="0" showInStore="0">
7676
<label>Elasticsearch Server Hostname</label>
7777
<depends>

app/code/Magento/Elasticsearch/etc/di.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@
169169
<arguments>
170170
<argument name="engines" xsi:type="array">
171171
<item name="elasticsearch" xsi:type="string">Elasticsearch</item>
172-
<item name="elasticsearch5" xsi:type="string">Elasticsearch 5.0+</item>
172+
<item name="elasticsearch5" xsi:type="string">Elasticsearch 5.x</item>
173173
</argument>
174174
</arguments>
175175
</type>

app/code/Magento/Elasticsearch6/Test/Mftf/Data/ConfigData.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<entity name="SearchEngineElasticsearchConfigData">
1111
<data key="path">catalog/search/engine</data>
1212
<data key="scope_id">1</data>
13-
<data key="label">Elasticsearch 6.0+</data>
13+
<data key="label">Elasticsearch 6.x</data>
1414
<data key="value">elasticsearch6</data>
1515
</entity>
1616
</entities>

app/code/Magento/Elasticsearch6/etc/adminhtml/system.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<system>
1111
<section id="catalog">
1212
<group id="search">
13-
<!-- Elasticsearch 6.0+ -->
13+
<!-- Elasticsearch 6.x -->
1414
<field id="elasticsearch6_server_hostname" translate="label" type="text" sortOrder="71"
1515
showInDefault="1" showInWebsite="0" showInStore="0">
1616
<label>Elasticsearch Server Hostname</label>

app/code/Magento/Elasticsearch6/etc/di.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<type name="Magento\Search\Model\Adminhtml\System\Config\Source\Engine">
1818
<arguments>
1919
<argument name="engines" xsi:type="array">
20-
<item name="elasticsearch6" xsi:type="string">Elasticsearch 6.0+</item>
20+
<item name="elasticsearch6" xsi:type="string">Elasticsearch 6.x</item>
2121
</argument>
2222
</arguments>
2323
</type>

0 commit comments

Comments
 (0)