Skip to content

Commit 3b057fc

Browse files
codedmonkeycodedmonkey
committed
Code style fixes in functional tests
1 parent 60d31fd commit 3b057fc

5 files changed

Lines changed: 38 additions & 56 deletions

File tree

‎tests/FunctionalTests/Controller/Dashboard/DashboardPackagesControllerTest.php‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
use CodedMonkey\Dirigent\Doctrine\Entity\Package;
66
use CodedMonkey\Dirigent\Doctrine\Repository\PackageRepository;
77
use CodedMonkey\Dirigent\Doctrine\Repository\RegistryRepository;
8-
use CodedMonkey\Dirigent\Tests\FunctionalTests\WebTestCaseTrait;
98
use CodedMonkey\Dirigent\Tests\Helper\TestEntityFactoryTrait;
9+
use CodedMonkey\Dirigent\Tests\Helper\WebTestCaseTrait;
1010
use Doctrine\ORM\EntityManagerInterface;
1111
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
1212
use Symfony\Component\HttpFoundation\Response;
@@ -21,15 +21,18 @@ public function testAddMirroring(): void
2121
$client = static::createClient();
2222
$this->loginUser('admin');
2323

24-
$registry = $client->getContainer()->get(RegistryRepository::class)->findOneBy(['name' => 'Packagist']);
24+
$registry = self::getService(RegistryRepository::class)->findOneBy(['name' => 'Packagist']);
2525

2626
$client->request('GET', '/packages/add-mirroring');
27+
28+
$this->assertResponseStatusCodeSame(Response::HTTP_OK);
29+
2730
$client->submitForm('Add packages', [
2831
'package_add_mirroring_form[packages]' => 'psr/cache',
2932
'package_add_mirroring_form[registry]' => $registry->getId(),
3033
]);
3134

32-
$this->assertResponseStatusCodeSame(200);
35+
$this->assertResponseStatusCodeSame(Response::HTTP_OK);
3336

3437
// todo the submit request should be invoked with ajax, and this assertion should be performed on the initial request
3538
// however, the assertion is performed on the ajax response making it invalid
@@ -39,8 +42,7 @@ public function testAddMirroring(): void
3942
// 'A message showing the package was created must be shown.',
4043
// );
4144

42-
/** @var PackageRepository $packageRepository */
43-
$packageRepository = $client->getContainer()->get(PackageRepository::class);
45+
$packageRepository = self::getService(PackageRepository::class);
4446

4547
$package = $packageRepository->findOneByName('psr/cache');
4648
self::assertNotNull($package, 'A package was created.');
@@ -54,14 +56,17 @@ public function testAddVcsRepository(): void
5456
$this->loginUser('admin');
5557

5658
$client->request('GET', '/packages/add-vcs');
59+
60+
$this->assertResponseStatusCodeSame(Response::HTTP_OK);
61+
5762
$client->submitForm('Add VCS repository', [
5863
'package_add_vcs_form[repositoryUrl]' => 'https://github.com/php-fig/container',
5964
]);
6065

61-
$this->assertResponseStatusCodeSame(302);
66+
$this->assertResponseStatusCodeSame(Response::HTTP_FOUND);
6267

6368
/** @var PackageRepository $packageRepository */
64-
$packageRepository = $client->getContainer()->get(PackageRepository::class);
69+
$packageRepository = self::getService(PackageRepository::class);
6570

6671
$package = $packageRepository->findOneByName('psr/container');
6772
self::assertNotNull($package, 'A package was created.');
@@ -75,9 +80,12 @@ public function testEdit(): void
7580
$this->loginUser('admin');
7681

7782
$client->request('GET', '/packages/psr/log/edit');
83+
84+
$this->assertResponseStatusCodeSame(Response::HTTP_OK);
85+
7886
$client->submitForm('Save changes');
7987

80-
$this->assertResponseStatusCodeSame(302);
88+
$this->assertResponseStatusCodeSame(Response::HTTP_FOUND);
8189
}
8290

8391
public function testDelete(): void

‎tests/FunctionalTests/Controller/Dashboard/DashboardPackagesInfoControllerTest.php‎

Lines changed: 15 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22

33
namespace CodedMonkey\Dirigent\Tests\FunctionalTests\Controller\Dashboard;
44

5-
use CodedMonkey\Dirigent\Doctrine\Entity\User;
65
use CodedMonkey\Dirigent\Doctrine\Repository\PackageRepository;
7-
use CodedMonkey\Dirigent\Doctrine\Repository\UserRepository;
8-
use CodedMonkey\Dirigent\Tests\FunctionalTests\WebTestCaseTrait;
6+
use CodedMonkey\Dirigent\Tests\Helper\WebTestCaseTrait;
97
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
8+
use Symfony\Component\HttpFoundation\Response;
109

1110
class DashboardPackagesInfoControllerTest extends WebTestCase
1211
{
@@ -19,7 +18,7 @@ public function testInfo(): void
1918

2019
$client->request('GET', '/packages/psr/log');
2120

22-
$this->assertResponseStatusCodeSame(200);
21+
$this->assertResponseStatusCodeSame(Response::HTTP_OK);
2322
}
2423

2524
public function testPackageInfo(): void
@@ -29,7 +28,7 @@ public function testPackageInfo(): void
2928

3029
$client->request('GET', '/packages/psr/log/v/1.0.0');
3130

32-
$this->assertResponseStatusCodeSame(200);
31+
$this->assertResponseStatusCodeSame(Response::HTTP_OK);
3332
}
3433

3534
public function testVersions(): void
@@ -39,77 +38,53 @@ public function testVersions(): void
3938

4039
$client->request('GET', '/packages/psr/log/versions');
4140

42-
$this->assertResponseStatusCodeSame(200);
41+
$this->assertResponseStatusCodeSame(Response::HTTP_OK);
4342
}
4443

4544
public function testDependents(): void
4645
{
4746
$client = static::createClient();
48-
49-
/** @var UserRepository $userRepository */
50-
$userRepository = $client->getContainer()->get(UserRepository::class);
51-
52-
/** @var User $user */
53-
$user = $userRepository->findOneByUsername('user');
54-
$client->loginUser($user);
47+
$this->loginUser();
5548

5649
$client->request('GET', '/packages/psr/log/dependents');
5750

58-
$this->assertResponseStatusCodeSame(200);
51+
$this->assertResponseStatusCodeSame(Response::HTTP_OK);
5952

6053
$this->assertAnySelectorTextSame('h1 small', 'Dependents');
6154
}
6255

6356
public function testImplementations(): void
6457
{
6558
$client = static::createClient();
66-
67-
/** @var UserRepository $userRepository */
68-
$userRepository = $client->getContainer()->get(UserRepository::class);
69-
70-
/** @var User $user */
71-
$user = $userRepository->findOneByUsername('user');
72-
$client->loginUser($user);
59+
$this->loginUser();
7360

7461
$client->request('GET', '/packages/psr/log/implementations');
7562

76-
$this->assertResponseStatusCodeSame(200);
63+
$this->assertResponseStatusCodeSame(Response::HTTP_OK);
7764

7865
$this->assertAnySelectorTextSame('h1 small', 'Implementations');
7966
}
8067

8168
public function testProviders(): void
8269
{
8370
$client = static::createClient();
84-
85-
/** @var UserRepository $userRepository */
86-
$userRepository = $client->getContainer()->get(UserRepository::class);
87-
88-
/** @var User $user */
89-
$user = $userRepository->findOneByUsername('user');
90-
$client->loginUser($user);
71+
$this->loginUser();
9172

9273
$client->request('GET', '/packages/psr/log/providers');
9374

94-
$this->assertResponseStatusCodeSame(200);
75+
$this->assertResponseStatusCodeSame(Response::HTTP_OK);
9576

9677
$this->assertAnySelectorTextSame('h1 small', 'Providers');
9778
}
9879

9980
public function testSuggesters(): void
10081
{
10182
$client = static::createClient();
102-
103-
/** @var UserRepository $userRepository */
104-
$userRepository = $client->getContainer()->get(UserRepository::class);
105-
106-
/** @var User $user */
107-
$user = $userRepository->findOneByUsername('user');
108-
$client->loginUser($user);
83+
$this->loginUser();
10984

11085
$client->request('GET', '/packages/psr/log/suggesters');
11186

112-
$this->assertResponseStatusCodeSame(200);
87+
$this->assertResponseStatusCodeSame(Response::HTTP_OK);
11388

11489
$this->assertAnySelectorTextSame('h1 small', 'Suggesters');
11590
}
@@ -121,12 +96,9 @@ public function testStatistics(): void
12196

12297
$client->request('GET', '/packages/psr/log/statistics');
12398

124-
$this->assertResponseStatusCodeSame(200);
125-
126-
/** @var PackageRepository $packageRepository */
127-
$packageRepository = $client->getContainer()->get(PackageRepository::class);
99+
$this->assertResponseStatusCodeSame(Response::HTTP_OK);
128100

129-
$package = $packageRepository->findOneByName('psr/log');
101+
$package = self::getService(PackageRepository::class)->findOneByName('psr/log');
130102

131103
$this->assertAnySelectorTextSame('#total_all .display-6', number_format($package->getInstallations()->getTotal(), thousands_separator: ' '));
132104

‎tests/FunctionalTests/Controller/Dashboard/DashboardRootControllerPublicTest.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use CodedMonkey\Dirigent\Tests\FunctionalTests\PublicKernel;
66
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
7+
use Symfony\Component\HttpFoundation\Response;
78

89
class DashboardRootControllerPublicTest extends WebTestCase
910
{
@@ -18,7 +19,7 @@ public function testIndex(): void
1819

1920
$client->request('GET', '/');
2021

21-
$this->assertResponseStatusCodeSame(200);
22+
$this->assertResponseStatusCodeSame(Response::HTTP_OK);
2223

2324
$this->assertAnySelectorTextSame('#total_packages .display-6', '1');
2425
}

‎tests/FunctionalTests/Controller/Dashboard/DashboardRootControllerTest.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
namespace CodedMonkey\Dirigent\Tests\FunctionalTests\Controller\Dashboard;
44

55
use CodedMonkey\Dirigent\Kernel;
6-
use CodedMonkey\Dirigent\Tests\FunctionalTests\WebTestCaseTrait;
6+
use CodedMonkey\Dirigent\Tests\Helper\WebTestCaseTrait;
77
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
8+
use Symfony\Component\HttpFoundation\Response;
89

910
class DashboardRootControllerTest extends WebTestCase
1011
{
@@ -17,7 +18,7 @@ public function testIndex(): void
1718

1819
$client->request('GET', '/');
1920

20-
$this->assertResponseStatusCodeSame(200);
21+
$this->assertResponseStatusCodeSame(Response::HTTP_OK);
2122

2223
$this->assertAnySelectorTextSame('#total_packages .display-6', '1');
2324
}
@@ -29,7 +30,7 @@ public function testCredits(): void
2930

3031
$client->request('GET', '/credits');
3132

32-
$this->assertResponseStatusCodeSame(200);
33+
$this->assertResponseStatusCodeSame(Response::HTTP_OK);
3334

3435
$this->assertAnySelectorTextSame('.list-group-item div', 'v' . Kernel::VERSION);
3536
}

tests/FunctionalTests/WebTestCaseTrait.php renamed to tests/Helper/WebTestCaseTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace CodedMonkey\Dirigent\Tests\FunctionalTests;
3+
namespace CodedMonkey\Dirigent\Tests\Helper;
44

55
use CodedMonkey\Dirigent\Doctrine\Entity\User;
66
use CodedMonkey\Dirigent\Doctrine\Repository\UserRepository;

0 commit comments

Comments
 (0)