3 files changed, 53 insertions, 11 deletions
diff --git a/tests/RUNNING_TESTS.md b/tests/RUNNING_TESTS.md
index 26a93f0430..23c74f4411 100644
--- a/tests/RUNNING_TESTS.md
+++ b/tests/RUNNING_TESTS.md
@@ -47,9 +47,11 @@ Database Tests
 By default all tests requiring a database connection will use sqlite. If you
 do not have sqlite installed the tests will be skipped. If you wish to run the
 tests on a different database you have to create a test_config.php file within
-your tests directory following the same format as phpBB's config.php. An
-example for mysqli can be found below. More information on configuration
-options can be found on the wiki (see below).
+your tests directory following the same format as phpBB's config.php. Testing
+makes use of a seperate database defined in this config file and before running
+the tests each time this database is deleted. An example for mysqli can be
+found below. More information on configuration options can be found on the
+wiki (see below).
 
     <?php
     $dbms = 'mysqli';
@@ -114,8 +116,36 @@ only want the slow tests, run:
 
     $ phpBB/vendor/bin/phpunit --group slow
 
+Functional tests
+-----------------
+
+Functional tests test software the way a user would. They simulate a user
+browsing the website, but they do these steps in an automated way.
+phpBB allows you to write such tests.
+
+Running
+=======
+
+Running the tests requires your phpBB3 repository to be accessible through a
+local web server. You will need to supply the URL to the webserver in
+the 'tests/test_config.php' file. This is as simple as defining the
+'$phpbb_functional_url' variable, which contains the URL for the directory containing
+the board. Make sure you include the trailing slash. Note that without extensive
+changes to the test framework, you cannot use a board outside of the repository
+on which to run tests.
+
+    $phpbb_functional_url = 'http://localhost/phpBB3/';
+
+To then run the tests, you run PHPUnit, but use the phpunit.xml.functional
+config file instead of the default one. Specify this through the "-c" option:
+
+    $ phpBB/vendor/bin/phpunit -c phpunit.xml.functional
+
+This will change your board's config.php file, but it makes a backup at
+config_dev.php, so you can restore it after the test run is complete.
+
 More Information
 ================
 
 Further information is available on phpbb wiki:
-http://wiki.phpbb.com/Unit_Tests
+http://wiki.phpbb.com/Automated_Tests
diff --git a/tests/session/init_test.php b/tests/session/creation_test.php
index 2ce6c4a4ac..bef52c6554 100644
--- a/tests/session/init_test.php
+++ b/tests/session/creation_test.php
@@ -10,7 +10,7 @@
 require_once dirname(__FILE__) . '/../mock/cache.php';
 require_once dirname(__FILE__) . '/testable_factory.php';
 
-class phpbb_session_init_test extends phpbb_database_test_case
+class phpbb_session_creation_test extends phpbb_database_test_case
 {
 	public function getDataSet()
 	{
@@ -35,10 +35,11 @@ class phpbb_session_init_test extends phpbb_database_test_case
 		$this->assertSqlResultEquals(
 			array(array('session_user_id' => 3)),
 			$sql,
-			'Check if exacly one session for user id 3 was created'
+			'Check if exactly one session for user id 3 was created'
 		);
 
-		$cookie_expire = $session->time_now + 31536000; // default is one year
+		$one_year_in_seconds = 365 * 24 * 60 * 60;
+		$cookie_expire = $session->time_now + $one_year_in_seconds;
 
 		$session->check_cookies($this, array(
 			'u' => array(null, $cookie_expire),
diff --git a/tests/template/template_test.php b/tests/template/template_test.php
index e532de294c..fd68124c89 100644
--- a/tests/template/template_test.php
+++ b/tests/template/template_test.php
@@ -69,9 +69,14 @@ class phpbb_template_template_test extends phpbb_test_case
 			$this->markTestSkipped("Template cache directory ({$template_cache_dir}) is not writable.");
 		}
 
-		foreach (glob($this->template->cachepath . '*') as $file)
+		$file_array = scandir($template_cache_dir);
+		$file_prefix = basename($this->template->cachepath);
+		foreach ($file_array as $file)
 		{
-			unlink($file);
+			if (strpos($file, $file_prefix) === 0)
+			{
+				unlink($template_cache_dir . '/' . $file);
+			}
 		}
 
 		$GLOBALS['config'] = array(
@@ -84,9 +89,15 @@ class phpbb_template_template_test extends phpbb_test_case
 	{
 		if (is_object($this->template))
 		{
-			foreach (glob($this->template->cachepath . '*') as $file)
+			$template_cache_dir = dirname($this->template->cachepath);
+			$file_array = scandir($template_cache_dir);
+			$file_prefix = basename($this->template->cachepath);
+			foreach ($file_array as $file)
 			{
-				unlink($file);
+				if (strpos($file, $file_prefix) === 0)
+				{
+					unlink($template_cache_dir . '/' . $file);
+				}
 			}
 		}
 	}