fix: test all options

mikaelkael · mikaelkael · commit 108e9b42ddef · 2023-04-24T17:14:29.000+02:00
diff --git a/src/Symfony/Component/Notifier/Bridge/Ntfy/NtfyOptions.php b/src/Symfony/Component/Notifier/Bridge/Ntfy/NtfyOptions.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Notifier\Bridge\Ntfy;
 
+use Symfony\Component\Notifier\Exception\LogicException;
 use Symfony\Component\Notifier\Message\MessageOptionsInterface;
 use Symfony\Component\Notifier\Notification\Notification;
 
@@ -104,7 +105,11 @@ public function setTags(array $tags): self
 
     public function setDelay(\DateTimeInterface $dateTime): self
     {
-        $this->options['delay'] = $dateTime->getTimestamp();
+        if ($dateTime > (new \DateTime())) {
+            $this->options['delay'] = (string) $dateTime->getTimestamp();
+        } else {
+            throw new LogicException('Delayed date must be defined in the future.');
+        }
 
         return $this;
     }
@@ -151,21 +156,25 @@ public function setEmail(string $email): self
         return $this;
     }
 
-    public function setCache(bool $enable)
+    public function setCache(bool $enable): self
     {
         if (!$enable) {
             $this->options['cache'] = 'no';
         } else {
             unset($this->options['cache']);
         }
+
+        return $this;
     }
 
-    public function setFirebase(bool $enable)
+    public function setFirebase(bool $enable): self
     {
         if (!$enable) {
             $this->options['firebase'] = 'no';
         } else {
             unset($this->options['firebase']);
         }
+
+        return $this;
     }
 }
diff --git a/src/Symfony/Component/Notifier/Bridge/Ntfy/Tests/NtfyOptionsTest.php b/src/Symfony/Component/Notifier/Bridge/Ntfy/Tests/NtfyOptionsTest.php
@@ -21,12 +21,40 @@ class NtfyOptionsTest extends TestCase
 {
     public function testNtfyOptions()
     {
+        $delay = (new \DateTime())->add(new \DateInterval('PT1M'));
         $ntfyOptions = (new NtfyOptions())
             ->setMessage('test message')
+            ->setTitle('message title')
+            ->setPriority(NtfyOptions::PRIORITY_URGENT)
+            ->setTags(['tag1', 'tag2'])
+            ->addTag('tag3')
+            ->setDelay($delay)
+            ->setActions([['action' => 'view', 'label' => 'View', 'url' => 'https://test.com']])
+            ->addAction(['action' => 'http', 'label' => 'Open', 'url' => 'https://test2.com'])
+            ->setClick('https://test3.com')
+            ->setAttachment('https://filesrv.lan/space.jpg')
+            ->setFilename('diskspace.jpg')
+            ->setEmail('me@mail.com')
+            ->setCache(false)
+            ->setFirebase(false)
         ;
 
         $this->assertSame([
             'message' => 'test message',
+            'title' => 'message title',
+            'priority' => NtfyOptions::PRIORITY_URGENT,
+            'tags' => ['tag1', 'tag2', 'tag3'],
+            'delay' => (string) $delay->getTimestamp(),
+            'actions' => [
+                ['action' => 'view', 'label' => 'View', 'url' => 'https://test.com'],
+                ['action' => 'http', 'label' => 'Open', 'url' => 'https://test2.com']
+            ],
+            'click' => 'https://test3.com',
+            'attach' => 'https://filesrv.lan/space.jpg',
+            'filename' => 'diskspace.jpg',
+            'email' => 'me@mail.com',
+            'cache' => 'no',
+            'firebase' => 'no'
         ], $ntfyOptions->toArray());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Notifier\Bridge\Ntfy;`
`13`	`13`
	`14`	`+use Symfony\Component\Notifier\Exception\LogicException;`
`14`	`15`	`use Symfony\Component\Notifier\Message\MessageOptionsInterface;`
`15`	`16`	`use Symfony\Component\Notifier\Notification\Notification;`
`16`	`17`
`@@ -104,7 +105,11 @@ public function setTags(array $tags): self`
`104`	`105`
`105`	`106`	`public function setDelay(\DateTimeInterface $dateTime): self`
`106`	`107`	`{`
`107`		`- $this->options['delay'] = $dateTime->getTimestamp();`
	`108`	`+ if ($dateTime > (new \DateTime())) {`
	`109`	`+ $this->options['delay'] = (string) $dateTime->getTimestamp();`
	`110`	`+ } else {`
	`111`	`+ throw new LogicException('Delayed date must be defined in the future.');`
	`112`	`+ }`
`108`	`113`
`109`	`114`	`return $this;`
`110`	`115`	`}`
`@@ -151,21 +156,25 @@ public function setEmail(string $email): self`
`151`	`156`	`return $this;`
`152`	`157`	`}`
`153`	`158`
`154`		`- public function setCache(bool $enable)`
	`159`	`+ public function setCache(bool $enable): self`
`155`	`160`	`{`
`156`	`161`	`if (!$enable) {`
`157`	`162`	`$this->options['cache'] = 'no';`
`158`	`163`	`} else {`
`159`	`164`	`unset($this->options['cache']);`
`160`	`165`	`}`
	`166`	`+`
	`167`	`+ return $this;`
`161`	`168`	`}`
`162`	`169`
`163`		`- public function setFirebase(bool $enable)`
	`170`	`+ public function setFirebase(bool $enable): self`
`164`	`171`	`{`
`165`	`172`	`if (!$enable) {`
`166`	`173`	`$this->options['firebase'] = 'no';`
`167`	`174`	`} else {`
`168`	`175`	`unset($this->options['firebase']);`
`169`	`176`	`}`
	`177`	`+`
	`178`	`+ return $this;`
`170`	`179`	`}`
`171`	`180`	`}`