From a55c83b77168e77fd4d0101b8c58741f442b2d39 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Fri, 8 Aug 2014 15:22:05 +0200 Subject: [ticket/12692] Add a proper extension to the fixtures PHPBB3-12692 --- tests/console/fixtures/png | Bin 129 -> 0 bytes tests/console/fixtures/png.png | Bin 0 -> 129 bytes tests/console/fixtures/txt | 2 -- tests/console/fixtures/txt.txt | 2 ++ tests/console/thumbnail_test.php | 10 ++++++---- 5 files changed, 8 insertions(+), 6 deletions(-) delete mode 100644 tests/console/fixtures/png create mode 100644 tests/console/fixtures/png.png delete mode 100644 tests/console/fixtures/txt create mode 100644 tests/console/fixtures/txt.txt (limited to 'tests/console') diff --git a/tests/console/fixtures/png b/tests/console/fixtures/png deleted file mode 100644 index c143a26a06..0000000000 Binary files a/tests/console/fixtures/png and /dev/null differ diff --git a/tests/console/fixtures/png.png b/tests/console/fixtures/png.png new file mode 100644 index 0000000000..c143a26a06 Binary files /dev/null and b/tests/console/fixtures/png.png differ diff --git a/tests/console/fixtures/txt b/tests/console/fixtures/txt deleted file mode 100644 index a78c858f5c..0000000000 --- a/tests/console/fixtures/txt +++ /dev/null @@ -1,2 +0,0 @@ -mime trigger -The HTML tags should remain uppercase so that case-insensitivity can be checked. diff --git a/tests/console/fixtures/txt.txt b/tests/console/fixtures/txt.txt new file mode 100644 index 0000000000..a78c858f5c --- /dev/null +++ b/tests/console/fixtures/txt.txt @@ -0,0 +1,2 @@ +mime trigger +The HTML tags should remain uppercase so that case-insensitivity can be checked. diff --git a/tests/console/thumbnail_test.php b/tests/console/thumbnail_test.php index 11d2717f73..6af8e7e174 100644 --- a/tests/console/thumbnail_test.php +++ b/tests/console/thumbnail_test.php @@ -11,6 +11,8 @@ * */ +require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; + use Symfony\Component\Console\Application; use Symfony\Component\Console\Tester\CommandTester; use phpbb\console\command\thumbnail\generate; @@ -63,10 +65,10 @@ class phpbb_console_command_thumbnail_test extends phpbb_database_test_case public function test_thumbnails() { - copy(dirname(__FILE__) . '/fixtures/png', $this->phpbb_root_path . 'files/test_png_1'); - copy(dirname(__FILE__) . '/fixtures/png', $this->phpbb_root_path . 'files/test_png_2'); - copy(dirname(__FILE__) . '/fixtures/png', $this->phpbb_root_path . 'files/thumb_test_png_2'); - copy(dirname(__FILE__) . '/fixtures/txt', $this->phpbb_root_path . 'files/test_txt'); + copy(dirname(__FILE__) . '/fixtures/png.png', $this->phpbb_root_path . 'files/test_png_1'); + copy(dirname(__FILE__) . '/fixtures/png.png', $this->phpbb_root_path . 'files/test_png_2'); + copy(dirname(__FILE__) . '/fixtures/png.png', $this->phpbb_root_path . 'files/thumb_test_png_2'); + copy(dirname(__FILE__) . '/fixtures/txt.txt', $this->phpbb_root_path . 'files/test_txt'); $command_tester = $this->get_command_tester('thumbnail:generate'); $exit_status = $command_tester->execute(array('command' => 'thumbnail:generate')); -- cgit v1.2.1