Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/13008] Add functionnal test
  [ticket/13008] Use an absolute path with the FileLocator for the routing files

1 files changed, 14 insertions, 0 deletions

diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php
index 532a160a47..18eb9ad4c6 100644
--- a/tests/functional/extension_controller_test.php
+++ b/tests/functional/extension_controller_test.php
@@ -26,6 +26,8 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 		'foo/bar/event/',
 		'foo/bar/language/en/',
 		'foo/bar/styles/prosilver/template/',
+		'foo/foo/config/',
+		'foo/foo/controller/',
 	);
 
 	static public function setUpBeforeClass()
@@ -65,6 +67,18 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	}
 
 	/**
+	* Check a controller for extension foo/bar.
+	*/
+	public function test_routing_resources()
+	{
+		$this->phpbb_extension_manager->enable('foo/foo');
+		$crawler = self::request('GET', 'app.php/foo/foo', array(), false);
+		self::assert_response_status_code();
+		$this->assertContains("foo/foo controller handle() method", $crawler->filter('body')->text());
+		$this->phpbb_extension_manager->purge('foo/foo');
+	}
+
+	/**
 	* Check the output of a controller using the template system
 	*/
 	public function test_controller_with_template()