diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-02-06 10:19:39 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-02-06 10:19:39 +0100 |
| commit | cd85f1b632778d6b7e8915a2507c2bd7d40a5d0e (patch) | |
| tree | 7f5b00319e83f58fb7e77a709d813d0d74f54991 /tests/functional | |
| parent | 1e4853507abb3fc50d6d7edd048d3cf88e905f1c (diff) | |
| parent | 7c5d872344a59f0fe2323d34885e543a09111ca7 (diff) | |
| download | forums-cd85f1b632778d6b7e8915a2507c2bd7d40a5d0e.tar forums-cd85f1b632778d6b7e8915a2507c2bd7d40a5d0e.tar.gz forums-cd85f1b632778d6b7e8915a2507c2bd7d40a5d0e.tar.bz2 forums-cd85f1b632778d6b7e8915a2507c2bd7d40a5d0e.tar.xz forums-cd85f1b632778d6b7e8915a2507c2bd7d40a5d0e.zip | |
Merge branch 'ticket/13568' into ticket/13568-asc
Conflicts:
phpBB/adm/index.php
phpBB/includes/acp/acp_attachments.php
Diffstat (limited to 'tests/functional')
| -rw-r--r-- | tests/functional/acp_attachments_test.php | 78 |
1 files changed, 78 insertions, 0 deletions
diff --git a/tests/functional/acp_attachments_test.php b/tests/functional/acp_attachments_test.php new file mode 100644 index 0000000000..8e810a508a --- /dev/null +++ b/tests/functional/acp_attachments_test.php @@ -0,0 +1,78 @@ +<?php +/** + * + * This file is part of the phpBB Forum Software package. + * + * @copyright (c) phpBB Limited <https://www.phpbb.com> + * @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_linux() + { + return array( + array('/usr/bin', 'Configuration updated successfully'), + 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_linux + */ + 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_windows + */ + 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(); + + $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()); + } +} |