diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/functional/search/base_test.php (renamed from tests/functional/search_test.php) | 5 | ||||
| -rw-r--r-- | tests/functional/search/mysql_test.php (renamed from tests/functional/search_mysql_test.php) | 4 | ||||
| -rw-r--r-- | tests/functional/search/native_test.php (renamed from tests/functional/search_native_test.php) | 4 | ||||
| -rw-r--r-- | tests/functional/search/postgres_test.php (renamed from tests/functional/search_postgres_test.php) | 4 | ||||
| -rw-r--r-- | tests/functional/search/sphinx_test.php (renamed from tests/functional/search_sphinx_test.php) | 4 |
5 files changed, 10 insertions, 11 deletions
diff --git a/tests/functional/search_test.php b/tests/functional/search/base_test.php index 2090e73a4c..538db6de89 100644 --- a/tests/functional/search_test.php +++ b/tests/functional/search/base_test.php @@ -10,7 +10,7 @@ /** * @group functional */ -abstract class phpbb_functional_search_test extends phpbb_functional_test_case +abstract class phpbb_functional_search_base_test extends phpbb_functional_test_case { protected function assert_search_found($keywords) { @@ -47,11 +47,10 @@ abstract class phpbb_functional_search_test extends phpbb_functional_test_case $crawler = self::submit($form); // check if search backend is not supported - if ($crawler->filter('.errorbox')->count() > 0); + if ($crawler->filter('.errorbox')->count() > 0) { $this->markTestSkipped("Search backend is not supported/running"); } - $this->create_search_index(); } diff --git a/tests/functional/search_mysql_test.php b/tests/functional/search/mysql_test.php index b55d0c808c..f27269d76a 100644 --- a/tests/functional/search_mysql_test.php +++ b/tests/functional/search/mysql_test.php @@ -7,12 +7,12 @@ * */ -require_once dirname(__FILE__) . '/search_test.php'; +require_once dirname(__FILE__) . '/base_test.php'; /** * @group functional */ -class phpbb_functional_search_mysql_test extends phpbb_functional_search_test +class phpbb_functional_search_mysql_test extends phpbb_functional_search_base_test { protected $search_backend; diff --git a/tests/functional/search_native_test.php b/tests/functional/search/native_test.php index 9bcdc01547..d2f274e051 100644 --- a/tests/functional/search_native_test.php +++ b/tests/functional/search/native_test.php @@ -7,12 +7,12 @@ * */ -require_once dirname(__FILE__) . '/search_test.php'; +require_once dirname(__FILE__) . '/base_test.php'; /** * @group functional */ -class phpbb_functional_search_native_test extends phpbb_functional_search_test +class phpbb_functional_search_native_test extends phpbb_functional_search_base_test { protected $search_backend; diff --git a/tests/functional/search_postgres_test.php b/tests/functional/search/postgres_test.php index 5b46db5c82..110360f28e 100644 --- a/tests/functional/search_postgres_test.php +++ b/tests/functional/search/postgres_test.php @@ -7,12 +7,12 @@ * */ -require_once dirname(__FILE__) . '/search_test.php'; +require_once dirname(__FILE__) . '/base_test.php'; /** * @group functional */ -class phpbb_functional_search_postgres_test extends phpbb_functional_search_test +class phpbb_functional_search_postgres_test extends phpbb_functional_search_base_test { protected $search_backend; diff --git a/tests/functional/search_sphinx_test.php b/tests/functional/search/sphinx_test.php index 6b94f388c4..048f4e491b 100644 --- a/tests/functional/search_sphinx_test.php +++ b/tests/functional/search/sphinx_test.php @@ -7,12 +7,12 @@ * */ -require_once dirname(__FILE__) . '/search_test.php'; +require_once dirname(__FILE__) . '/base_test.php'; /** * @group functional */ -class phpbb_functional_search_sphinx_test extends phpbb_functional_search_test +class phpbb_functional_search_sphinx_test extends phpbb_functional_search_base_test { protected $search_backend; |