diff options
author | Carl Schwan <carl@carlschwan.eu> | 2022-05-24 15:44:02 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-24 15:44:02 +0300 |
commit | cc38424179ff0fe0629e71a834a697250549ae89 (patch) | |
tree | a3dd0e34309225d61687118115b5eafa5af850d5 /apps | |
parent | 45a75c631e638ccab8934584aedad834229d10a7 (diff) | |
parent | 4dfc839f870908155b0617624f968f4849eebb91 (diff) |
Merge pull request #32571 from nextcloud/fix/remove-at-matcher-in-files-tests
Remove at() matcher for tests for files app
Diffstat (limited to 'apps')
-rw-r--r-- | apps/files/tests/Command/DeleteOrphanedFilesTest.php | 12 | ||||
-rw-r--r-- | apps/files/tests/Controller/ApiControllerTest.php | 10 | ||||
-rw-r--r-- | apps/files/tests/Controller/ViewControllerTest.php | 18 |
3 files changed, 19 insertions, 21 deletions
diff --git a/apps/files/tests/Command/DeleteOrphanedFilesTest.php b/apps/files/tests/Command/DeleteOrphanedFilesTest.php index bf266bc8229..520d3278e64 100644 --- a/apps/files/tests/Command/DeleteOrphanedFilesTest.php +++ b/apps/files/tests/Command/DeleteOrphanedFilesTest.php @@ -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); diff --git a/apps/files/tests/Controller/ApiControllerTest.php b/apps/files/tests/Controller/ApiControllerTest.php index 73728bd6a4a..64c70fb2de6 100644 --- a/apps/files/tests/Controller/ApiControllerTest.php +++ b/apps/files/tests/Controller/ApiControllerTest.php @@ -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); diff --git a/apps/files/tests/Controller/ViewControllerTest.php b/apps/files/tests/Controller/ViewControllerTest.php index cebb50860d3..38f3670d4ca 100644 --- a/apps/files/tests/Controller/ViewControllerTest.php +++ b/apps/files/tests/Controller/ViewControllerTest.php @@ -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'); |