[Pkg-owncloud-commits] [owncloud] 47/123: fixing test

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit 9727386d8b343b9ab2db7604cee012e359c2c9ad
Author: Clark Tomlinson <fallen013 at gmail.com>
Date:   Mon May 11 09:38:23 2015 -0400

    fixing test
---
 tests/settings/controller/userscontrollertest.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/settings/controller/userscontrollertest.php b/tests/settings/controller/userscontrollertest.php
index 25c935b..0e34de9 100644
--- a/tests/settings/controller/userscontrollertest.php
+++ b/tests/settings/controller/userscontrollertest.php
@@ -1303,14 +1303,14 @@ class UsersControllerTest extends \Test\TestCase {
 			->expects($this->once())
 			->method('isEnabledForUser')
 			->with(
-				$this->equalTo('files_encryption')
+				$this->equalTo('encryption')
 			)
 			->will($this->returnValue(true));
 		$this->container['Config']
 			->expects($this->once())
 			->method('getAppValue')
 			->with(
-				$this->equalTo('files_encryption'),
+				$this->equalTo('encryption'),
 				$this->equalTo('recoveryAdminEnabled'),
 				$this->anything()
 			)
@@ -1321,8 +1321,8 @@ class UsersControllerTest extends \Test\TestCase {
 			->method('getUserValue')
 			->with(
 				$this->anything(),
-				$this->equalTo('files_encryption'),
-				$this->equalTo('recovery_enabled'),
+				$this->equalTo('encryption'),
+				$this->equalTo('recoveryEnabled'),
 				$this->anything()
 			)
 			->will($this->returnValue('1'));
@@ -1339,7 +1339,7 @@ class UsersControllerTest extends \Test\TestCase {
 		$this->container['OCP\\App\\IAppManager']
 			->method('isEnabledForUser')
 			->with(
-				$this->equalTo('files_encryption')
+				$this->equalTo('encryption')
 			)
 			->will($this->returnValue(true));
 
@@ -1358,14 +1358,14 @@ class UsersControllerTest extends \Test\TestCase {
 			->expects($this->once())
 			->method('isEnabledForUser')
 			->with(
-				$this->equalTo('files_encryption')
+				$this->equalTo('encryption')
 			)
 			->will($this->returnValue(true));
 		$this->container['Config']
 			->expects($this->once())
 			->method('getAppValue')
 			->with(
-				$this->equalTo('files_encryption'),
+				$this->equalTo('encryption'),
 				$this->equalTo('recoveryAdminEnabled'),
 				$this->anything()
 			)
@@ -1376,8 +1376,8 @@ class UsersControllerTest extends \Test\TestCase {
 			->method('getUserValue')
 			->with(
 				$this->anything(),
-				$this->equalTo('files_encryption'),
-				$this->equalTo('recovery_enabled'),
+				$this->equalTo('encryption'),
+				$this->equalTo('recoveryEnabled'),
 				$this->anything()
 			)
 			->will($this->returnValue('0'));

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git