upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-11 01:30:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 79

Merge pull request #32571 from nextcloud/fix/remove-at-matcher-in-files-tests

Browse source 
Remove at() matcher for tests for files app
This commit is contained in:
Carl Schwan 2022-05-24 14:44:02 +02:00 committed by GitHub
commit cc38424179
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/files/tests/Command/DeleteOrphanedFilesTest.php
View file

@ -132,14 +132,12 @@ class DeleteOrphanedFilesTest extends TestCase {
// parent folder, `files`, ´test` and `welcome.txt` => 4 elements
$output
->expects($this->at(0))
->expects($this->exactly(2))
->method('writeln')
->with('3 orphaned file cache entries deleted');
$output
->expects($this->at(1))
->method('writeln')
->with('1 orphaned mount entries deleted');
->withConsecutive(
['3 orphaned file cache entries deleted'],
['1 orphaned mount entries deleted'],
);
$this->command->execute($input, $output);

10
apps/files/tests/Controller/ApiControllerTest.php
View file

@ -201,12 +201,12 @@ class ApiControllerTest extends TestCase {
$mode = 'mtime';
$direction = 'desc';
$this->config->expects($this->at(0))
$this->config->expects($this->exactly(2))
->method('setUserValue')
->with($this->user->getUID(), 'files', 'file_sorting', $mode);
$this->config->expects($this->at(1))
->method('setUserValue')
->with($this->user->getUID(), 'files', 'file_sorting_direction', $direction);
->withConsecutive(
[$this->user->getUID(), 'files', 'file_sorting', $mode],
[$this->user->getUID(), 'files', 'file_sorting_direction', $direction],
);
$expected = new HTTP\Response();
$actual = $this->apiController->updateFileSorting($mode, $direction);

18
apps/files/tests/Controller/ViewControllerTest.php
View file

@ -442,11 +442,11 @@ class ViewControllerTest extends TestCase {
->with('testuser1')
->willReturn($baseFolder);
$baseFolder->expects($this->at(0))
$baseFolder->expects($this->once())
->method('getById')
->with(123)
->willReturn([$node]);
$baseFolder->expects($this->at(1))
$baseFolder->expects($this->once())
->method('getRelativePath')
->with('/testuser1/files/test/sub')
->willReturn('/test/sub');
@ -482,11 +482,11 @@ class ViewControllerTest extends TestCase {
->method('getName')
->willReturn('somefile.txt');
$baseFolder->expects($this->at(0))
$baseFolder->expects($this->once())
->method('getById')
->with(123)
->willReturn([$node]);
$baseFolder->expects($this->at(1))
$baseFolder->expects($this->once())
->method('getRelativePath')
->with('testuser1/files/test')
->willReturn('/test');
@ -508,7 +508,7 @@ class ViewControllerTest extends TestCase {
->with('testuser1')
->willReturn($baseFolder);
$baseFolder->expects($this->at(0))
$baseFolder->expects($this->once())
->method('getById')
->with(123)
->willReturn([]);
@ -537,11 +537,11 @@ class ViewControllerTest extends TestCase {
$baseFolderFiles = $this->getMockBuilder(Folder::class)->getMock();
$baseFolderTrash = $this->getMockBuilder(Folder::class)->getMock();
$this->rootFolder->expects($this->at(0))
$this->rootFolder->expects($this->once())
->method('getUserFolder')
->with('testuser1')
->willReturn($baseFolderFiles);
$this->rootFolder->expects($this->at(1))
$this->rootFolder->expects($this->once())
->method('get')
->with('testuser1/files_trashbin/files/')
->willReturn($baseFolderTrash);
@ -559,11 +559,11 @@ class ViewControllerTest extends TestCase {
->method('getName')
->willReturn('somefile.txt');
$baseFolderTrash->expects($this->at(0))
$baseFolderTrash->expects($this->once())
->method('getById')
->with(123)
->willReturn([$node]);
$baseFolderTrash->expects($this->at(1))
$baseFolderTrash->expects($this->once())
->method('getRelativePath')
->with('testuser1/files_trashbin/files/test.d1462861890/sub')
->willReturn('/test.d1462861890/sub');