merge master into hooks-view-same-start

1 files changed, 25 insertions, 0 deletions

diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php
index e2107a03614..b2dd3963f1c 100644
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@ -392,6 +392,12 @@ class View extends \PHPUnit_Framework_TestCase {
 		return $storage;
 	}
 
+	private $createHookPath;
+
+	function dummyCreateHook($params) {
+		$this->createHookPath = $params['path'];
+	}
+
 	/**
 	 * @medium
 	 */
@@ -409,4 +415,23 @@ class View extends \PHPUnit_Framework_TestCase {
 		$subView->file_put_contents('/foo.txt', 'asd');
 		$this->assertNull($this->hookPath);
 	}
+
+	public function testEditNoCreateHook() {
+		$storage1 = $this->getTestStorage();
+		$storage2 = $this->getTestStorage();
+		$defaultRoot = \OC\Files\Filesystem::getRoot();
+		\OC\Files\Filesystem::mount($storage1, array(), '/');
+		\OC\Files\Filesystem::mount($storage2, array(), $defaultRoot);
+		\OC_Hook::connect('OC_Filesystem', 'post_create', $this, 'dummyCreateHook');
+
+		$view = new \OC\Files\View($defaultRoot);
+		$this->hookPath = null;
+
+		$view->file_put_contents('/asd.txt', 'foo');
+		$this->assertEquals('/asd.txt', $this->createHookPath);
+		$this->createHookPath = null;
+
+		$view->file_put_contents('/asd.txt', 'foo');
+		$this->assertNull($this->createHookPath);
+	}
 }