mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

removes invalid tests, adapts another one 

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
This commit is contained in:
Arthur Schiwon 2018-01-03 21:44:30 +01:00
parent 4f3d52a364
commit e9eccf34f9
No known key found for this signature in database
GPG Key ID: 7424F1874854DF23
2 changed files with 3 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/user_ldap/tests/User_LDAPTest.php
View File

@ -1343,10 +1343,6 @@ class User_LDAPTest extends TestCase {
} }
return true; return true;
})); }));
$access->userManager->expects($this->atLeastOnce())
->method('get')
->willReturn($this->createMock(User::class));
} }
/** /**
@ -1357,6 +1353,9 @@ class User_LDAPTest extends TestCase {
$access = $this->getAccessMock(); $access = $this->getAccessMock();
$this->prepareAccessForSetPassword($access); $this->prepareAccessForSetPassword($access);
$access->userManager->expects($this->atLeastOnce())
->method('get')
->willReturn($this->createMock(User::class));
$backend = new UserLDAP($access, $this->createMock(IConfig::class), $this->createMock(INotificationManager::class), $this->createMock(Session::class), $this->getDefaultPluginManagerMock()); $backend = new UserLDAP($access, $this->createMock(IConfig::class), $this->createMock(INotificationManager::class), $this->createMock(Session::class), $this->getDefaultPluginManagerMock());
\OC_User::useBackend($backend); \OC_User::useBackend($backend);

33
tests/lib/Files/FilesystemTest.php
View File

@ -368,39 +368,6 @@ class FilesystemTest extends \Test\TestCase {
$this->assertEquals(2, $thrown); $this->assertEquals(2, $thrown);
} }
public function testUserNameCasing() {
$this->logout();
$userId = $this->getUniqueID('user_');
\OC_User::clearBackends();
// needed for loginName2UserName mapping
$userBackend = $this->createMock(\OC\User\Database::class);
\OC::$server->getUserManager()->registerBackend($userBackend);
$userBackend->expects($this->once())
->method('userExists')
->with(strtoupper($userId))
->will($this->returnValue(true));
$userBackend->expects($this->once())
->method('loginName2UserName')
->with(strtoupper($userId))
->will($this->returnValue($userId));
$view = new \OC\Files\View();
$this->assertFalse($view->file_exists('/' . $userId));
\OC\Files\Filesystem::initMountPoints(strtoupper($userId));
list($storage1, $path1) = $view->resolvePath('/' . $userId);
list($storage2, $path2) = $view->resolvePath('/' . strtoupper($userId));
$this->assertTrue($storage1->instanceOfStorage('\OCP\Files\IHomeStorage'));
$this->assertEquals('', $path1);
// not mounted, still on the local root storage
$this->assertEquals(strtoupper($userId), $path2);
}
/** /**
* Tests that the home storage is used for the user's mount point * Tests that the home storage is used for the user's mount point
*/ */