diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-05-30 13:26:16 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-05-30 13:26:16 +0200 |
| commit | a36defb10fd8962d6073bfafd0cab1b7e15fbbda (patch) | |
| tree | 58560c2c3c82b04d195d6cfaf1b706aa765e22ea | |
| parent | 4f6b12ae1d4b9ac681efff0651a0007fed6942b6 (diff) | |
| download | forums-a36defb10fd8962d6073bfafd0cab1b7e15fbbda.tar forums-a36defb10fd8962d6073bfafd0cab1b7e15fbbda.tar.gz forums-a36defb10fd8962d6073bfafd0cab1b7e15fbbda.tar.bz2 forums-a36defb10fd8962d6073bfafd0cab1b7e15fbbda.tar.xz forums-a36defb10fd8962d6073bfafd0cab1b7e15fbbda.zip | |
[ticket/develop/11568] Fix some more tests in 3.1
PHPBB3-11568
| -rw-r--r-- | tests/functional/extension_controller_test.php | 6 | ||||
| -rw-r--r-- | tests/functional/fileupload_form_test.php | 2 | ||||
| -rw-r--r-- | tests/functional/fileupload_remote_test.php | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php index 1755843398..3e9428e82c 100644 --- a/tests/functional/extension_controller_test.php +++ b/tests/functional/extension_controller_test.php @@ -113,7 +113,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c public function test_missing_argument() { $this->phpbb_extension_manager->enable('foo/bar'); - $crawler = $this->request('GET', 'app.php?controller=foo/baz', false); + $crawler = $this->request('GET', 'app.php?controller=foo/baz', array(), true); $this->request('GET', 'app.php?controller=foo/baz', false); $this->assert_response_success(500); $this->assertContains('Missing value for argument #1: test in class phpbb_ext_foo_bar_controller:baz', $crawler->filter('body')->text()); @@ -126,7 +126,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c public function test_exception_should_result_in_500_status_code() { $this->phpbb_extension_manager->enable('foo/bar'); - $crawler = $this->request('GET', 'app.php?controller=foo/exception', false); + $crawler = $this->request('GET', 'app.php?controller=foo/exception', array(), true); $this->assert_response_success(500); $this->assertContains('Exception thrown from foo/exception route', $crawler->filter('body')->text()); $this->phpbb_extension_manager->purge('foo/bar'); @@ -143,7 +143,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c */ public function test_error_ext_disabled_or_404() { - $crawler = $this->request('GET', 'app.php?controller=does/not/exist', false); + $crawler = $this->request('GET', 'app.php?controller=does/not/exist', array(), true); $this->assert_response_success(404); $this->assertContains('No route found for "GET /does/not/exist"', $crawler->filter('body')->text()); } diff --git a/tests/functional/fileupload_form_test.php b/tests/functional/fileupload_form_test.php index 2abea86077..998c402fa3 100644 --- a/tests/functional/fileupload_form_test.php +++ b/tests/functional/fileupload_form_test.php @@ -32,7 +32,7 @@ class phpbb_functional_fileupload_form_test extends phpbb_functional_test_case 'error' => UPLOAD_ERR_OK, ); - $crawler = $this->client->request( + $crawler = self::$client->request( 'POST', 'posting.php?mode=reply&f=2&t=1&sid=' . $this->sid, array('add_file' => $this->lang('ADD_FILE')), diff --git a/tests/functional/fileupload_remote_test.php b/tests/functional/fileupload_remote_test.php index 0deb79acf6..8e361ab77b 100644 --- a/tests/functional/fileupload_remote_test.php +++ b/tests/functional/fileupload_remote_test.php @@ -58,7 +58,7 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case public function test_successful_upload() { $upload = new fileupload('', array('gif'), 1000); - $file = $upload->remote_upload($this->root_url . 'styles/prosilver/theme/images/forum_read.gif'); + $file = $upload->remote_upload(self::$root_url . 'styles/prosilver/theme/images/forum_read.gif'); $this->assertEquals(0, sizeof($file->error)); $this->assertTrue(file_exists($file->filename)); } @@ -66,7 +66,8 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case public function test_too_large() { $upload = new fileupload('', array('gif'), 100); - $file = $upload->remote_upload($this->root_url . 'styles/prosilver/theme/images/forum_read.gif'); + $file = $upload->remote_upload(self::$root_url . 'styles/prosilver/theme/images/forum_read.gif'); + $this->assertEquals(1, sizeof($file->error)); $this->assertEquals('WRONG_FILESIZE', $file->error[0]); } } |