aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKYPREO <58344533+KYPREO@users.noreply.github.com>2020-01-20 22:16:38 +1100
committerKYPREO <58344533+KYPREO@users.noreply.github.com>2020-01-20 22:16:38 +1100
commit0b03fa963ac3cde9f7ddab10f8e68d1b6a6ab061 (patch)
tree8d9b129d1382cadbae40ed8a3f65eada3ce1f2f9 /tests/plupload
parent[ticket/16329] Add configuration options for Plupload (diff)
downloadphpbb-0b03fa963ac3cde9f7ddab10f8e68d1b6a6ab061.tar.gz
phpbb-0b03fa963ac3cde9f7ddab10f8e68d1b6a6ab061.tar.bz2
phpbb-0b03fa963ac3cde9f7ddab10f8e68d1b6a6ab061.zip
[ticket/16329] Add configuration options for Plupload
PHPBB3-16329 PHPBB3-16330
Diffstat (limited to 'tests/plupload')
-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(