From ccee9854c29f9fedfeb5647d058e76154f9a8295 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 3 Dec 2008 23:31:10 +0000
Subject: Rename file::unlink() to dir::unlink().  This creates an API that is
 clearer about its actions, otherwise we may accidentally blow away an entire
 hierarchy when we think we're deleting a single file (there's a reason why rm
 won't let you delete dirs that aren't empty!)

Name it "dir" instead of "directory" because apparently "directory" is
already reserved.

Move the delete call out of Items_Controller and into the model.  The
model is responsible for keeping state integrity, not the controller.
---
 core/tests/Dir_Helper_Test.php | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 core/tests/Dir_Helper_Test.php

(limited to 'core/tests/Dir_Helper_Test.php')

diff --git a/core/tests/Dir_Helper_Test.php b/core/tests/Dir_Helper_Test.php
new file mode 100644
index 00000000..69d891db
--- /dev/null
+++ b/core/tests/Dir_Helper_Test.php
@@ -0,0 +1,32 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2008 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class Directory_Helper_Test extends Unit_Test_Case {
+  public function remove_album_test() {
+    $dirname = (VARPATH . "albums/testdir");
+    mkdir($dirname, 0777, true);
+
+    $filename = tempnam($dirname, "file");
+    touch($filename);
+
+    dir::unlink($dirname);
+    $this->assert_boolean(!file_exists($filename), "File not deleted");
+    $this->assert_boolean(!file_exists($dirname), "Directory not deleted");
+  }
+}
-- 
cgit v1.2.3