From eba74ebb934174a14536400ab4cf8c49ef0ad7bd Mon Sep 17 00:00:00 2001 From: Daniel Siepmann Date: Thu, 11 May 2017 12:50:31 +0200 Subject: [PATCH] TASK: Make test work with TYPO3 7.x * Do not overwrite base ts setup, keep it and add test specific. * Adjust order of labels. --- .../Connection/Elasticsearch/IndexTcaTableTest.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Tests/Functional/Connection/Elasticsearch/IndexTcaTableTest.php b/Tests/Functional/Connection/Elasticsearch/IndexTcaTableTest.php index 9f9b50b..5e0c1a7 100644 --- a/Tests/Functional/Connection/Elasticsearch/IndexTcaTableTest.php +++ b/Tests/Functional/Connection/Elasticsearch/IndexTcaTableTest.php @@ -98,7 +98,10 @@ class IndexTcaTableTest extends AbstractFunctionalTestCase */ public function indexingRespectsUserWhereClause() { - $this->setUpFrontendRootPage(1, ['EXT:search_core/Tests/Functional/Fixtures/Indexing/UserWhereClause.ts']); + $this->setUpFrontendRootPage(1, array_merge( + parent::getTypoScriptFilesForFrontendRootPage(), + ['EXT:search_core/Tests/Functional/Fixtures/Indexing/UserWhereClause.ts'] + )); $this->importDataSet('Tests/Functional/Fixtures/Indexing/UserWhereClause.xml'); \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(ObjectManager::class) @@ -147,7 +150,7 @@ class IndexTcaTableTest extends AbstractFunctionalTestCase ['_source' => [ 'uid' => '9', 'CType' => 'Header', // Testing items - 'categories' => ['Category 2', 'Category 1'], // Testing mm (with sorting) + 'categories' => ['Category 1', 'Category 2'], // Testing mm (with sorting) ]], $response->getData()['hits']['hits'][0], false,