Skip to content

Commit 9d3ed22

Browse files
committed
MAGETWO-72863: Attribute values on store view level not searchable - for 2.3
1 parent c9dd335 commit 9d3ed22

File tree

3 files changed

+5
-14
lines changed

3 files changed

+5
-14
lines changed

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/VerifyTinyMCEActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
1010
<actionGroup name="VerifyTinyMCEActionGroup">
11-
<waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE" />
11+
<waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE" time="30" />
1212
<seeElement selector="{{TinyMCESection.TinyMCE4}}" stepKey="seeTinyMCE4" />
1313
<seeElement selector="{{TinyMCESection.Style}}" stepKey="assertInfo2"/>
1414
<seeElement selector="{{TinyMCESection.Bold}}" stepKey="assertInfo3"/>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnNewsletterCest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
<fillField selector="{{BasicFieldNewsletterSection.templateSubject}}" userInput="{{_defaultNewsletter.subject}}" stepKey="fillTemplateSubject" />
2929
<fillField selector="{{BasicFieldNewsletterSection.senderName}}" userInput="{{_defaultNewsletter.senderName}}" stepKey="fillSenderName" />
3030
<fillField selector="{{BasicFieldNewsletterSection.senderEmail}}" userInput="{{_defaultNewsletter.senderEmail}}" stepKey="fillSenderEmail" />
31-
<waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE" />
3231
<actionGroup ref="VerifyTinyMCEActionGroup" stepKey="verifyTinyMCE4"/>
3332
<actionGroup ref="VerifyMagentoEntityActionGroup" stepKey="verifyMagentoEntities"/>
3433
<executeJS function="tinyMCE.get('text').setContent('Hello World From Newsletter Template!');" stepKey="executeJSFillContent"/>

dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/FulltextTest.php

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
7+
68
namespace Magento\CatalogSearch\Model\Indexer;
79

810
use Magento\Catalog\Model\Product;
@@ -25,11 +27,6 @@ class FulltextTest extends \PHPUnit\Framework\TestCase
2527
*/
2628
protected $engine;
2729

28-
/**
29-
* @var \Magento\CatalogSearch\Model\ResourceModel\Fulltext
30-
*/
31-
protected $resourceFulltext;
32-
3330
/**
3431
* @var \Magento\CatalogSearch\Model\Fulltext
3532
*/
@@ -82,10 +79,6 @@ protected function setUp()
8279
\Magento\CatalogSearch\Model\ResourceModel\Engine::class
8380
);
8481

85-
$this->resourceFulltext = Bootstrap::getObjectManager()->get(
86-
\Magento\CatalogSearch\Model\ResourceModel\Fulltext::class
87-
);
88-
8982
$this->queryFactory = Bootstrap::getObjectManager()->get(
9083
\Magento\Search\Model\QueryFactory::class
9184
);
@@ -192,9 +185,8 @@ public function testReindexRowAfterDelete()
192185
* @param string $text
193186
* @return Product[]
194187
*/
195-
protected function search($text)
188+
protected function search($text): array
196189
{
197-
$this->resourceFulltext->resetSearchResults();
198190
$query = $this->queryFactory->get();
199191
$query->unsetData();
200192
$query->setQueryText($text);
@@ -219,7 +211,7 @@ protected function search($text)
219211
* @param string $sku
220212
* @return Product
221213
*/
222-
protected function getProductBySku($sku)
214+
protected function getProductBySku($sku): Product
223215
{
224216
/** @var Product $product */
225217
$product = Bootstrap::getObjectManager()->get(

0 commit comments

Comments
 (0)