2 files changed, 0 insertions, 117 deletions
diff --git a/apps/files/tests/ajax_rename.php b/apps/files/tests/ajax_rename.php
index cb62d22a7e2..74ca1e4495d 100644
--- a/apps/files/tests/ajax_rename.php
+++ b/apps/files/tests/ajax_rename.php
@@ -56,88 +56,6 @@ class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
-	 * @brief test rename of file/folder named "Shared"
-	 */
-	function testRenameSharedFolder() {
-		$dir = '/';
-		$oldname = 'Shared';
-		$newname = 'new_name';
-
-		$this->viewMock->expects($this->at(0))
-			->method('file_exists')
-			->with('/')
-			->will($this->returnValue(true));
-
-		$result = $this->files->rename($dir, $oldname, $newname);
-		$expected = array(
-			'success'	=> false,
-			'data'		=> array('message' => '%s could not be renamed')
-		);
-
-		$this->assertEquals($expected, $result);
-	}
-
-	/**
-	 * @brief test rename of file/folder named "Shared"
-	 */
-	function testRenameSharedFolderInSubdirectory() {
-		$dir = '/test';
-		$oldname = 'Shared';
-		$newname = 'new_name';
-
-		$this->viewMock->expects($this->at(0))
-			->method('file_exists')
-			->with('/test')
-			->will($this->returnValue(true));
-
-		$this->viewMock->expects($this->any())
-			->method('getFileInfo')
-			->will($this->returnValue(new \OC\Files\FileInfo(
-				'/test',
-				null,
-				'/test',	
-				array(
-				'fileid' => 123,
-				'type' => 'dir',
-				'mimetype' => 'httpd/unix-directory',
-				'mtime' => 0,
-				'permissions' => 31,
-				'size' => 18,
-				'etag' => 'abcdef',
-				'directory' => '/',
-				'name' => 'new_name',
-			))));
-
-		$result = $this->files->rename($dir, $oldname, $newname);
-
-		$this->assertTrue($result['success']);
-		$this->assertEquals(123, $result['data']['id']);
-		$this->assertEquals('new_name', $result['data']['name']);
-		$this->assertEquals(18, $result['data']['size']);
-		$this->assertEquals('httpd/unix-directory', $result['data']['mimetype']);
-		$icon = \OC_Helper::mimetypeIcon('dir');
-		$icon = substr($icon, 0, -3) . 'svg';
-		$this->assertEquals($icon, $result['data']['icon']);
-	}
-
-	/**
-	 * @brief test rename of file/folder to "Shared"
-	 */
-	function testRenameFolderToShared() {
-		$dir = '/';
-		$oldname = 'oldname';
-		$newname = 'Shared';
-
-		$result = $this->files->rename($dir, $oldname, $newname);
-		$expected = array(
-			'success'	=> false,
-			'data'		=> array('message' => "Invalid folder name. Usage of 'Shared' is reserved.")
-		);
-
-		$this->assertEquals($expected, $result);
-	}
-
-	/**
 	 * @brief test rename of file/folder
 	 */
 	function testRenameFolder() {
diff --git a/apps/files/tests/js/filesSpec.js b/apps/files/tests/js/filesSpec.js
index 95bf87e03ec..018c8ef0f3c 100644
--- a/apps/files/tests/js/filesSpec.js
+++ b/apps/files/tests/js/filesSpec.js
@@ -48,41 +48,6 @@ describe('Files tests', function() {
 				expect(error).toEqual(false);
 			}
 		});
-		it('Validates correct file names do not create Shared folder in root', function() {
-			// create shared file in subfolder
-			var error = false;
-			try {
-				expect(Files.isFileNameValid('shared', '/foo')).toEqual(true);
-				expect(Files.isFileNameValid('Shared', '/foo')).toEqual(true);
-			}
-			catch (e) {
-				error = e;
-			}
-			expect(error).toEqual(false);
-
-			// create shared file in root
-			var threwException = false;
-			try {
-				Files.isFileNameValid('Shared', '/');
-				console.error('Invalid file name not detected');
-			}
-			catch (e) {
-				threwException = true;
-			}
-			expect(threwException).toEqual(true);
-
-			// create shared file in root
-			var threwException = false;
-			try {
-				Files.isFileNameValid('shared', '/');
-				console.error('Invalid file name not detected');
-			}
-			catch (e) {
-				threwException = true;
-			}
-			expect(threwException).toEqual(true);
-
-		});
 		it('Detects invalid file names', function() {
 			var fileNames = [
 				'',