5 files changed, 17 insertions, 39 deletions
diff --git a/tests/functional/fixtures/ext/foo/bar/config/routing.yml b/tests/functional/fixtures/ext/foo/bar/config/routing.yml
index a24d1cb986..08bc73038f 100644
--- a/tests/functional/fixtures/ext/foo/bar/config/routing.yml
+++ b/tests/functional/fixtures/ext/foo/bar/config/routing.yml
@@ -21,3 +21,15 @@ foo_login_redirect_controller:
 foo_redirect_controller:
     pattern: /foo/redirect
     defaults: { _controller: foo_bar.controller:redirect }
+
+foo_index_controller:
+    pattern: /index
+    defaults: { _controller: foo_bar.controller:redirect }
+
+foo_tests_index_controller:
+    pattern: /tests/index
+    defaults: { _controller: foo_bar.controller:redirect }
+
+foo_tests_dotdot_index_controller:
+    pattern: /tests/../index
+    defaults: { _controller: foo_bar.controller:redirect }
diff --git a/tests/functional/fixtures/ext/foo/bar/controller/controller.php b/tests/functional/fixtures/ext/foo/bar/controller/controller.php
index 3b365bcfee..47d856a5df 100644
--- a/tests/functional/fixtures/ext/foo/bar/controller/controller.php
+++ b/tests/functional/fixtures/ext/foo/bar/controller/controller.php
@@ -77,40 +77,19 @@ class controller
 				'tests/index.php',
 			),
 			array(
-				$this->helper->url('index'),
+				$this->helper->route('foo_index_controller'),
 				$rewrite_prefix . 'index',
 			),
 			array(
-				$this->helper->url('tests/index'),
+				$this->helper->route('foo_tests_index_controller'),
 				$rewrite_prefix . 'tests/index',
 			),
+			/**
+			* Symfony does not allow /../ in routes
 			array(
-				$this->helper->url('tests/../index'),
+				$this->helper->route('foo_tests_dotdot_index_controller'),
 				$rewrite_prefix . 'index',
 			),
-			/*
-			// helper URLs starting with  ../ are prone to failure.
-			// Do not test them right now.
-			array(
-				$this->helper->url('../index'),
-				'../index',
-			),
-			array(
-				$this->helper->url('../../index'),
-				'../index',
-			),
-			array(
-				$this->helper->url('../tests/index'),
-				$rewrite_prefix . '../tests/index',
-			),
-			array(
-				$this->helper->url('../tests/../index'),
-				'../index',
-			),
-			array(
-				$this->helper->url('../../tests/index'),
-				'../tests/index',
-			),
 			*/
 		);
 
diff --git a/tests/functional/search/mysql_test.php b/tests/functional/search/mysql_test.php
index 7af8051417..52a7b14f40 100644
--- a/tests/functional/search/mysql_test.php
+++ b/tests/functional/search/mysql_test.php
@@ -16,8 +16,4 @@ class phpbb_functional_search_mysql_test extends phpbb_functional_search_base
 {
 	protected $search_backend = '\phpbb\search\fulltext_mysql';
 
-	protected function assert_search_not_found($keywords)
-	{
-		$this->markTestIncomplete('MySQL search when fails doesn\'t show the search query');
-	}
 }
diff --git a/tests/functional/search/native_test.php b/tests/functional/search/native_test.php
index ce568df616..512c6f2830 100644
--- a/tests/functional/search/native_test.php
+++ b/tests/functional/search/native_test.php
@@ -15,9 +15,4 @@ require_once dirname(__FILE__) . '/base.php';
 class phpbb_functional_search_native_test extends phpbb_functional_search_base
 {
 	protected $search_backend = '\phpbb\search\fulltext_native';
-
-	protected function assert_search_not_found($keywords)
-	{
-		$this->markTestIncomplete('Native search when fails doesn\'t show the search query');
-	}
 }
diff --git a/tests/functional/search/postgres_test.php b/tests/functional/search/postgres_test.php
index 487b8aeebb..974b417659 100644
--- a/tests/functional/search/postgres_test.php
+++ b/tests/functional/search/postgres_test.php
@@ -16,8 +16,4 @@ class phpbb_functional_search_postgres_test extends phpbb_functional_search_base
 {
 	protected $search_backend = '\phpbb\search\fulltext_postgres';
 
-	protected function assert_search_not_found($keywords)
-	{
-		$this->markTestIncomplete('Postgres search when fails doesn\'t show the search query');
-	}
 }