From 38a260e963abd04b75aff8d67a8cf7b3b20a9c67 Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Thu, 17 Sep 2015 10:24:19 +0100
Subject: Revert "Implement more fine-grained external storage permissions
 model"

This reverts commit 0b97a05e7bd631d66de1c2aee115113ada8a5f63.
This reverts commit d2e3c17c0000bc0020f1ff641190452f370434de.
This reverts commit cc88c5f4b84da57c425cbdb7dc8b391b1942b503.
---
 .../tests/controller/storagescontrollertest.php          | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'apps/files_external/tests/controller/storagescontrollertest.php')

diff --git a/apps/files_external/tests/controller/storagescontrollertest.php b/apps/files_external/tests/controller/storagescontrollertest.php
index c43761f3bcb..5e1deb821f4 100644
--- a/apps/files_external/tests/controller/storagescontrollertest.php
+++ b/apps/files_external/tests/controller/storagescontrollertest.php
@@ -75,12 +75,12 @@ abstract class StoragesControllerTest extends \Test\TestCase {
 		$authMech = $this->getAuthMechMock();
 		$authMech->method('validateStorage')
 			->willReturn(true);
-		$authMech->method('isPermitted')
+		$authMech->method('isVisibleFor')
 			->willReturn(true);
 		$backend = $this->getBackendMock();
 		$backend->method('validateStorage')
 			->willReturn(true);
-		$backend->method('isPermitted')
+		$backend->method('isVisibleFor')
 			->willReturn(true);
 
 		$storageConfig = new StorageConfig(1);
@@ -116,12 +116,12 @@ abstract class StoragesControllerTest extends \Test\TestCase {
 		$authMech = $this->getAuthMechMock();
 		$authMech->method('validateStorage')
 			->willReturn(true);
-		$authMech->method('isPermitted')
+		$authMech->method('isVisibleFor')
 			->willReturn(true);
 		$backend = $this->getBackendMock();
 		$backend->method('validateStorage')
 			->willReturn(true);
-		$backend->method('isPermitted')
+		$backend->method('isVisibleFor')
 			->willReturn(true);
 
 		$storageConfig = new StorageConfig(1);
@@ -249,12 +249,12 @@ abstract class StoragesControllerTest extends \Test\TestCase {
 		$authMech = $this->getAuthMechMock();
 		$authMech->method('validateStorage')
 			->willReturn(true);
-		$authMech->method('isPermitted')
+		$authMech->method('isVisibleFor')
 			->willReturn(true);
 		$backend = $this->getBackendMock();
 		$backend->method('validateStorage')
 			->willReturn(true);
-		$backend->method('isPermitted')
+		$backend->method('isVisibleFor')
 			->willReturn(true);
 
 		$storageConfig = new StorageConfig(255);
@@ -338,13 +338,13 @@ abstract class StoragesControllerTest extends \Test\TestCase {
 		$backend = $this->getBackendMock();
 		$backend->method('validateStorage')
 			->willReturn($backendValidate);
-		$backend->method('isPermitted')
+		$backend->method('isVisibleFor')
 			->willReturn(true);
 
 		$authMech = $this->getAuthMechMock();
 		$authMech->method('validateStorage')
 			->will($this->returnValue($authMechValidate));
-		$authMech->method('isPermitted')
+		$authMech->method('isVisibleFor')
 			->willReturn(true);
 
 		$storageConfig = new StorageConfig();
-- 
cgit v1.2.3