From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 10 Oct 2013 09:34:30 +0000 (+0200)
Subject: merge master into hooks-view-same-start
X-Git-Tag: v6.0.0alpha2~40^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1378af838ced159f1070f869394dccbde8c21219;p=nextcloud-server.git

merge master into hooks-view-same-start
---

1378af838ced159f1070f869394dccbde8c21219
diff --cc tests/lib/files/view.php
index e2107a03614,a5107c351f4..b2dd3963f1c
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@@ -392,21 -392,28 +392,46 @@@ class View extends \PHPUnit_Framework_T
  		return $storage;
  	}
  
+ 	private $createHookPath;
+ 
+ 	function dummyCreateHook($params) {
+ 		$this->createHookPath = $params['path'];
+ 	}
+ 
 +	/**
 +	 * @medium
 +	 */
 +	function testViewHooksIfRootStartsTheSame() {
 +		$storage1 = $this->getTestStorage();
 +		$storage2 = $this->getTestStorage();
 +		$defaultRoot = \OC\Files\Filesystem::getRoot();
 +		\OC\Files\Filesystem::mount($storage1, array(), '/');
 +		\OC\Files\Filesystem::mount($storage2, array(), $defaultRoot . '_substorage');
 +		\OC_Hook::connect('OC_Filesystem', 'post_write', $this, 'dummyHook');
 +
 +		$subView = new \OC\Files\View($defaultRoot . '_substorage');
 +		$this->hookPath = null;
 +
 +		$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);
+ 	}
  }