Follow-on to fd0051dab7 for #2006.

- fix unit tests for watermarks, which check for deleted files.
This commit is contained in:
shadlaws
2013-02-18 23:30:29 +01:00
parent afa61f9d0d
commit 62035bdbe1

View File

@@ -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));