Skip to content

Commit 6162255

Browse files
jrushlowjrushlow
committed
refactored fixture naming conventions
1 parent 073c244 commit 6162255

7 files changed

+36
-36
lines changed

‎tests/Fixtures/AbstractResetPasswordTestKernel.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa
6767
],
6868
]);
6969

70-
$container->register(ResetPasswordRequestRepositoryTestFixture::class);
70+
$container->register(ResetPasswordTestFixtureRequestRepository::class);
7171

7272
$container->loadFromExtension('symfonycasts_reset_password', [
73-
'request_password_repository' => ResetPasswordRequestRepositoryTestFixture::class,
73+
'request_password_repository' => ResetPasswordTestFixtureRequestRepository::class,
7474
]);
7575

7676
// avoid logging request logs

‎tests/Fixtures/Entity/ResetPasswordRequestTestFixture.php‎ renamed to ‎tests/Fixtures/Entity/ResetPasswordTestFixtureRequest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
* @author Ryan Weaver <[email protected]>
1818
*
1919
* @internal
20-
* @ORM\Entity(repositoryClass="SymfonyCasts\Bundle\ResetPassword\Tests\Fixtures\ResetPasswordRequestRepositoryTestFixture")
20+
* @ORM\Entity(repositoryClass="SymfonyCasts\Bundle\ResetPassword\Tests\Fixtures\ResetPasswordTestFixtureRequestRepository")
2121
*/
22-
final class ResetPasswordRequestTestFixture implements ResetPasswordRequestInterface
22+
final class ResetPasswordTestFixtureRequest implements ResetPasswordRequestInterface
2323
{
2424
/**
2525
* @ORM\Id()
@@ -44,7 +44,7 @@ final class ResetPasswordRequestTestFixture implements ResetPasswordRequestInter
4444
public $requestedAt;
4545

4646
/**
47-
* @ORM\ManyToOne(targetEntity="SymfonyCasts\Bundle\ResetPassword\Tests\Fixtures\Entity\ResetPasswordUserTestFixture")
47+
* @ORM\ManyToOne(targetEntity="ResetPasswordTestFixtureUser")
4848
*/
4949
public $user;
5050

‎tests/Fixtures/Entity/ResetPasswordUserTestFixture.php‎ renamed to ‎tests/Fixtures/Entity/ResetPasswordTestFixtureUser.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
* @author Ryan Weaver <[email protected]>
1717
*
1818
* @internal
19-
* @ORM\Entity(repositoryClass="SymfonyCasts\Bundle\ResetPassword\Tests\Fixtures\ResetPasswordUserRepositoryTestFixture")
19+
* @ORM\Entity(repositoryClass="ResetPasswordTestFixtureUserRepository")
2020
*/
21-
final class ResetPasswordUserTestFixture
21+
final class ResetPasswordTestFixtureUser
2222
{
2323
/**
2424
* @ORM\Id()

‎tests/Fixtures/ResetPasswordRequestRepositoryTestFixture.php‎ renamed to ‎tests/Fixtures/ResetPasswordTestFixtureRequestRepository.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
use SymfonyCasts\Bundle\ResetPassword\Model\ResetPasswordRequestInterface;
1515
use SymfonyCasts\Bundle\ResetPassword\Persistence\Repository\ResetPasswordRequestRepositoryTrait;
1616
use SymfonyCasts\Bundle\ResetPassword\Persistence\ResetPasswordRequestRepositoryInterface;
17-
use SymfonyCasts\Bundle\ResetPassword\Tests\Fixtures\Entity\ResetPasswordRequestTestFixture;
17+
use SymfonyCasts\Bundle\ResetPassword\Tests\Fixtures\Entity\ResetPasswordTestFixtureRequest;
1818

1919
/**
2020
* @author Jesse Rushlow <[email protected]>
2121
* @author Ryan Weaver <[email protected]>
2222
*
2323
* @internal
2424
*/
25-
final class ResetPasswordRequestRepositoryTestFixture implements ResetPasswordRequestRepositoryInterface
25+
final class ResetPasswordTestFixtureRequestRepository implements ResetPasswordRequestRepositoryInterface
2626
{
2727
use ResetPasswordRequestRepositoryTrait;
2828

@@ -43,14 +43,14 @@ public function createResetPasswordRequest(
4343

4444
public function findOneBy(array $criteria)
4545
{
46-
$persister = $this->manager->getUnitOfWork()->getEntityPersister(ResetPasswordRequestTestFixture::class);
46+
$persister = $this->manager->getUnitOfWork()->getEntityPersister(ResetPasswordTestFixtureRequest::class);
4747

4848
return $persister->load($criteria);
4949
}
5050

5151
public function findAll()
5252
{
53-
$persister = $this->manager->getUnitOfWork()->getEntityPersister(ResetPasswordRequestTestFixture::class);
53+
$persister = $this->manager->getUnitOfWork()->getEntityPersister(ResetPasswordTestFixtureRequest::class);
5454

5555
return $persister->loadAll();
5656
}
@@ -64,7 +64,7 @@ private function createQueryBuilder($alias, $indexBy = null): QueryBuilder
6464
{
6565
return $this->manager->createQueryBuilder()
6666
->select($alias)
67-
->from(ResetPasswordRequestTestFixture::class, $alias, $indexBy)
67+
->from(ResetPasswordTestFixtureRequest::class, $alias, $indexBy)
6868
;
6969
}
7070
}

‎tests/Fixtures/ResetPasswordUserRepositoryTestFixture.php‎ renamed to ‎tests/Fixtures/ResetPasswordTestFixtureUserRepository.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
namespace SymfonyCasts\Bundle\ResetPassword\Tests\Fixtures;
1111

1212
use Doctrine\ORM\EntityManagerInterface;
13-
use SymfonyCasts\Bundle\ResetPassword\Tests\Fixtures\Entity\ResetPasswordUserTestFixture;
13+
use SymfonyCasts\Bundle\ResetPassword\Tests\Fixtures\Entity\ResetPasswordTestFixtureUser;
1414

1515
/**
1616
* @author Jesse Rushlow <[email protected]>
1717
* @author Ryan Weaver <[email protected]>
1818
*
1919
* @internal
2020
*/
21-
final class ResetPasswordUserRepositoryTestFixture
21+
final class ResetPasswordTestFixtureUserRepository
2222
{
2323
private $manager;
2424

@@ -29,7 +29,7 @@ public function __construct(EntityManagerInterface $manager)
2929

3030
public function findAll(): array
3131
{
32-
$persister = $this->manager->getUnitOfWork()->getEntityPersister(ResetPasswordUserTestFixture::class);
32+
$persister = $this->manager->getUnitOfWork()->getEntityPersister(ResetPasswordTestFixtureUser::class);
3333

3434
return $persister->loadAll();
3535
}

‎tests/FunctionalTests/Persistence/ResetPasswordRequestRepositoryTest.php‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
use Symfony\Component\Config\Loader\LoaderInterface;
1616
use Symfony\Component\DependencyInjection\ContainerBuilder;
1717
use SymfonyCasts\Bundle\ResetPassword\Tests\Fixtures\AbstractResetPasswordTestKernel;
18-
use SymfonyCasts\Bundle\ResetPassword\Tests\Fixtures\Entity\ResetPasswordRequestTestFixture;
19-
use SymfonyCasts\Bundle\ResetPassword\Tests\Fixtures\Entity\ResetPasswordUserTestFixture;
20-
use SymfonyCasts\Bundle\ResetPassword\Tests\Fixtures\ResetPasswordRequestRepositoryTestFixture;
18+
use SymfonyCasts\Bundle\ResetPassword\Tests\Fixtures\Entity\ResetPasswordTestFixtureRequest;
19+
use SymfonyCasts\Bundle\ResetPassword\Tests\Fixtures\Entity\ResetPasswordTestFixtureUser;
20+
use SymfonyCasts\Bundle\ResetPassword\Tests\Fixtures\ResetPasswordTestFixtureRequestRepository;
2121

2222
/**
2323
* @author Jesse Rushlow <[email protected]>
@@ -33,7 +33,7 @@ final class ResetPasswordRequestRepositoryTest extends TestCase
3333
private $manager;
3434

3535
/**
36-
* @var ResetPasswordRequestRepositoryTestFixture
36+
* @var ResetPasswordTestFixtureRequestRepository
3737
*/
3838
private $repository;
3939

@@ -52,12 +52,12 @@ protected function setUp(): void
5252

5353
$this->configureDatabase();
5454

55-
$this->repository = $this->manager->getRepository(ResetPasswordRequestTestFixture::class);
55+
$this->repository = $this->manager->getRepository(ResetPasswordTestFixtureRequest::class);
5656
}
5757

5858
public function testPersistResetPasswordRequestPersistsRequestObject(): void
5959
{
60-
$fixture = new ResetPasswordRequestTestFixture();
60+
$fixture = new ResetPasswordTestFixtureRequest();
6161
$this->repository->persistResetPasswordRequest($fixture);
6262

6363
$result = $this->repository->findAll();
@@ -67,7 +67,7 @@ public function testPersistResetPasswordRequestPersistsRequestObject(): void
6767

6868
public function testGetUserIdentifierRetrievesObjectIdFromPersistence(): void
6969
{
70-
$fixture = new ResetPasswordRequestTestFixture();
70+
$fixture = new ResetPasswordTestFixtureRequest();
7171

7272
$this->manager->persist($fixture);
7373
$this->manager->flush();
@@ -79,7 +79,7 @@ public function testGetUserIdentifierRetrievesObjectIdFromPersistence(): void
7979

8080
public function testFindResetPasswordRequestReturnsObjectWithGivenSelector(): void
8181
{
82-
$fixture = new ResetPasswordRequestTestFixture();
82+
$fixture = new ResetPasswordTestFixtureRequest();
8383
$fixture->selector = '1234';
8484

8585
$this->manager->persist($fixture);
@@ -92,16 +92,16 @@ public function testFindResetPasswordRequestReturnsObjectWithGivenSelector(): vo
9292

9393
public function testGetMostRecentNonExpiredRequestDateReturnsExpected(): void
9494
{
95-
$userFixture = new ResetPasswordUserTestFixture();
95+
$userFixture = new ResetPasswordTestFixtureUser();
9696
$this->manager->persist($userFixture);
9797

98-
$fixtureOld = new ResetPasswordRequestTestFixture();
98+
$fixtureOld = new ResetPasswordTestFixtureRequest();
9999
$fixtureOld->requestedAt = new \DateTimeImmutable('-5 minutes');
100100
$fixtureOld->user = $userFixture;
101101
$this->manager->persist($fixtureOld);
102102

103103
$expectedTime = new \DateTimeImmutable();
104-
$fixtureNewest = new ResetPasswordRequestTestFixture();
104+
$fixtureNewest = new ResetPasswordTestFixtureRequest();
105105
$fixtureNewest->expiresAt = new \DateTimeImmutable('+1 hours');
106106
$fixtureNewest->requestedAt = $expectedTime;
107107
$fixtureNewest->user = $userFixture;
@@ -116,10 +116,10 @@ public function testGetMostRecentNonExpiredRequestDateReturnsExpected(): void
116116

117117
public function testGetMostRecentNonExpiredRequestDateReturnsNullOnExpiredRequest(): void
118118
{
119-
$userFixture = new ResetPasswordUserTestFixture();
119+
$userFixture = new ResetPasswordTestFixtureUser();
120120
$this->manager->persist($userFixture);
121121

122-
$expiredFixture = new ResetPasswordRequestTestFixture();
122+
$expiredFixture = new ResetPasswordTestFixtureRequest();
123123
$expiredFixture->user = $userFixture;
124124
$expiredFixture->expiresAt = new \DateTimeImmutable('-1 hours');
125125
$expiredFixture->requestedAt = new\DateTimeImmutable('-2 hours');
@@ -134,10 +134,10 @@ public function testGetMostRecentNonExpiredRequestDateReturnsNullOnExpiredReques
134134

135135
public function testGetMostRecentNonExpiredRequestDateReturnsNullIfRequestNotFound(): void
136136
{
137-
$userFixture = new ResetPasswordUserTestFixture();
137+
$userFixture = new ResetPasswordTestFixtureUser();
138138
$this->manager->persist($userFixture);
139139

140-
$fixture = new ResetPasswordRequestTestFixture();
140+
$fixture = new ResetPasswordTestFixtureRequest();
141141
$this->manager->persist($fixture);
142142

143143
$this->manager->flush();
@@ -149,7 +149,7 @@ public function testGetMostRecentNonExpiredRequestDateReturnsNullIfRequestNotFou
149149

150150
public function testRemoveResetPasswordRequestRemovedGivenObjectFromPersistence(): void
151151
{
152-
$fixture = new ResetPasswordRequestTestFixture();
152+
$fixture = new ResetPasswordTestFixtureRequest();
153153

154154
$this->manager->persist($fixture);
155155
$this->manager->flush();
@@ -161,11 +161,11 @@ public function testRemoveResetPasswordRequestRemovedGivenObjectFromPersistence(
161161

162162
public function testRemovedExpiredResetPasswordRequestsOnlyRemovedExpiredRequestsFromPersistence(): void
163163
{
164-
$expiredFixture = new ResetPasswordRequestTestFixture();
164+
$expiredFixture = new ResetPasswordTestFixtureRequest();
165165
$expiredFixture->expiresAt = new \DateTimeImmutable('-2 hours');
166166
$this->manager->persist($expiredFixture);
167167

168-
$futureFixture = new ResetPasswordRequestTestFixture();
168+
$futureFixture = new ResetPasswordTestFixtureRequest();
169169
$this->manager->persist($futureFixture);
170170

171171
$this->manager->flush();

‎tests/UnitTests/ResetPasswordHelperTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
use SymfonyCasts\Bundle\ResetPassword\Model\ResetPasswordRequestInterface;
1818
use SymfonyCasts\Bundle\ResetPassword\Persistence\ResetPasswordRequestRepositoryInterface;
1919
use SymfonyCasts\Bundle\ResetPassword\ResetPasswordHelper;
20-
use SymfonyCasts\Bundle\ResetPassword\Tests\Fixtures\Entity\ResetPasswordRequestTestFixture;
20+
use SymfonyCasts\Bundle\ResetPassword\Tests\Fixtures\Entity\ResetPasswordTestFixtureRequest;
2121
use SymfonyCasts\Bundle\ResetPassword\Util\ResetPasswordCleaner;
2222

2323
/**
@@ -99,7 +99,7 @@ public function testHasUserThrottlingReturnsFalseWithNoLastRequestDate(): void
9999

100100
$this->mockRepo
101101
->method('createResetPasswordRequest')
102-
->willReturn(new ResetPasswordRequestTestFixture())
102+
->willReturn(new ResetPasswordTestFixtureRequest())
103103
;
104104

105105
$helper = $this->getPasswordResetHelper();
@@ -132,7 +132,7 @@ public function testHasUserThrottlingReturnsFalseIfNotBeforeThrottleTime(): void
132132

133133
$this->mockRepo
134134
->method('createResetPasswordRequest')
135-
->willReturn(new ResetPasswordRequestTestFixture())
135+
->willReturn(new ResetPasswordTestFixtureRequest())
136136
;
137137

138138
$helper = $this->getPasswordResetHelper();

0 commit comments

Comments
 (0)