aboutsummaryrefslogtreecommitdiffstats
path: root/tests/filesystem
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2013-09-13 10:58:03 -0500
committerNathan Guse <nathaniel.guse@gmail.com>2013-09-13 10:58:03 -0500
commitb4a374dc73eda55db1c67b87bd65a73f79411ef5 (patch)
treeae392771a6aad76517e46b17c26797037c036a61 /tests/filesystem
parent21624e79fc512fd86177080010bb7d26c71ce3cb (diff)
downloadforums-b4a374dc73eda55db1c67b87bd65a73f79411ef5.tar
forums-b4a374dc73eda55db1c67b87bd65a73f79411ef5.tar.gz
forums-b4a374dc73eda55db1c67b87bd65a73f79411ef5.tar.bz2
forums-b4a374dc73eda55db1c67b87bd65a73f79411ef5.tar.xz
forums-b4a374dc73eda55db1c67b87bd65a73f79411ef5.zip
[ticket/11832] Fix INCLUDE(JS/CSS)
PHPBB3-11832
Diffstat (limited to 'tests/filesystem')
-rw-r--r--tests/filesystem/clean_path_test.php3
-rw-r--r--tests/filesystem/web_root_path_test.php15
2 files changed, 14 insertions, 4 deletions
diff --git a/tests/filesystem/clean_path_test.php b/tests/filesystem/clean_path_test.php
index b79668fc33..38ccf1b603 100644
--- a/tests/filesystem/clean_path_test.php
+++ b/tests/filesystem/clean_path_test.php
@@ -18,7 +18,8 @@ class phpbb_filesystem_clean_path_test extends phpbb_test_case
new phpbb_symfony_request(
new phpbb_mock_request()
),
- dirname(__FILE__) . './../../phpBB/'
+ dirname(__FILE__) . './../../phpBB/',
+ 'php'
);
}
diff --git a/tests/filesystem/web_root_path_test.php b/tests/filesystem/web_root_path_test.php
index b681c26de9..ae59d4f709 100644
--- a/tests/filesystem/web_root_path_test.php
+++ b/tests/filesystem/web_root_path_test.php
@@ -18,8 +18,13 @@ class phpbb_filesystem_web_root_path_test extends phpbb_test_case
$this->set_phpbb_root_path();
- $symfony_request = new phpbb_symfony_request(new phpbb_mock_request());
- $this->filesystem = new phpbb_filesystem($symfony_request, $this->phpbb_root_path);
+ $this->filesystem = new phpbb_filesystem(
+ new phpbb_symfony_request(
+ new phpbb_mock_request()
+ ),
+ $this->phpbb_root_path,
+ 'php'
+ );
}
/**
@@ -126,7 +131,11 @@ class phpbb_filesystem_web_root_path_test extends phpbb_test_case
->method('getScriptName')
->will($this->returnValue($getScriptName));
- $filesystem = new phpbb_filesystem($symfony_request, $this->phpbb_root_path);
+ $filesystem = new phpbb_filesystem(
+ $symfony_request,
+ $this->phpbb_root_path,
+ 'php'
+ );
$this->assertEquals($expected, $filesystem->update_web_root_path($input, $symfony_request));
}