aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2020-02-01 08:50:24 +0100
committerMarc Alexander <admin@m-a-styles.de>2020-02-01 08:50:24 +0100
commit2d5289ed7e126eeec22a9b1af977bfcd87371ec5 (patch)
treec3d52befd5ab2c6f77530a1af2ffeff67b1d865c /tests/plupload/plupload_test.php
parentMerge branch '3.3.x' (diff)
parentMerge branch '3.2.x' into 3.3.x (diff)
downloadphpbb-2d5289ed7e126eeec22a9b1af977bfcd87371ec5.tar.gz
phpbb-2d5289ed7e126eeec22a9b1af977bfcd87371ec5.tar.bz2
phpbb-2d5289ed7e126eeec22a9b1af977bfcd87371ec5.zip
Merge branch '3.3.x'HEADmaster
Diffstat (limited to 'tests/plupload/plupload_test.php')
-rw-r--r--tests/plupload/plupload_test.php10
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(