diff options
author | François Freitag <mail@franek.fr> | 2021-05-31 22:20:17 +0200 |
---|---|---|
committer | François Freitag <mail@franek.fr> | 2021-05-31 23:13:15 +0200 |
commit | 22d35141f805a6b82f6ea7a3b67d5ec67713bdc2 (patch) | |
tree | 47c5b74b0e764f265801dbef4d2204f59835a696 /apps/dav | |
parent | 4fc002a3a5b78bb7b832829dc9cf2c16f897263b (diff) | |
download | nextcloud-server-22d35141f805a6b82f6ea7a3b67d5ec67713bdc2.tar.gz nextcloud-server-22d35141f805a6b82f6ea7a3b67d5ec67713bdc2.zip |
Rewrite birthday calendar tests without $this->at()
Removes warnings:
```
The at() matcher has been deprecated. It will be removed in PHPUnit 10.
Please refactor your test to not rely on the order in which methods are
invoked.
```
Signed-off-by: François Freitag <mail@franek.fr>
Diffstat (limited to 'apps/dav')
3 files changed, 14 insertions, 16 deletions
diff --git a/apps/dav/tests/unit/CalDAV/BirthdayCalendar/EnablePluginTest.php b/apps/dav/tests/unit/CalDAV/BirthdayCalendar/EnablePluginTest.php index 0e6e76d3927..2978863da88 100644 --- a/apps/dav/tests/unit/CalDAV/BirthdayCalendar/EnablePluginTest.php +++ b/apps/dav/tests/unit/CalDAV/BirthdayCalendar/EnablePluginTest.php @@ -82,7 +82,7 @@ class EnablePluginTest extends TestCase { $plugin = new EnablePlugin($this->config, $this->birthdayService); - $server->expects($this->at(0)) + $server->expects($this->once()) ->method('on') ->with('method:POST', [$plugin, 'httpPost']); @@ -120,11 +120,11 @@ class EnablePluginTest extends TestCase { ->with('/bar/foo') ->willReturn($calendarHome); - $this->request->expects($this->at(0)) + $this->request->expects($this->once()) ->method('getBodyAsString') ->willReturn('<nc:disable-birthday-calendar xmlns:nc="http://nextcloud.com/ns"/>'); - $this->request->expects($this->at(1)) + $this->request->expects($this->once()) ->method('getUrl') ->willReturn('url_abc'); @@ -158,11 +158,11 @@ class EnablePluginTest extends TestCase { ->method('getOwner') ->willReturn('principals/users/BlaBlub'); - $this->request->expects($this->at(0)) + $this->request->expects($this->once()) ->method('getBodyAsString') ->willReturn('<nc:enable-birthday-calendar xmlns:nc="http://nextcloud.com/ns"/>'); - $this->request->expects($this->at(1)) + $this->request->expects($this->once()) ->method('getUrl') ->willReturn('url_abc'); diff --git a/apps/dav/tests/unit/Controller/BirthdayCalendarControllerTest.php b/apps/dav/tests/unit/Controller/BirthdayCalendarControllerTest.php index d1fc2c32f28..f017664238c 100644 --- a/apps/dav/tests/unit/Controller/BirthdayCalendarControllerTest.php +++ b/apps/dav/tests/unit/Controller/BirthdayCalendarControllerTest.php @@ -96,15 +96,13 @@ class BirthdayCalendarControllerTest extends TestCase { $closure($user3); }); - $this->jobList->expects($this->at(0)) + $this->jobList->expects($this->exactly(3)) ->method('add') - ->with(GenerateBirthdayCalendarBackgroundJob::class, ['userId' => 'uid1']); - $this->jobList->expects($this->at(1)) - ->method('add') - ->with(GenerateBirthdayCalendarBackgroundJob::class, ['userId' => 'uid2']); - $this->jobList->expects($this->at(2)) - ->method('add') - ->with(GenerateBirthdayCalendarBackgroundJob::class, ['userId' => 'uid3']); + ->withConsecutive( + [GenerateBirthdayCalendarBackgroundJob::class, ['userId' => 'uid1']], + [GenerateBirthdayCalendarBackgroundJob::class, ['userId' => 'uid2']], + [GenerateBirthdayCalendarBackgroundJob::class, ['userId' => 'uid3']], + ); $response = $this->controller->enable(); $this->assertInstanceOf('OCP\AppFramework\Http\JSONResponse', $response); diff --git a/apps/dav/tests/unit/Migration/RegenerateBirthdayCalendarsTest.php b/apps/dav/tests/unit/Migration/RegenerateBirthdayCalendarsTest.php index 52c99fad2ee..639708c57ff 100644 --- a/apps/dav/tests/unit/Migration/RegenerateBirthdayCalendarsTest.php +++ b/apps/dav/tests/unit/Migration/RegenerateBirthdayCalendarsTest.php @@ -62,7 +62,7 @@ class RegenerateBirthdayCalendarsTest extends TestCase { } public function testRun() { - $this->config->expects($this->at(0)) + $this->config->expects($this->once()) ->method('getAppValue') ->with('dav', 'regeneratedBirthdayCalendarsForYearFix') ->willReturn(null); @@ -72,11 +72,11 @@ class RegenerateBirthdayCalendarsTest extends TestCase { ->method('info') ->with('Adding background jobs to regenerate birthday calendar'); - $this->jobList->expects($this->at(0)) + $this->jobList->expects($this->once()) ->method('add') ->with(RegisterRegenerateBirthdayCalendars::class); - $this->config->expects($this->at(1)) + $this->config->expects($this->once()) ->method('setAppValue') ->with('dav', 'regeneratedBirthdayCalendarsForYearFix', 'yes'); |