Skip to content

Commit 6d18168

Browse files
codedmonkeycodedmonkey
committed
Merge branch 'composer-test'
2 parents cbfdb04 + 199d27a commit 6d18168

16 files changed

Lines changed: 47 additions & 46 deletions

‎.github/workflows/tests-images.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,4 @@ jobs:
5353
run: bin/phpunit --version
5454

5555
- name: Run PHPUnit
56-
run: bin/phpunit --configuration phpunit.docker.xml ${{ env.PHPUNIT_FLAGS }}
56+
run: bin/phpunit --configuration phpunit.images.xml ${{ env.PHPUNIT_FLAGS }}

‎AGENTS.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,16 @@ symfony composer run lint:templates # Twig template validation
4242

4343
```shell
4444
# Prepare the Symfony test environment for tests (if the database schema changed)
45-
symfony composer run tests:setup
45+
symfony composer run test:setup
4646

4747
# Run all tests
48-
symfony composer run tests
48+
symfony composer run test
4949

5050
# Run only PHP tests
51-
symfony composer run tests:php
52-
symfony composer run tests:php:unit
53-
symfony composer run tests:php:functional
51+
symfony composer run test:php
52+
symfony composer run test:php:unit
53+
symfony composer run test:php:functional
5454

55-
# Run tests for Docker images
56-
symfony composer run tests:docker
55+
# Run only tests for OCI images
56+
symfony composer run test:images
5757
```

‎CONTRIBUTING.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,21 +64,21 @@ symfony composer lint:templates # Twig template validation
6464

6565
```shell
6666
# Prepare the Symfony test environment (if the database schema changed)
67-
symfony composer tests:setup
67+
symfony composer test:setup
6868
```
6969

7070
```shell
7171
# Run all tests
72-
symfony composer tests
72+
symfony composer test
7373

7474
# Run only PHP tests
75-
symfony composer tests:php
76-
symfony composer tests:php:unit
77-
symfony composer tests:php:functional
75+
symfony composer test:php
76+
symfony composer test:php:unit
77+
symfony composer test:php:functional
7878

79-
# Run tests for Docker images
80-
symfony composer tests:docker
81-
symfony composer tests:docker:standalone
79+
# Run only tests for OCI images
80+
symfony composer test:images
81+
symfony composer test:images:standalone
8282
```
8383

8484
[codedmonkey-sponsor]: https://github.com/sponsors/codedmonkey

‎composer.json‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -128,26 +128,27 @@
128128
"lint:templates": "bin/console lint:twig templates",
129129
"lint:translations": "bin/console lint:translations",
130130
"lint:yaml": "bin/console lint:yaml .github config translations --parse-tags",
131-
"tests": [
132-
"@tests:php",
133-
"@tests:docker"
131+
"test": [
132+
"@test:php",
133+
"@test:images"
134134
],
135-
"tests:docker": [
136-
"@tests:docker:standalone"
135+
"test:images": [
136+
"@test:images:standalone"
137137
],
138-
"tests:docker:standalone": [
138+
"test:images:standalone": [
139139
"@build:standalone",
140-
"bin/phpunit --configuration phpunit.docker.xml tests/Docker/Standalone"
140+
"bin/phpunit --configuration phpunit.images.xml tests/ImageTests/Standalone"
141141
],
142-
"tests:php": [
143-
"@tests:php:unit",
144-
"@tests:php:functional"
142+
"test:php": [
143+
"@test:php:unit",
144+
"@test:php:functional"
145145
],
146-
"tests:php:functional": "bin/phpunit tests/FunctionalTests",
147-
"tests:php:unit": "bin/phpunit tests/UnitTests",
148-
"tests:setup": [
146+
"test:php:functional": "bin/phpunit tests/FunctionalTests",
147+
"test:php:unit": "bin/phpunit tests/UnitTests",
148+
"test:setup": [
149149
"bin/console --env=test doctrine:database:create --if-not-exists",
150-
"bin/console --env=test doctrine:schema:update --force",
150+
"bin/console --env=test doctrine:schema:drop --full-database --force",
151+
"bin/console --env=test doctrine:schema:create",
151152
"bin/console --env=test doctrine:fixtures:load --no-interaction"
152153
]
153154
},
@@ -162,13 +163,13 @@
162163
"lint:templates": "Validate the Twig templates",
163164
"lint:translations": "Validate the translations",
164165
"lint:yaml": "Validate YAML files",
165-
"tests": "Perform all code tests",
166-
"tests:docker": "Run all tests for images",
167-
"tests:docker:standalone": "Run tests in the standalone image",
168-
"tests:php": "Run all PHP tests",
169-
"tests:php:functional": "Run the functional test suite",
170-
"tests:php:unit": "Run the unit test suite",
171-
"tests:setup": "Prepare the Symfony test environment"
166+
"test": "Perform all code tests",
167+
"test:images": "Run all tests for OCI images",
168+
"test:images:standalone": "Run tests for the standalone OCI image",
169+
"test:php": "Run all PHP tests",
170+
"test:php:functional": "Run the functional test suite",
171+
"test:php:unit": "Run the unit test suite",
172+
"test:setup": "Prepare the Symfony test environment"
172173
},
173174
"config": {
174175
"allow-plugins": {

phpunit.docker.xml renamed to phpunit.images.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<testsuites>
1818
<testsuite name="Dirigent Standalone Image Tests Suite">
19-
<directory>tests/Docker/Standalone</directory>
19+
<directory>tests/ImageTests/Standalone</directory>
2020
</testsuite>
2121
</testsuites>
2222
</phpunit>

tests/Docker/Standalone/.gitignore renamed to tests/ImageTests/Standalone/.gitignore

File renamed without changes.

tests/Docker/Standalone/ConsoleTest.php renamed to tests/ImageTests/Standalone/ConsoleTest.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\Docker\Standalone;
3+
namespace CodedMonkey\Dirigent\Tests\ImageTests\Standalone;
44

55
class ConsoleTest extends DockerStandaloneTestCase
66
{

tests/Docker/Standalone/DatabaseTest.php renamed to tests/ImageTests/Standalone/DatabaseTest.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\Docker\Standalone;
3+
namespace CodedMonkey\Dirigent\Tests\ImageTests\Standalone;
44

55
class DatabaseTest extends DockerStandaloneTestCase
66
{

tests/Docker/Standalone/DockerStandaloneIsolatedTestCase.php renamed to tests/ImageTests/Standalone/DockerStandaloneIsolatedTestCase.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\Docker\Standalone;
3+
namespace CodedMonkey\Dirigent\Tests\ImageTests\Standalone;
44

55
abstract class DockerStandaloneIsolatedTestCase extends DockerStandaloneTestCase
66
{

tests/Docker/Standalone/DockerStandaloneTestCase.php renamed to tests/ImageTests/Standalone/DockerStandaloneTestCase.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\Docker\Standalone;
3+
namespace CodedMonkey\Dirigent\Tests\ImageTests\Standalone;
44

55
use PHPUnit\Framework\TestCase;
66
use Testcontainers\Container\GenericContainer;

0 commit comments

Comments
 (0)