Merge pull request #3 from tattersoftware/test

tattersoftware · Feb 21, 2021 · d28122e · d28122e
2 parents 370c464 + ecc1624
commit d28122e
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 19 deletions.
diff --git a/tests/_support/FactoryTestCase.php b/tests/_support/FactoryTestCase.php
@@ -1,8 +1,9 @@
 <?php namespace Tests\Support;
 
+use Tatter\Users\UserEntity;
 use Tatter\Users\UserFactory;
 
-class FactoryTestCase extends DatabaseTestCase
+abstract class FactoryTestCase extends DatabaseTestCase
 {
 	/**
 	 * The factory class to test.
@@ -42,4 +43,34 @@ protected function setUp(): void
 		$this->user    = fake($this->faker);
 		$this->factory = new $this->class();
 	}
+
+	public function testId()
+	{
+		$result = $this->factory->findById($this->user->id);
+
+		$this->assertInstanceof(UserEntity::class, $result);
+		$this->assertEquals($this->user->id, $result->getId());
+	}
+
+	public function testEmail()
+	{
+		// Shield's faker does not include email yet
+		if ($this->faker === 'Sparks\Shield\Models\UserModel')
+		{
+			$this->markTestSkipped();
+		}
+
+		$result = $this->factory->findByEmail($this->user->email);
+
+		$this->assertInstanceof(UserEntity::class, $result);
+		$this->assertEquals($this->user->id, $result->getId());
+	}
+
+	public function testUsername()
+	{
+		$result = $this->factory->findByUsername($this->user->username);
+
+		$this->assertInstanceof(UserEntity::class, $result);
+		$this->assertEquals($this->user->id, $result->getId());
+	}
 }
diff --git a/tests/unit/MythFactoryTest.php b/tests/unit/MythFactoryTest.php
@@ -2,20 +2,11 @@
 
 use Myth\Auth\Test\Fakers\UserFaker;
 use Tatter\Users\Factories\MythFactory;
-use Tatter\Users\UserEntity;
 use Tests\Support\FactoryTestCase;
 
 class MythFactoryTest extends FactoryTestCase
 {
 	protected $namespace = 'Myth\Auth';
 	protected $class     = MythFactory::class;
 	protected $faker     = UserFaker::class;
-
-	public function testId()
-	{
-		$result = $this->factory->findById($this->user->id);
-
-		$this->assertInstanceof(UserEntity::class, $result);
-		$this->assertEquals($this->user->username, $result->getUsername());
-	}
 }
diff --git a/tests/unit/ShieldFactoryTest.php b/tests/unit/ShieldFactoryTest.php
@@ -2,20 +2,11 @@
 
 use Sparks\Shield\Models\UserModel;
 use Tatter\Users\Factories\ShieldFactory;
-use Tatter\Users\UserEntity;
 use Tests\Support\FactoryTestCase;
 
 class ShieldFactoryTest extends FactoryTestCase
 {
 	protected $namespace = 'Sparks\Shield';
 	protected $class     = ShieldFactory::class;
 	protected $faker     = UserModel::class;
-
-	public function testId()
-	{
-		$result = $this->factory->findById($this->user->id);
-
-		$this->assertInstanceof(UserEntity::class, $result);
-		$this->assertEquals($this->user->username, $result->getUsername());
-	}
 }