Merge pull request spinen#44 from spinen/develop

Merge 0.3.4 into master

Author: ssfinney

VERSION

@@ -1 +1 @@
-0.3.0
+0.3.4

readme.md

@@ -5,7 +5,7 @@ NOTE: This is based off a video titled ["Testing Email With Custom Assertions"](
 [![Latest Stable Version](https://poser.pugx.org/spinen/laravel-mail-assertions/v/stable)](https://packagist.org/packages/spinen/laravel-mail-assertions)
 [![Total Downloads](https://poser.pugx.org/spinen/laravel-mail-assertions/downloads)](https://packagist.org/packages/spinen/laravel-mail-assertions)
 [![Latest Unstable Version](https://poser.pugx.org/spinen/laravel-mail-assertions/v/unstable)](https://packagist.org/packages/spinen/laravel-mail-assertions#dev-master)
-[![Dependency Status](https://gemnasium.com/spinen/laravel-mail-assertions.png)](https://gemnasium.com/spinen/laravel-mail-assertions)
+[![Dependency Status](https://gemnasium.com/spinen/laravel-mail-assertions.svg)](https://gemnasium.com/spinen/laravel-mail-assertions)
 [![License](https://poser.pugx.org/spinen/laravel-mail-assertions/license)](https://packagist.org/packages/spinen/laravel-mail-assertions)
 
 PHPUnit mail assertions for testing email in Laravel.

src/MailTracking.php

@@ -60,7 +60,7 @@ public function setUpMailTracking()
             return;
         }
 
-        // For PhpUnit 6 and Laravel > 5.1, register the plugin after the app is booted
+        // For PhpUnit 6 and Laravel > 5.2, register the plugin after the app is booted
         $this->afterApplicationCreated(function () use ($register_plugin) {
             $register_plugin();
         });

tests/MailRecorderTest.php

@@ -51,9 +51,6 @@ public function it_cannot_be_constructed_without_a_PHPUnit_Framework_TestCase()
      */
     public function it_cannot_be_constructed_with_class_other_than_a_PHPUnit_Framework_TestCase()
     {
-        // TODO: Skipping this until resolving PhpUnit 6 vs. 7 support
-        $this->markTestSkipped();
-
         if (class_exists(TypeError::class)) {
             try {
                 new MailRecorder(new StdClass());

tests/MailTrackingTest.php

@@ -6,6 +6,7 @@
 use Mockery;
 use ReflectionClass;
 use Spinen\MailAssertions\Stubs\MailTrackingStub as MailTracking;
+use Spinen\MailAssertions\Stubs\OldMailTrackingStub as OldMailTracking;
 use Swift_Mailer;
 use Swift_Message;
 
@@ -115,6 +116,33 @@ public function it_registers_MailRecorder_withMail_in_the_setup_with_before_anno
         $this->mail_tracking->setUpMailTracking();
     }
 
+    /**
+     * @test
+     * @group unit
+     */
+    public function it_registers_MailRecorder_without_afterApplicationCreated_method_present()
+    {
+        // Use a version of the MailTrackingStub without the afterApplicationCreated method
+        $this->mail_tracking = new OldMailTracking();
+
+        $swift_mock = Mockery::mock(Swift_Mailer::class);
+
+        $swift_mock->shouldReceive('registerPlugin')
+                   ->once()
+                   ->with(Mockery::on(function($closure) {
+                       return is_a($closure, MailRecorder::class);
+                   }))
+                   ->andReturnNull();
+
+        Mail::shouldReceive('getSwiftMailer')
+            ->once()
+            ->withNoArgs()
+            ->andReturn($swift_mock);
+
+        // TODO: Get this method name by parsing annotations
+        $this->mail_tracking->setUpMailTracking();
+    }
+
     /**
      * @test
      * @group unit

tests/Stubs/OldMailTrackingStub.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Spinen\MailAssertions\Stubs;
+
+use Spinen\MailAssertions\MailTracking;
+use Spinen\MailAssertions\TestCase;
+
+/**
+ * Class MailTrackingStub
+ *
+ * @package Spinen\MailAssertions\Stubs
+ */
+class OldMailTrackingStub extends TestCase
+{
+    use MailTracking;
+
+    /**
+     * Public method in the stub to expose the protected email collection
+     *
+     * This is only needed in the tests to allow access to the raw collection of messages.
+     *
+     * @return array
+     */
+    public function exposeMessage() {
+        return $this->emails;
+    }
+}