From 99574cf5e536a4ed81d7c7f291f3fc9e9f2466a2 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 2 Feb 2015 16:11:00 +0100 Subject: [ticket/13568] Add functional test for imagick path setting PHPBB3-13568 --- tests/functional/acp_attachments_test.php | 44 +++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 tests/functional/acp_attachments_test.php (limited to 'tests/functional') diff --git a/tests/functional/acp_attachments_test.php b/tests/functional/acp_attachments_test.php new file mode 100644 index 0000000000..6b1d1dc8df --- /dev/null +++ b/tests/functional/acp_attachments_test.php @@ -0,0 +1,44 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +/** + * @group functional + */ +class phpbb_functional_acp_attachments_test extends phpbb_functional_test_case +{ + public function data_imagick_path() + { + return array( + array('/usr/bin', 'Configuration updated successfully'), + array('/usr/bin/', 'Configuration updated successfully'), + array('/usr/nope', 'The entered path “/usr/nope” does not exist.'), + array('mkdir /usr/test', 'The entered path “mkdir /usr/test” does not exist.'), + ); + } + + /** + * @dataProvider data_imagick_path + */ + public function test_imagick_path($imagick_path, $expected) + { + $this->login(); + $this->admin_login(); + + $crawler = self::request('GET', 'adm/index.php?i=attachments&mode=attach&sid=' . $this->sid); + + $form = $crawler->selectButton('Submit')->form(array('config[img_imagick]' => $imagick_path)); + + $crawler = self::submit($form); + $this->assertContains($expected, $crawler->text()); + } +} -- cgit v1.2.1 From b53fd867be7db3bf8025a94893c4211b99fbd21e Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 2 Feb 2015 18:33:53 +0100 Subject: [ticket/13568] Add more test cases for imagick path PHPBB3-13568 --- tests/functional/acp_attachments_test.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tests/functional') diff --git a/tests/functional/acp_attachments_test.php b/tests/functional/acp_attachments_test.php index 6b1d1dc8df..9f6b61ccd7 100644 --- a/tests/functional/acp_attachments_test.php +++ b/tests/functional/acp_attachments_test.php @@ -21,8 +21,10 @@ class phpbb_functional_acp_attachments_test extends phpbb_functional_test_case return array( array('/usr/bin', 'Configuration updated successfully'), array('/usr/bin/', 'Configuration updated successfully'), + array('C:\Windows\system32', 'The entered path “C:\Windows\system32” does not exist.'), array('/usr/nope', 'The entered path “/usr/nope” does not exist.'), array('mkdir /usr/test', 'The entered path “mkdir /usr/test” does not exist.'), + array('/usr/bin/which', 'The entered path “/usr/bin/which” is not a directory.'), ); } -- cgit v1.2.1 From ffe0e46e82f712fb11dacf5be7d482c84ab35263 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 2 Feb 2015 20:39:58 +0100 Subject: [ticket/13568] Add imagick tests for windows PHPBB3-13568 --- tests/functional/acp_attachments_test.php | 48 +++++++++++++++++++++++++------ 1 file changed, 40 insertions(+), 8 deletions(-) (limited to 'tests/functional') diff --git a/tests/functional/acp_attachments_test.php b/tests/functional/acp_attachments_test.php index 9f6b61ccd7..c1290bf1ba 100644 --- a/tests/functional/acp_attachments_test.php +++ b/tests/functional/acp_attachments_test.php @@ -16,23 +16,55 @@ */ class phpbb_functional_acp_attachments_test extends phpbb_functional_test_case { - public function data_imagick_path() + public function data_imagick_path_linux() { return array( array('/usr/bin', 'Configuration updated successfully'), - array('/usr/bin/', 'Configuration updated successfully'), - array('C:\Windows\system32', 'The entered path “C:\Windows\system32” does not exist.'), - array('/usr/nope', 'The entered path “/usr/nope” does not exist.'), - array('mkdir /usr/test', 'The entered path “mkdir /usr/test” does not exist.'), + array('/usr/foobar', 'The entered path “/usr/foobar” does not exist.'), array('/usr/bin/which', 'The entered path “/usr/bin/which” is not a directory.'), ); } /** - * @dataProvider data_imagick_path + * @dataProvider data_imagick_path_linux */ - public function test_imagick_path($imagick_path, $expected) + public function test_imagick_path_linux($imagick_path, $expected) { + if (strtolower(substr(PHP_OS, 0, 5)) !== 'linux') + { + $this->markTestSkipped('Unable to test linux specific paths on other OS.'); + } + + $this->login(); + $this->admin_login(); + + $crawler = self::request('GET', 'adm/index.php?i=attachments&mode=attach&sid=' . $this->sid); + + $form = $crawler->selectButton('Submit')->form(array('config[img_imagick]' => $imagick_path)); + + $crawler = self::submit($form); + $this->assertContains($expected, $crawler->filter('#main')->text()); + } + + public function data_imagick_path_windows() + { + return array( + array('C:\Windows', 'Configuration updated successfully'), + array('C:\Windows\foobar1', 'The entered path “C:\Windows\foobar1” does not exist.'), + array('C:\Windows\explorer.exe', 'The entered path “C:\Windows\explorer.exe” is not a directory.'), + ); + } + + /** + * @dataProvider data_imagick_path_linux + */ + public function test_imagick_path_windows($imagick_path, $expected) + { + if (strtolower(substr(PHP_OS, 0, 3)) !== 'win') + { + $this->markTestSkipped('Unable to test windows specific paths on other OS.'); + } + $this->login(); $this->admin_login(); @@ -41,6 +73,6 @@ class phpbb_functional_acp_attachments_test extends phpbb_functional_test_case $form = $crawler->selectButton('Submit')->form(array('config[img_imagick]' => $imagick_path)); $crawler = self::submit($form); - $this->assertContains($expected, $crawler->text()); + $this->assertContains($expected, $crawler->filter('#main')->text()); } } -- cgit v1.2.1 From a3be5310207193d7ca40591530bfd4183f83c9a5 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 3 Feb 2015 16:34:41 +0100 Subject: [ticket/13568] Use correct data provider on windows PHPBB3-13568 --- tests/functional/acp_attachments_test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/functional') diff --git a/tests/functional/acp_attachments_test.php b/tests/functional/acp_attachments_test.php index c1290bf1ba..8e810a508a 100644 --- a/tests/functional/acp_attachments_test.php +++ b/tests/functional/acp_attachments_test.php @@ -56,7 +56,7 @@ class phpbb_functional_acp_attachments_test extends phpbb_functional_test_case } /** - * @dataProvider data_imagick_path_linux + * @dataProvider data_imagick_path_windows */ public function test_imagick_path_windows($imagick_path, $expected) { -- cgit v1.2.1