Update tests for refactor

Author: MGatner

tests/unit/EmailEntityTest.php tests/entities/EmailTest.phptests/unit/EmailEntityTest.php renamed to tests/entities/EmailTest.php

@@ -6,7 +6,7 @@
 use Tatter\Outbox\Models\EmailModel;
 use Tests\Support\DatabaseTestCase;
 
-class EmailEntityTest extends DatabaseTestCase
+class EmailTest extends DatabaseTestCase
 {
 	/**
 	 * Record of the email sent during setUp.

tests/templates/ParentTest.php tests/entities/ParentTemplateTest.phptests/templates/ParentTest.php renamed to tests/entities/ParentTemplateTest.php

@@ -5,7 +5,7 @@
 use Tatter\Outbox\Models\TemplateModel;
 use Tests\Support\DatabaseTestCase;
 
-class ParentTest extends DatabaseTestCase
+class ParentTemplateTest extends DatabaseTestCase
 {
 	/**
 	 * @var DOMParser
@@ -33,25 +33,40 @@ public function setUp(): void
 			'name'    => 'Parent Template',
 			'subject' => 'Parent {subject}',
 			'body'    => '<div>{body}</div><aside>{foobar}</aside>',
-			'tokens'  => ['subject', 'body', 'foobar'],
 		]);
 		$this->parent->id = model(TemplateModel::class)->insert($this->parent);
 
 		$this->template = new Template([
 			'name'      => 'Test Template',
 			'subject'   => 'Some {subject}',
 			'body'      => '<p>{number}</p>',
-			'tokens'    => ['subject', 'number', 'foobar'],
 			'parent_id' => $this->parent->id,
 		]);
 		$this->template->id = model(TemplateModel::class)->insert($this->template);
 	}
 
-	public function testRenderReturnsParentBody()
+	public function testChildIncludesParentTokens()
+	{
+		$expected = ['subject', 'body', 'foobar', 'number'];
+		$result   = $this->template->getTokens();
+
+		$this->assertEquals($expected, array_values($result));
+	}
+
+	public function testChildFallsBackToParentSubject()
+	{
+		$this->template->subject = '';
+
+		$result = $this->template->getSubject();
+
+		$this->assertEquals('Parent {subject}', $result);
+	}
+
+	public function testRenderBodyIncludesParentBody()
 	{
 		// Expect the child variable in the parent context with inlined CSS
 		$expected = '<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; margin-bottom: 15px;">{number}</p>';
-		$result   = $this->template->render();
+		$result   = $this->template->renderBody();
 
 		$this->parser->withString($result);
 		$this->assertTrue($this->parser->see('{number}', 'p'));
@@ -61,7 +76,7 @@ public function testRenderReturnsParentBody()
 
 	public function testRenderAppliesTokens()
 	{
-		$this->parser->withString($this->template->render([
+		$this->parser->withString($this->template->renderBody([
 			'number' => 'Banana',
 			'foobar' => 'Orange',
 		]));
@@ -72,7 +87,7 @@ public function testRenderAppliesTokens()
 
 	public function testRenderInlinesStyles()
 	{
-		$result = $this->template->render([], 'aside { color: magenta; }');
+		$result = $this->template->renderBody([], 'aside { color: magenta; }');
 
 		$this->parser->withString($result);
 

tests/entities/TemplateTest.php

@@ -0,0 +1,90 @@
+<?php
+
+use CodeIgniter\Email\Email;
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\DOMParser;
+use Tatter\Outbox\Entities\Template;
+
+class TemplateEntityTest extends CIUnitTestCase
+{
+	/**
+	 * @var DOMParser
+	 */
+	protected $parser;
+
+	/**
+	 * @var Template
+	 */
+	protected $template;
+
+	public function setUp(): void
+	{
+		$this->resetServices();
+		parent::setUp();
+
+		$this->parser   = new DOMParser();
+		$this->template = new Template([
+			'name'    => 'Test Template',
+			'subject' => 'Some {subject}',
+			'body'    => '<p>{number}</p>',
+		]);
+	}
+
+	public function testGetTokensMatchesAll()
+	{
+		$result = $this->template->getTokens();
+
+		$this->assertEquals(['subject', 'number'], $result);
+	}
+
+	public function testRenderBodyReturnsBody()
+	{
+		$this->parser->withString($this->template->renderBody());
+
+		$this->assertTrue($this->parser->see('{number}', 'p'));
+	}
+
+	public function testRenderBodyAppliesTokens()
+	{
+		$this->parser->withString($this->template->renderBody(['number' => 'Banana']));
+
+		$this->assertTrue($this->parser->see('Banana', 'p'));
+	}
+
+	public function testRenderBodyInlinesStyles()
+	{
+		$this->parser->withString($this->template->renderBody([], 'p { color: magenta; }'));
+
+		$this->assertTrue($this->parser->see('magenta'));
+	}
+
+	public function testEmailReturnsEmailInstance()
+	{
+		$template = new Template([
+			'name'    => 'Test Template',
+			'subject' => 'Some {subject}',
+			'body'    => '<p>{number}</p>',
+		]);
+
+		$result = $template->email();
+
+		$this->assertInstanceOf(Email::class, $result);
+	}
+
+	public function testEmailUsesData()
+	{
+		$template = new Template([
+			'name'    => 'Test Template',
+			'subject' => 'Some {subject}',
+			'body'    => '<p>{number}</p>',
+		]);
+
+		$email = $template->email([
+			'subject' => 'pig',
+		]);
+
+		$result = $this->getPrivateProperty($email, 'tmpArchive');
+
+		$this->assertEquals('Some pig', $result['subject']);
+	}
+}

tests/templates/TemplateModelTest.php tests/models/TemplateModelTest.phptests/templates/TemplateModelTest.php renamed to tests/models/TemplateModelTest.php

@@ -20,7 +20,6 @@ public function setUp(): void
 			'name'      => 'Test Template',
 			'subject'   => 'Some {subject}',
 			'body'      => '<p>{number}</p>',
-			'tokens'    => ['subject', 'number', 'foobar'],
 		]);
 		$this->template->id = model(TemplateModel::class)->insert($this->template);
 	}