diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-30 18:24:46 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-30 18:24:46 -0500 |
| commit | a6df011a107132390ecc35b80ab0e88bc31fd103 (patch) | |
| tree | c91b2a90f4c3cef95c1f734aa0b6b0da4007e2ac /tests/filesystem/web_root_path_test.php | |
| parent | 2ee22d4615a86a33d3c65f94d7a9c4b99dfb1b7e (diff) | |
| parent | 179f41475b555d0a3314d779d0d7423f66f0fb95 (diff) | |
| download | forums-a6df011a107132390ecc35b80ab0e88bc31fd103.tar forums-a6df011a107132390ecc35b80ab0e88bc31fd103.tar.gz forums-a6df011a107132390ecc35b80ab0e88bc31fd103.tar.bz2 forums-a6df011a107132390ecc35b80ab0e88bc31fd103.tar.xz forums-a6df011a107132390ecc35b80ab0e88bc31fd103.zip | |
Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11850
# By Nils Adermann (68) and others
# Via Andreas Fischer (12) and others
* 'develop' of github.com:phpbb/phpbb3: (102 commits)
[ticket/11876] Replace MD5 with SHA256.
[ticket/11876] Move checksum generation from build PHP files to phing build.xml
[develop-olympus] Build against 3.0.12 instead of 3.0.12-RC3. Tag exists now.
[prep-release-3.0.12] Update changelog for 3.0.12 release.
[ticket/11873] Add unit test for large password input.
[ticket/11873] Do not hash very large passwords in order to safe resources.
[ticket/11862] Correct var names in user_delete() events due to prune-users
[develop-olympus] Use 3.0.13-dev as build version. Use latest 3.0.12 RC tag.
[prep-release-3.0.12] Bumping version number for 3.0.12 final.
[ticket/11852] Add class file
[ticket/11852] Move tests to folder with new class name
[ticket/11852] Split filesystem and path_helper into 2 classes
[ticket/11868] Add @depends to test
[ticket/11868] Add functional test for registration
[ticket/11868] Replace phpbb_request_interface references
[ticket/11866] Only single backslash in .md files
[ticket/11866] Remove outdated and broken develop script
[ticket/11866] More namespaces
[ticket/11866] Update some occurances of phpbb_db_ to new Namespace
[ticket/11865] Convert old class name to namespaced version
...
Conflicts:
tests/security/extract_current_page_test.php
tests/session/testable_facade.php
Diffstat (limited to 'tests/filesystem/web_root_path_test.php')
| -rw-r--r-- | tests/filesystem/web_root_path_test.php | 142 |
1 files changed, 0 insertions, 142 deletions
diff --git a/tests/filesystem/web_root_path_test.php b/tests/filesystem/web_root_path_test.php deleted file mode 100644 index ae59d4f709..0000000000 --- a/tests/filesystem/web_root_path_test.php +++ /dev/null @@ -1,142 +0,0 @@ -<?php -/** -* -* @package testing -* @copyright (c) 2013 phpBB Group -* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 -* -*/ - -class phpbb_filesystem_web_root_path_test extends phpbb_test_case -{ - protected $filesystem; - protected $phpbb_root_path = ''; - - public function setUp() - { - parent::setUp(); - - $this->set_phpbb_root_path(); - - $this->filesystem = new phpbb_filesystem( - new phpbb_symfony_request( - new phpbb_mock_request() - ), - $this->phpbb_root_path, - 'php' - ); - } - - /** - * Set the phpbb_root_path - * - * This is necessary because dataProvider functions are called - * before setUp or setUpBeforeClass; so we must set the path - * any time we wish to use it in one of these functions (and - * also in general for everything else) - */ - public function set_phpbb_root_path() - { - $this->phpbb_root_path = dirname(__FILE__) . './../../phpBB/'; - } - - public function test_get_web_root_path() - { - // Symfony Request = null, so always should return phpbb_root_path - $this->assertEquals($this->phpbb_root_path, $this->filesystem->get_web_root_path()); - } - - public function basic_update_web_root_path_data() - { - $this->set_phpbb_root_path(); - - return array( - array( - $this->phpbb_root_path . 'test.php', - $this->phpbb_root_path . 'test.php', - ), - array( - 'test.php', - $this->phpbb_root_path . 'test.php', - ), - array( - $this->phpbb_root_path . $this->phpbb_root_path . 'test.php', - $this->phpbb_root_path . $this->phpbb_root_path . 'test.php', - ), - ); - } - - /** - * @dataProvider basic_update_web_root_path_data - */ - public function test_basic_update_web_root_path($input, $expected) - { - $this->assertEquals($expected, $this->filesystem->update_web_root_path($input, $symfony_request)); - } - - public function update_web_root_path_data() - { - $this->set_phpbb_root_path(); - - return array( - array( - $this->phpbb_root_path . 'test.php', - $this->phpbb_root_path . 'test.php', - '/', - ), - array( - $this->phpbb_root_path . 'test.php', - $this->phpbb_root_path . '../test.php', - '//', - ), - array( - $this->phpbb_root_path . 'test.php', - $this->phpbb_root_path . '../test.php', - '//', - 'foo/bar.php', - 'bar.php', - ), - array( - $this->phpbb_root_path . 'test.php', - $this->phpbb_root_path . '../../test.php', - '/foo/template', - '/phpbb3-fork/phpBB/app.php/foo/template', - '/phpbb3-fork/phpBB/app.php', - ), - array( - $this->phpbb_root_path . 'test.php', - $this->phpbb_root_path . '../test.php', - '/foo/template', - '/phpbb3-fork/phpBB/foo/template', - '/phpbb3-fork/phpBB/app.php', - ), - ); - } - - /** - * @dataProvider update_web_root_path_data - */ - public function test_update_web_root_path($input, $expected, $getPathInfo, $getRequestUri = null, $getScriptName = null) - { - $symfony_request = $this->getMock("phpbb_symfony_request", array(), array( - new phpbb_mock_request(), - )); - $symfony_request->expects($this->any()) - ->method('getPathInfo') - ->will($this->returnValue($getPathInfo)); - $symfony_request->expects($this->any()) - ->method('getRequestUri') - ->will($this->returnValue($getRequestUri)); - $symfony_request->expects($this->any()) - ->method('getScriptName') - ->will($this->returnValue($getScriptName)); - - $filesystem = new phpbb_filesystem( - $symfony_request, - $this->phpbb_root_path, - 'php' - ); - - $this->assertEquals($expected, $filesystem->update_web_root_path($input, $symfony_request)); - } -} |