From 62035bdbe1f4e8173eff1d93a31bdb658686a926 Mon Sep 17 00:00:00 2001 From: shadlaws Date: Mon, 18 Feb 2013 23:30:29 +0100 Subject: Follow-on to fd0051dab7258c817ff01877bd4324530ce79398 for #2006. - fix unit tests for watermarks, which check for deleted files. --- modules/watermark/tests/Admin_Watermarks_Controller_Test.php | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'modules') diff --git a/modules/watermark/tests/Admin_Watermarks_Controller_Test.php b/modules/watermark/tests/Admin_Watermarks_Controller_Test.php index 0b4ba84b..6c6ecb15 100644 --- a/modules/watermark/tests/Admin_Watermarks_Controller_Test.php +++ b/modules/watermark/tests/Admin_Watermarks_Controller_Test.php @@ -68,6 +68,9 @@ class Admin_Watermarks_Controller_Test extends Gallery_Unit_Test_Case { $controller->add(); $results = ob_get_clean(); + // Delete all files marked using system::delete_later (from gallery_event::gallery_shutdown) + system::delete_marked_files(); + // Add should *not* be successful, and watermark should be deleted $this->assert_equal("", $results); $this->assert_false(file_exists($watermark_path)); @@ -115,6 +118,9 @@ class Admin_Watermarks_Controller_Test extends Gallery_Unit_Test_Case { $controller->add(); $results = ob_get_clean(); + // Delete all files marked using system::delete_later (from gallery_event::gallery_shutdown) + system::delete_marked_files(); + // Add should *not* be successful, and watermark should be deleted $this->assert_equal("", $results); $this->assert_false(file_exists($watermark_path)); -- cgit v1.2.3