Can now also test event code.

app/Handlers/Events/UserEventHandler.php

@@ -16,8 +16,8 @@ namespace FireflyIII\Handlers\Events;
 use FireflyIII\Events\RegisteredUser;
 use FireflyIII\Events\RequestedNewPassword;
 use FireflyIII\Mail\RegisteredUser as RegisteredUserMail;
+use FireflyIII\Mail\RequestedNewPassword as RequestedNewPasswordMail;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
-use Illuminate\Mail\Message;
 use Log;
 use Mail;
 use Swift_TransportException;
@@ -69,14 +69,12 @@ class UserEventHandler
 
         // send email.
         try {
-            Mail::send(
-                ['emails.password-html', 'emails.password-text'], ['url' => $url, 'ip' => $ipAddress], function (Message $message) use ($email) {
-                $message->to($email, $email)->subject('Your password reset request');
-            }
-            );
+            Mail::to($email)->send(new RequestedNewPasswordMail($url, $ipAddress));
+            // @codeCoverageIgnoreStart
         } catch (Swift_TransportException $e) {
             Log::error($e->getMessage());
         }
+        // @codeCoverageIgnoreEnd
 
         return true;
     }
@@ -94,7 +92,7 @@ class UserEventHandler
 
         $sendMail = env('SEND_REGISTRATION_MAIL', true);
         if (!$sendMail) {
-            return true;
+            return true; // @codeCoverageIgnore
         }
         // get the email address
         $email     = $event->user->email;
@@ -103,12 +101,12 @@ class UserEventHandler
 
         // send email.
         try {
-
-            Mail::to($email)
-                ->send(new RegisteredUserMail($address, $ipAddress));
+            Mail::to($email)->send(new RegisteredUserMail($address, $ipAddress));
+            // @codeCoverageIgnoreStart
         } catch (Swift_TransportException $e) {
             Log::error($e->getMessage());
         }
+        // @codeCoverageIgnoreEnd
 
         return true;
     }

app/Mail/RequestedNewPassword.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace FireflyIII\Mail;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Mail\Mailable;
+use Illuminate\Queue\SerializesModels;
+
+class RequestedNewPassword extends Mailable
+{
+    use Queueable, SerializesModels;
+    /** @var  string */
+    public $ip;
+    /** @var  string */
+    public $url;
+
+    /**
+     * RequestedNewPassword constructor.
+     *
+     * @param string $url
+     * @param string $ip
+     */
+    public function __construct(string $url, string $ip)
+    {
+        $this->url = $url;
+        $this->ip  = $ip;
+    }
+
+    /**
+     * Build the message.
+     *
+     * @return $this
+     */
+    public function build()
+    {
+        return $this->view('emails.password-html')->text('emails.password-text')->subject('Your password reset request');
+    }
+}