aboutsummaryrefslogtreecommitdiffstats
path: root/tests/functional
diff options
context:
space:
mode:
authorTristan Darricau <tristan.darricau@sensiolabs.com>2015-11-03 20:35:24 +0100
committerTristan Darricau <tristan.darricau@sensiolabs.com>2015-11-03 20:35:24 +0100
commitc783c37c73beb2756d900f18dd24430c1b9f41ff (patch)
tree81bfded9172093113bd9d952a26532cfd361d388 /tests/functional
parent8b7f711a184220928f42d5ec079af18d259981d0 (diff)
parentf991e484da91e24f82fbcb05d0b2ae11ca51852b (diff)
downloadforums-c783c37c73beb2756d900f18dd24430c1b9f41ff.tar
forums-c783c37c73beb2756d900f18dd24430c1b9f41ff.tar.gz
forums-c783c37c73beb2756d900f18dd24430c1b9f41ff.tar.bz2
forums-c783c37c73beb2756d900f18dd24430c1b9f41ff.tar.xz
forums-c783c37c73beb2756d900f18dd24430c1b9f41ff.zip
Merge pull request #3995 from CHItA/ticket/14044
[ticket/14044] Deduplicate the installers * CHItA/ticket/14044: [ticket/14044] Add config as global in notify user [ticket/14044] Fix language selection data loss [ticket/14044] Patch language::set_fallback_array() [ticket/14044] Fix tests [ticket/14044] Fix wrong descriptions in install [ticket/14044] Solve missing email template error [ticket/14044] global $table_prefix in constants.php [ticket/14044] Try to fix missing table prefix [ticket/14044] Use the correct language file version [ticket/14044] Automatically trigger rollback on insert in transaction [ticket/14044] Use empty instead of !count [ticket/14044] Fix Sqlite error in tests [ticket/14044] Deduplicate the installers
Diffstat (limited to 'tests/functional')
-rw-r--r--tests/functional/search/base.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/functional/search/base.php b/tests/functional/search/base.php
index 1d37d748df..a3cac381d2 100644
--- a/tests/functional/search/base.php
+++ b/tests/functional/search/base.php
@@ -36,6 +36,8 @@ abstract class phpbb_functional_search_base extends phpbb_functional_test_case
$this->login();
$this->admin_login();
+ $this->create_search_index('\phpbb\search\fulltext_native');
+
$post = $this->create_topic(2, 'Test Topic 1 foosubject', 'This is a test topic posted by the barsearch testing framework.');
$crawler = self::request('GET', 'adm/index.php?i=acp_search&mode=settings&sid=' . $this->sid);
@@ -58,6 +60,7 @@ abstract class phpbb_functional_search_base extends phpbb_functional_test_case
$this->delete_topic($post['topic_id']);
$this->markTestSkipped("Search backend is not supported/running");
}
+
$this->create_search_index();
}
@@ -72,14 +75,14 @@ abstract class phpbb_functional_search_base extends phpbb_functional_test_case
$this->delete_topic($post['topic_id']);
}
- protected function create_search_index()
+ protected function create_search_index($backend = null)
{
$this->add_lang('acp/search');
$crawler = self::request(
'POST',
'adm/index.php?i=acp_search&mode=index&sid=' . $this->sid,
array(
- 'search_type' => $this->search_backend,
+ 'search_type' => ( ($backend === null) ? $this->search_backend : $backend ),
'action' => 'create',
'submit' => true,
)