diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-09-27 10:47:10 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-09-27 10:47:10 +0200 |
| commit | 663b4b2eb74e8edb076c962662ff5124e94353ea (patch) | |
| tree | 0ff449c776397b2b66fc7d567f93bbb7d62ea2e3 /tests/request/request_test.php | |
| parent | 01512104b5823d15eed64d362b41b9594f870f0c (diff) | |
| parent | 8db820be634cfce0fdb079fdbaee2c49661a7870 (diff) | |
| download | forums-663b4b2eb74e8edb076c962662ff5124e94353ea.tar forums-663b4b2eb74e8edb076c962662ff5124e94353ea.tar.gz forums-663b4b2eb74e8edb076c962662ff5124e94353ea.tar.bz2 forums-663b4b2eb74e8edb076c962662ff5124e94353ea.tar.xz forums-663b4b2eb74e8edb076c962662ff5124e94353ea.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwords
Conflicts:
phpBB/develop/create_schema_files.php
Diffstat (limited to 'tests/request/request_test.php')
| -rw-r--r-- | tests/request/request_test.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/request/request_test.php b/tests/request/request_test.php index 52c21abd2a..a25792e051 100644 --- a/tests/request/request_test.php +++ b/tests/request/request_test.php @@ -33,8 +33,8 @@ class phpbb_request_test extends phpbb_test_case $_SERVER['HTTP_ACCEPT'] = 'application/json'; $_SERVER['HTTP_SOMEVAR'] = '<value>'; - $this->type_cast_helper = $this->getMock('phpbb_request_type_cast_helper_interface'); - $this->request = new phpbb_request($this->type_cast_helper); + $this->type_cast_helper = $this->getMock('\phpbb\request\type_cast_helper_interface'); + $this->request = new \phpbb\request\request($this->type_cast_helper); } public function test_toggle_super_globals() @@ -135,7 +135,7 @@ class phpbb_request_test extends phpbb_test_case { $this->request->enable_super_globals(); $_SERVER['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'; - $this->request = new phpbb_request($this->type_cast_helper); + $this->request = new \phpbb\request\request($this->type_cast_helper); $this->assertTrue($this->request->is_ajax()); } @@ -146,7 +146,7 @@ class phpbb_request_test extends phpbb_test_case $this->request->enable_super_globals(); $_SERVER['HTTPS'] = 'on'; - $this->request = new phpbb_request($this->type_cast_helper); + $this->request = new \phpbb\request\request($this->type_cast_helper); $this->assertTrue($this->request->is_secure()); } |