Merge branch 'pull/2169'

Author: jasonvarga

src/Forms/Email.php

@@ -68,7 +68,11 @@ protected function addViews()
             $this->text($text);
         }
 
-        return $this->view($html);
+        if ($html) {
+            $this->view($html);
+        }
+
+        return $this;
     }
 
     protected function addData()
@@ -124,7 +128,7 @@ protected function parseConfig(array $config)
         $data = $this->submission->toArray();
 
         return collect($config)->map(function ($value) use ($data) {
-            return Parse::template(Parse::env($value), $data);
+            return (string) Parse::template(Parse::env($value), $data);
         });
     }
 }

tests/Forms/EmailTest.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Tests\Forms;
+
+use Mockery as m;
+use Statamic\Facades\Antlers;
+use Statamic\Forms\Email;
+use Statamic\Forms\Submission;
+use Tests\TestCase;
+
+class EmailTest extends TestCase
+{
+    /** @test */
+    public function it_sets_html_view_as_string()
+    {
+        /** @var Submission */
+        $submission = m::mock(Submission::class);
+        $submission->shouldReceive('toArray')->andReturn([]);
+
+        $email = new Email($submission, [
+            'to' => Antlers::parse('test@example.com'),
+            'html' => Antlers::parse('emails/test'),
+        ]);
+
+        $email->build();
+
+        $this->assertTrue(is_string($email->view), 'View is not a string.');
+        $this->assertEquals('emails/test', $email->view);
+    }
+}