diff options
| author |   Marc Alexander <admin@m-a-styles.de> | 2020-02-01 08:50:19 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2020-02-01 08:50:19 +0100 |
| commit | 3bb2edd53de2e1b6e9b23099c21e72cd6063c1a4 (patch) | |
| tree | fb9cdcd190d53b7be9a159165d36c7f68fca9e30 /tests | |
| parent | Merge pull request #5843 from JoshyPHP/ticket/16342 (diff) | |
| parent | Merge pull request #5832 from KYPREO/ticket/16329 (diff) | |
| download | phpbb-3bb2edd53de2e1b6e9b23099c21e72cd6063c1a4.tar.gz phpbb-3bb2edd53de2e1b6e9b23099c21e72cd6063c1a4.tar.bz2 phpbb-3bb2edd53de2e1b6e9b23099c21e72cd6063c1a4.zip | |
Merge branch '3.2.x' into 3.3.x
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/plupload/plupload_test.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/plupload/plupload_test.php b/tests/plupload/plupload_test.php index eb4657afbc..206029d8b8 100644 --- a/tests/plupload/plupload_test.php +++ b/tests/plupload/plupload_test.php @@ -19,12 +19,16 @@ class phpbb_plupload_test extends phpbb_test_case array( 0, 0, + 85, + 0, '', ), array( 130, 150, - 'resize: {width: 130, height: 150, quality: 85},' + 85, + 1, + 'resize: {width: 130, height: 150, quality: 85, preserve_headers: false},' ), ); } @@ -32,7 +36,7 @@ class phpbb_plupload_test extends phpbb_test_case /** * @dataProvider generate_resize_string_data */ - public function test_generate_resize_string($config_width, $config_height, $expected) + public function test_generate_resize_string($config_width, $config_height, $config_quality, $config_metadata, $expected) { global $phpbb_root_path, $phpEx; @@ -41,6 +45,8 @@ class phpbb_plupload_test extends phpbb_test_case $config = new \phpbb\config\config(array( 'img_max_width' => $config_width, 'img_max_height' => $config_height, + 'img_quality' => $config_quality, + 'img_strip_metadata' => $config_metadata, 'upload_path' => 'files', )); $plupload = new \phpbb\plupload\plupload( |