Merge pull request #4 from CachetHQ/2.4

Update from upstream repo CachetHQ/Cachet

app/Bus/Handlers/Events/Component/SendComponentUpdateEmailNotificationHandler.php

@@ -15,7 +15,6 @@
 use CachetHQ\Cachet\Models\Component;
 use CachetHQ\Cachet\Models\Subscriber;
 use Illuminate\Contracts\Mail\MailQueue;
-use Illuminate\Mail\Message;
 use McCool\LaravelAutoPresenter\Facades\AutoPresenter;
 
 class SendComponentUpdateEmailNotificationHandler
@@ -111,7 +110,7 @@ public function notify(Component $component, Subscriber $subscriber)
         $this->mailer->queue([
             'html' => 'emails.components.update-html',
             'text' => 'emails.components.update-text',
-        ], $mail, function (Message $message) use ($mail) {
+        ], $mail, function ($message) use ($mail) {
             $message->to($mail['email'])->subject($mail['subject']);
         });
     }

app/Composers/Modules/ComponentsComposer.php

@@ -17,7 +17,7 @@
 use Illuminate\Contracts\View\View;
 
 /**
- * This is the status page composer.
+ * This is the components composer.
  *
  * @author James Brooks <[email protected]>
  * @author Connor S. Parks <[email protected]>
@@ -44,7 +44,7 @@ public function __construct(Guard $guard)
     }
 
     /**
-     * Index page view composer.
+     * Bind data to the view.
      *
      * @param \Illuminate\Contracts\View\View $view
      *

app/Composers/Modules/MetricsComposer.php

@@ -15,6 +15,12 @@
 use Illuminate\Contracts\Config\Repository;
 use Illuminate\Contracts\View\View;
 
+/**
+ * This is the metrics composer.
+ *
+ * @author James Brooks <[email protected]>
+ * @author Connor S. Parks <[email protected]>
+ */
 class MetricsComposer
 {
     /**
@@ -25,7 +31,7 @@ class MetricsComposer
     protected $config;
 
     /**
-     * Create a new metrics composer.
+     * Create a new metrics composer instance.
      *
      * @param \Illuminate\Contracts\Config\Repository $config
      *
@@ -37,7 +43,7 @@ public function __construct(Repository $config)
     }
 
     /**
-     * Metrics view composer.
+     * Bind data to the view.
      *
      * @param \Illuminate\Contracts\View\View $view
      *

app/Composers/Modules/ScheduledComposer.php

@@ -15,15 +15,15 @@
 use Illuminate\Contracts\View\View;
 
 /**
- * This is the status page composer.
+ * This is the scheduled composer.
  *
  * @author James Brooks <[email protected]>
  * @author Connor S. Parks <[email protected]>
  */
 class ScheduledComposer
 {
     /**
-     * Index page view composer.
+     * Bind data to the view.
      *
      * @param \Illuminate\Contracts\View\View $view
      *

app/Composers/Modules/StatusComposer.php

@@ -15,7 +15,7 @@
 use Illuminate\Contracts\View\View;
 
 /**
- * This is the status page composer.
+ * This is the status composer.
  *
  * @author James Brooks <[email protected]>
  * @author Connor S. Parks <[email protected]>
@@ -30,7 +30,7 @@ class StatusComposer
     protected $system;
 
     /**
-     * Create a new status page composer instance.
+     * Create a new status composer instance.
      *
      * @param \CachetHQ\Cachet\Integrations\Contracts\System $system
      *
@@ -42,7 +42,7 @@ public function __construct(System $system)
     }
 
     /**
-     * Index page view composer.
+     * Bind data to the view.
      *
      * @param \Illuminate\Contracts\View\View $view
      *

app/Composers/Modules/StickiedComposer.php

@@ -16,7 +16,7 @@
 use Illuminate\Contracts\View\View;
 
 /**
- * This is the status  page composer.
+ * This is the stickied composer.
  *
  * @author James Brooks <[email protected]>
  * @author Connor S. Parks <[email protected]>
@@ -25,7 +25,7 @@
 class StickiedComposer
 {
     /**
-     * Index page view composer.
+     * Bind data to the view.
      *
      * @param \Illuminate\Contracts\View\View $view
      *

app/Composers/Modules/TimelineComposer.php

@@ -14,15 +14,15 @@
 use Illuminate\Contracts\View\View;
 
 /**
- * This is the status page composer.
+ * This is the timeline composer.
  *
  * @author James Brooks <[email protected]>
  * @author Connor S. Parks <[email protected]>
  */
 class TimelineComposer
 {
     /**
-     * Index page view composer.
+     * Bind data to the view.
      *
      * @param \Illuminate\Contracts\View\View $view
      *

composer.json

@@ -53,7 +53,8 @@
         "mockery/mockery": "0.9.5",
         "phpunit/phpunit": "4.8.21",
         "symfony/css-selector": "^3.0",
-        "symfony/dom-crawler": "^3.0"
+        "symfony/dom-crawler": "^3.0",
+        "tightenco/mailthief": "^0.2.3"
     },
     "autoload": {
         "classmap": [

tests/Bus/Events/Component/ComponentStatusWasUpdatedEventTest.php

@@ -13,6 +13,8 @@
 
 use CachetHQ\Cachet\Bus\Events\Component\ComponentStatusWasUpdatedEvent;
 use CachetHQ\Cachet\Models\Component;
+use Illuminate\Foundation\Testing\DatabaseMigrations;
+use MailThief\Testing\InteractsWithMail;
 
 /**
  * This is the component status was updated event test.
@@ -21,6 +23,31 @@
  */
 class ComponentStatusWasUpdatedEventTest extends AbstractComponentEventTestCase
 {
+    use DatabaseMigrations, InteractsWithMail;
+
+    public function testComponentUpdateEmailWasSent()
+    {
+        $component = factory('CachetHQ\Cachet\Models\Component')->create([
+            'status' => 2,
+        ]);
+
+        $subscriber = factory('CachetHQ\Cachet\Models\Subscriber')->create([
+            'verified_at' => '1970-01-01 00:00:00',
+        ]);
+
+        $subscriber->subscriptions()->create(['component_id' => $component->id]);
+
+        $this->app['events']->fire(new ComponentStatusWasUpdatedEvent($component, 1, 2));
+
+        $this->seeMessageFor($subscriber->email);
+        $this->seeMessageWithSubject(trans('cachet.subscriber.email.component.subject'));
+
+        $message = $this->getMailer()->lastMessage();
+
+        $this->assertTrue($message->contains($component->name));
+        $this->assertTrue($message->contains(trans('cachet.components.status.'.$component->status)));
+    }
+
     protected function objectHasHandlers()
     {
         return true;