diff options
author | Christoph Wurst <christoph@winzerhof-wurst.at> | 2022-05-17 18:28:19 +0300 |
---|---|---|
committer | Christoph Wurst <christoph@winzerhof-wurst.at> | 2022-05-17 18:28:19 +0300 |
commit | 5d0fa22b0b0e73e1926a4937847d246fd05eec22 (patch) | |
tree | 019c43c923ad56c06ea608bec38217eb8dffa576 | |
parent | 81fce2c106410e1c23c1f02c4fd08a302a51b664 (diff) |
fixup! Add email validationenhancement/validate-email
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
-rw-r--r-- | apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php | 120 |
1 files changed, 33 insertions, 87 deletions
diff --git a/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php b/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php index 6428652ccab..273ad939144 100644 --- a/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php +++ b/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php @@ -224,99 +224,45 @@ class EmailProviderTest extends AbstractNotificationProviderTest { $message22 = $this->getMessageMock('foo4@example.org', $template2); $message23 = $this->getMessageMock('uid1@example.com', $template2); - $this->mailer->expects($this->at(0)) + $this->mailer->expects(self::exactly(2)) ->method('createEMailTemplate') ->with('dav.calendarReminder') - ->willReturn($template1); - - $this->mailer->expects($this->at(1)) - ->method('validateMailAddress') - ->with('foo1@example.org') - ->willReturn(true); - - $this->mailer->expects($this->at(2)) - ->method('createMessage') - ->with() - ->willReturn($message11); - $this->mailer->expects($this->at(3)) - ->method('send') - ->with($message11) - ->willReturn([]); - $this->mailer->expects($this->at(4)) - ->method('validateMailAddress') - ->with('uid2@example.com') - ->willReturn(true); - $this->mailer->expects($this->at(5)) - ->method('createMessage') - ->with() - ->willReturn($message12); - $this->mailer->expects($this->at(6)) - ->method('send') - ->with($message12) - ->willReturn([]); - - $this->mailer->expects($this->at(7)) + ->willReturnOnConsecutiveCalls( + $template1, + $template2, + ); + $this->mailer->expects($this->atLeastOnce()) ->method('validateMailAddress') - ->with('uid3@example.com') - ->willReturn(true); - - $this->mailer->expects($this->at(8)) - ->method('createMessage') - ->with() - ->willReturn($message13); - $this->mailer->expects($this->at(9)) - ->method('send') - ->with($message13) - ->willReturn([]); - - $this->mailer->expects($this->at(10)) - ->method('validateMailAddress') - ->with('invalid') - ->willReturn(false); - - $this->mailer->expects($this->at(11)) - ->method('createEMailTemplate') - ->with('dav.calendarReminder') - ->willReturn($template2); - - $this->mailer->expects($this->at(12)) - ->method('validateMailAddress') - ->with('foo3@example.org') - ->willReturn(true); - - $this->mailer->expects($this->at(13)) - ->method('createMessage') - ->with() - ->willReturn($message21); - $this->mailer->expects($this->at(14)) - ->method('send') - ->with($message21) - ->willReturn([]); - $this->mailer->expects($this->at(15)) - ->method('validateMailAddress') - ->with('foo4@example.org') - ->willReturn(true); - $this->mailer->expects($this->at(16)) - ->method('createMessage') - ->with() - ->willReturn($message22); - $this->mailer->expects($this->at(17)) - ->method('send') - ->with($message22) - ->willReturn([]); - $this->mailer->expects($this->at(18)) - ->method('validateMailAddress') - ->with('uid1@example.com') - ->willReturn(true); - $this->mailer->expects($this->at(19)) + ->willReturnMap([ + ['foo1@example.org', true], + ['foo3@example.org', true], + ['foo4@example.org', true], + ['uid1@example.com', true], + ['uid2@example.com', true], + ['uid3@example.com', true], + ['invalid', false], + ]); + $this->mailer->expects($this->exactly(6)) ->method('createMessage') ->with() - ->willReturn($message23); - $this->mailer->expects($this->at(20)) + ->willReturnOnConsecutiveCalls( + $message11, + $message12, + $message13, + $message21, + $message22, + $message23, + ); + $this->mailer->expects($this->exactly(6)) ->method('send') - ->with($message23) - ->willReturn([]); - + ->withConsecutive( + [$message11], + [$message12], + [$message13], + [$message21], + [$message22], + [$message23], + )->willReturn([]); $this->setupURLGeneratorMock(2); $vcalendar = $this->getAttendeeVCalendar(); |