From: Björn Schießle <bjoern@schiessle.org>
Date: Mon, 3 Nov 2014 11:53:14 +0000 (+0100)
Subject: Merge pull request #11825 from owncloud/fix_rename_files_in_shared_folder
X-Git-Tag: v8.0.0alpha1~392
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=79b650a0238089a935073c1ebe7e33fd7a0c52a4;p=nextcloud-server.git

Merge pull request #11825 from owncloud/fix_rename_files_in_shared_folder

move versions if a file was renamed in a shared folder
---

79b650a0238089a935073c1ebe7e33fd7a0c52a4
diff --cc apps/files_versions/tests/versions.php
index 4909d0606b1,761cc07d9fc..a3b8595a34b
--- a/apps/files_versions/tests/versions.php
+++ b/apps/files_versions/tests/versions.php
@@@ -30,11 -30,9 +30,12 @@@ require_once __DIR__ . '/../lib/version
  class Test_Files_Versioning extends \PHPUnit_Framework_TestCase {
  
  	const TEST_VERSIONS_USER = 'test-versions-user';
+ 	const TEST_VERSIONS_USER2 = 'test-versions-user2';
  	const USERS_VERSIONS_ROOT = '/test-versions-user/files_versions';
  
 +	/**
 +	 * @var \OC\Files\View
 +	 */
  	private $rootView;
  
  	public static function setUpBeforeClass() {