adjust tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
This commit is contained in:
parent
3fa13e791e
commit
9e76d4049a
|
@ -82,7 +82,7 @@ class LookupPlugin implements ISearchPlugin {
|
||||||
foreach ($body as $lookup) {
|
foreach ($body as $lookup) {
|
||||||
$remote = $this->cloudIdManager->resolveCloudId($lookup['federationId'])->getRemote();
|
$remote = $this->cloudIdManager->resolveCloudId($lookup['federationId'])->getRemote();
|
||||||
if ($this->currentUserRemote === $remote) continue;
|
if ($this->currentUserRemote === $remote) continue;
|
||||||
$name = $lookup['name']['value'];
|
$name = isset($lookup['name']['value']) ? $lookup['name']['value'] : '';
|
||||||
$label = empty($name) ? $lookup['federationId'] : $name . ' (' . $lookup['federationId'] . ')';
|
$label = empty($name) ? $lookup['federationId'] : $name . ' (' . $lookup['federationId'] . ')';
|
||||||
$result[] = [
|
$result[] = [
|
||||||
'label' => $label,
|
'label' => $label,
|
||||||
|
|
|
@ -25,12 +25,17 @@ namespace Test\Collaboration\Collaborators;
|
||||||
|
|
||||||
|
|
||||||
use OC\Collaboration\Collaborators\LookupPlugin;
|
use OC\Collaboration\Collaborators\LookupPlugin;
|
||||||
|
use OC\Federation\CloudId;
|
||||||
use OCP\Collaboration\Collaborators\ISearchResult;
|
use OCP\Collaboration\Collaborators\ISearchResult;
|
||||||
use OCP\Collaboration\Collaborators\SearchResultType;
|
use OCP\Collaboration\Collaborators\SearchResultType;
|
||||||
|
use OCP\Federation\ICloudId;
|
||||||
|
use OCP\Federation\ICloudIdManager;
|
||||||
use OCP\Http\Client\IClient;
|
use OCP\Http\Client\IClient;
|
||||||
use OCP\Http\Client\IClientService;
|
use OCP\Http\Client\IClientService;
|
||||||
use OCP\Http\Client\IResponse;
|
use OCP\Http\Client\IResponse;
|
||||||
use OCP\IConfig;
|
use OCP\IConfig;
|
||||||
|
use OCP\IUser;
|
||||||
|
use OCP\IUserSession;
|
||||||
use OCP\Share;
|
use OCP\Share;
|
||||||
use Test\TestCase;
|
use Test\TestCase;
|
||||||
|
|
||||||
|
@ -40,16 +45,36 @@ class LookupPluginTest extends TestCase {
|
||||||
protected $config;
|
protected $config;
|
||||||
/** @var IClientService|\PHPUnit_Framework_MockObject_MockObject */
|
/** @var IClientService|\PHPUnit_Framework_MockObject_MockObject */
|
||||||
protected $clientService;
|
protected $clientService;
|
||||||
|
/** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */
|
||||||
|
protected $userSession;
|
||||||
|
/** @var ICloudIdManager|\PHPUnit_Framework_MockObject_MockObject */
|
||||||
|
protected $cloudIdManager;
|
||||||
/** @var LookupPlugin */
|
/** @var LookupPlugin */
|
||||||
protected $plugin;
|
protected $plugin;
|
||||||
|
|
||||||
public function setUp() {
|
public function setUp() {
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
|
|
||||||
|
$this->userSession = $this->createMock(IUserSession::class);
|
||||||
|
$this->cloudIdManager = $this->createMock(ICloudIdManager::class);
|
||||||
$this->config = $this->createMock(IConfig::class);
|
$this->config = $this->createMock(IConfig::class);
|
||||||
$this->clientService = $this->createMock(IClientService::class);
|
$this->clientService = $this->createMock(IClientService::class);
|
||||||
|
$cloudId = $this->createMock(ICloudId::class);
|
||||||
|
$cloudId->expects($this->any())->method('getRemote')->willReturn('myNextcloud.net');
|
||||||
|
$user = $this->createMock(IUser::class);
|
||||||
|
$user->expects($this->any())->method('getCloudId')->willReturn('user@myNextcloud.net');
|
||||||
|
$this->userSession->expects($this->any())->method('getUser')
|
||||||
|
->willReturn($user);
|
||||||
|
$this->cloudIdManager->expects($this->any())->method('resolveCloudId')
|
||||||
|
->willReturnCallback(function($cloudId) {
|
||||||
|
if ($cloudId === 'user@myNextcloud.net') {
|
||||||
|
return new CloudId('user@myNextcloud.net', 'user', 'myNextcloud.net');
|
||||||
|
}
|
||||||
|
return new CloudId('user@someNextcloud.net', 'user', 'someNextcloud.net');
|
||||||
|
});
|
||||||
|
|
||||||
$this->plugin = new LookupPlugin($this->config, $this->clientService);
|
|
||||||
|
$this->plugin = new LookupPlugin($this->config, $this->clientService, $this->userSession, $this->cloudIdManager);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -69,7 +94,11 @@ class LookupPluginTest extends TestCase {
|
||||||
->method('getAppValue')
|
->method('getAppValue')
|
||||||
->with('files_sharing', 'lookupServerEnabled', 'no')
|
->with('files_sharing', 'lookupServerEnabled', 'no')
|
||||||
->willReturn('yes');
|
->willReturn('yes');
|
||||||
$this->config->expects($this->once())
|
$this->config->expects($this->at(0))
|
||||||
|
->method('getSystemValue')
|
||||||
|
->with('gs.enabled', false)
|
||||||
|
->willReturn(false);
|
||||||
|
$this->config->expects($this->at(2))
|
||||||
->method('getSystemValue')
|
->method('getSystemValue')
|
||||||
->with('lookup_server', 'https://lookup.nextcloud.com')
|
->with('lookup_server', 'https://lookup.nextcloud.com')
|
||||||
->willReturn($searchParams['server']);
|
->willReturn($searchParams['server']);
|
||||||
|
|
Loading…
Reference in New Issue