Fixed user email change test by switching Mailer DI in email confirma…

…tion job to use of Mail facade
spira · Jan 13, 2016 · ff8be1a · ff8be1a
1 parent 8231519
commit ff8be1a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/api/app/Jobs/SendEmailConfirmationEmail.php b/api/app/Jobs/SendEmailConfirmationEmail.php
@@ -11,12 +11,12 @@
 namespace App\Jobs;
 
 use App\Models\User;
-use Illuminate\Contracts\Mail\Mailer;
-use Illuminate\Contracts\Bus\SelfHandling;
-use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Message;
+use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Config;
+use Illuminate\Contracts\Queue\ShouldQueue;
 
-class SendEmailConfirmationEmail extends Job implements SelfHandling, ShouldQueue
+class SendEmailConfirmationEmail extends Job implements ShouldQueue
 {
     /**
      * User to email.
@@ -49,10 +49,10 @@ class SendEmailConfirmationEmail extends Job implements SelfHandling, ShouldQueu
     /**
      * Create a new job instance.
      *
-     * @param  User    $user
-     * @param  string  $email
-     * @param  string  $token
-     * @return void
+     * @param  User $user
+     * @param  string $email
+     * @param $emailConfirmToken
+     * @param $loginToken
      */
     public function __construct(User $user, $email, $emailConfirmToken, $loginToken)
     {
@@ -65,16 +65,15 @@ public function __construct(User $user, $email, $emailConfirmToken, $loginToken)
     /**
      * Execute the job.
      *
-     * @param  Mailer  $mailer
      * @return void
      */
-    public function handle(Mailer $mailer)
+    public function handle()
     {
-        $mailer->send('emails.emailConfirmation', [
+        Mail::send('emails.emailConfirmation', [
             'user' => $this->user,
             'email' => $this->email,
             'emailConfirmationRedirectionUrl' => Config::get('hosts.app').'/profile?emailConfirmationToken='.$this->emailConfirmToken.'&loginToken='.$this->loginToken,
-        ], function ($m) {
+        ], function (Message $m) {
 
             $m->to($this->email, $this->user->full_name)
                 ->subject('Confirm Your Email');

diff --git a/api/app/Jobs/SendPasswordResetEmail.php b/api/app/Jobs/SendPasswordResetEmail.php
@@ -12,9 +12,9 @@
 
 use App\Models\User;
 use Illuminate\Mail\Message;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Mail;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Contracts\Queue\ShouldQueue;
 
 class SendPasswordResetEmail extends Job implements ShouldQueue
 {

diff --git a/api/tests/integration/UserTest.php b/api/tests/integration/UserTest.php
@@ -437,8 +437,6 @@ public function testResetPasswordMailInvalidEmail()
 
     public function testChangeEmail()
     {
-        $this->markTestIncomplete('Fix mailer issues');
-
         $this->clearMessages();
         $user = $this->createUser();
         // Ensure that the current email is considered confirmed.