Skip to content

Commit de1cb74

Browse files
theofidrytheofidry
authored
test: Rename Symfony tests (#1544)
Add the major version used, I may test in parallel two major versions.
1 parent be1c022 commit de1cb74

File tree

4 files changed

+73
-69
lines changed

4 files changed

+73
-69
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ jobs:
5959
e2e:
6060
- e2e_scoper_alias
6161
- e2e_scoper_expose_symbols
62-
- e2e_symfony
63-
- e2e_symfony_runtime
62+
- e2e_symfony6
63+
- e2e_symfony6_runtime
6464
- e2e_composer_installed_versions
6565
- e2e_phpstorm_stubs
6666
- e2e_dockerfile

‎Makefile‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,10 @@ clean:
9696
fixtures/build/dir010/index.phar \
9797
fixtures/build/dir012/bin/console.phar \
9898
$(E2E_PHP_SETTINGS_CHECKER_DIR)/index.phar \
99-
$(E2E_SYMFONY_DIR)/var \
100-
$(E2E_SYMFONY_DIR)/.env.local.php \
99+
$(E2E_symfony6_DIR)/var \
100+
$(E2E_symfony6_DIR)/.env.local.php \
101+
$(E2E_symfony6_RUNTIME_DIR)/var \
102+
$(E2E_symfony6_RUNTIME_DIR)/.env.local.php \
101103
$(DEFAULT_STUB) \
102104
fixtures/composer-dump/*/vendor \
103105
|| true
@@ -305,13 +307,13 @@ test_e2e: e2e_scoper_alias \
305307
e2e_php_settings_checker_readonly_enabled \
306308
e2e_php_settings_checker_memory_limit_lower \
307309
e2e_php_settings_checker_memory_limit_higher \
308-
e2e_symfony \
310+
e2e_symfony6 \
309311
e2e_composer_installed_versions \
310312
e2e_phpstorm_stubs \
311313
e2e_dockerfile \
312314
e2e_dockerfile_no_extension \
313315
e2e_custom_composer_bin \
314-
e2e_symfony_runtime \
316+
e2e_symfony6_runtime \
315317
e2e_reproducible_build
316318

317319

‎Makefile.e2e‎

Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -47,24 +47,24 @@ E2E_PHP_SETTINGS_CHECKER_EXPECTED_STDERR_MEMORY_LIMIT_HIGHER = $(E2E_PHP_SETTING
4747
E2E_PHP_SETTINGS_CHECKER_ACTUAL_STDOUT_MEMORY_LIMIT_HIGHER = $(E2E_PHP_SETTINGS_CHECKER_OUTPUT_DIR)/actual-stdout-memory-limit-higher
4848
E2E_PHP_SETTINGS_CHECKER_ACTUAL_STDERR_MEMORY_LIMIT_HIGHER = $(E2E_PHP_SETTINGS_CHECKER_OUTPUT_DIR)/actual-stderr-memory-limit-higher
4949

50-
E2E_SYMFONY_DIR = fixtures/build/dir012
51-
E2E_SYMFONY_OUTPUT_DIR = dist/dir012
52-
E2E_SYMFONY_TMP_PHAR := $(E2E_SYMFONY_DIR)/bin/console.phar
53-
E2E_SYMFONY_PHAR := $(E2E_SYMFONY_OUTPUT_DIR)/console.phar
54-
E2E_SYMFONY_EXPECTED_STDOUT := $(E2E_SYMFONY_OUTPUT_DIR)/expected-stdout
55-
E2E_SYMFONY_EXPECTED_STDERR := $(E2E_SYMFONY_OUTPUT_DIR)/expected-stderr
56-
E2E_SYMFONY_ACTUAL_STDOUT := $(E2E_SYMFONY_OUTPUT_DIR)/actual-stdout
57-
E2E_SYMFONY_ACTUAL_STDERR := $(E2E_SYMFONY_OUTPUT_DIR)/actual-stderr
58-
59-
E2E_SYMFONY_RUNTIME_DIR = fixtures/build/dir018
60-
E2E_SYMFONY_RUNTIME_OUTPUT_DIR = dist/dir018
61-
E2E_SYMFONY_RUNTIME_CONSOLE := $(E2E_SYMFONY_RUNTIME_DIR)/new-bin/console
62-
E2E_SYMFONY_RUNTIME_TMP_PHAR := $(E2E_SYMFONY_RUNTIME_DIR)/new-bin/console.phar
63-
E2E_SYMFONY_RUNTIME_PHAR := $(E2E_SYMFONY_RUNTIME_OUTPUT_DIR)/console.phar
64-
E2E_SYMFONY_RUNTIME_EXPECTED_STDOUT := $(E2E_SYMFONY_RUNTIME_OUTPUT_DIR)/expected-stdout
65-
E2E_SYMFONY_RUNTIME_EXPECTED_STDERR := $(E2E_SYMFONY_RUNTIME_OUTPUT_DIR)/expected-stderr
66-
E2E_SYMFONY_RUNTIME_ACTUAL_STDOUT := $(E2E_SYMFONY_RUNTIME_OUTPUT_DIR)/actual-stdout
67-
E2E_SYMFONY_RUNTIME_ACTUAL_STDERR := $(E2E_SYMFONY_RUNTIME_OUTPUT_DIR)/actual-stderr
50+
E2E_symfony6_DIR = fixtures/build/dir012
51+
E2E_symfony6_OUTPUT_DIR = dist/dir012
52+
E2E_symfony6_TMP_PHAR := $(E2E_symfony6_DIR)/bin/console.phar
53+
E2E_symfony6_PHAR := $(E2E_symfony6_OUTPUT_DIR)/console.phar
54+
E2E_symfony6_EXPECTED_STDOUT := $(E2E_symfony6_OUTPUT_DIR)/expected-stdout
55+
E2E_symfony6_EXPECTED_STDERR := $(E2E_symfony6_OUTPUT_DIR)/expected-stderr
56+
E2E_symfony6_ACTUAL_STDOUT := $(E2E_symfony6_OUTPUT_DIR)/actual-stdout
57+
E2E_symfony6_ACTUAL_STDERR := $(E2E_symfony6_OUTPUT_DIR)/actual-stderr
58+
59+
E2E_symfony6_RUNTIME_DIR = fixtures/build/dir018
60+
E2E_symfony6_RUNTIME_OUTPUT_DIR = dist/dir018
61+
E2E_symfony6_RUNTIME_CONSOLE := $(E2E_symfony6_RUNTIME_DIR)/new-bin/console
62+
E2E_symfony6_RUNTIME_TMP_PHAR := $(E2E_symfony6_RUNTIME_DIR)/new-bin/console.phar
63+
E2E_symfony6_RUNTIME_PHAR := $(E2E_symfony6_RUNTIME_OUTPUT_DIR)/console.phar
64+
E2E_symfony6_RUNTIME_EXPECTED_STDOUT := $(E2E_symfony6_RUNTIME_OUTPUT_DIR)/expected-stdout
65+
E2E_symfony6_RUNTIME_EXPECTED_STDERR := $(E2E_symfony6_RUNTIME_OUTPUT_DIR)/expected-stderr
66+
E2E_symfony6_RUNTIME_ACTUAL_STDOUT := $(E2E_symfony6_RUNTIME_OUTPUT_DIR)/actual-stdout
67+
E2E_symfony6_RUNTIME_ACTUAL_STDERR := $(E2E_symfony6_RUNTIME_OUTPUT_DIR)/actual-stderr
6868

6969
E2E_COMPOSER_INSTALLED_DIR = fixtures/build/dir013
7070
E2E_COMPOSER_INSTALLED_OUTPUT_DIR = dist/dir013
@@ -293,51 +293,51 @@ _e2e_php_settings_checker_memory_limit_higher: $(SCOPED_BOX_BIN)
293293
$(DIFF) $(E2E_PHP_SETTINGS_CHECKER_EXPECTED_STDOUT_MEMORY_LIMIT_HIGHER) $(E2E_PHP_SETTINGS_CHECKER_ACTUAL_STDOUT_MEMORY_LIMIT_HIGHER)
294294
$(DIFF) $(E2E_PHP_SETTINGS_CHECKER_EXPECTED_STDERR_MEMORY_LIMIT_HIGHER) $(E2E_PHP_SETTINGS_CHECKER_ACTUAL_STDERR_MEMORY_LIMIT_HIGHER)
295295

296-
.PHONY: e2e_symfony
297-
e2e_symfony: $(SCOPED_BOX_BIN) $(E2E_SYMFONY_DIR)/vendor $(E2E_SYMFONY_DIR)/.env.local.php
296+
.PHONY: e2e_symfony6
297+
e2e_symfony6: $(SCOPED_BOX_BIN) $(E2E_symfony6_DIR)/vendor $(E2E_symfony6_DIR)/.env.local.php
298298
@# Packages a fresh Symfony app
299-
@mkdir -p $(E2E_SYMFONY_OUTPUT_DIR)
300-
php $(E2E_SYMFONY_DIR)/bin/console --version --no-ansi \
301-
1>$(E2E_SYMFONY_EXPECTED_STDOUT) \
302-
2>$(E2E_SYMFONY_EXPECTED_STDERR)
299+
@mkdir -p $(E2E_symfony6_OUTPUT_DIR)
300+
php $(E2E_symfony6_DIR)/bin/console --version --no-ansi \
301+
1>$(E2E_symfony6_EXPECTED_STDOUT) \
302+
2>$(E2E_symfony6_EXPECTED_STDERR)
303303

304304
@# Clear the cache: we want to make sure it works on a clean installation
305-
$(E2E_SYMFONY_DIR)/bin/console cache:pool:clear cache.global_clearer --env=prod --ansi
306-
$(E2E_SYMFONY_DIR)/bin/console cache:clear --env=prod --ansi
307-
rm -rf $(E2E_SYMFONY_DIR)/var/cache/prod/*
305+
$(E2E_symfony6_DIR)/bin/console cache:pool:clear cache.global_clearer --env=prod --ansi
306+
$(E2E_symfony6_DIR)/bin/console cache:clear --env=prod --ansi
307+
rm -rf $(E2E_symfony6_DIR)/var/cache/prod/*
308308

309-
$(SCOPED_BOX) compile --working-dir=$(E2E_SYMFONY_DIR) --no-parallel --ansi
310-
mv -fv $(E2E_SYMFONY_TMP_PHAR) $(E2E_SYMFONY_PHAR)
309+
$(SCOPED_BOX) compile --working-dir=$(E2E_symfony6_DIR) --no-parallel --ansi
310+
mv -fv $(E2E_symfony6_TMP_PHAR) $(E2E_symfony6_PHAR)
311311

312-
php $(E2E_SYMFONY_PHAR) --version --no-ansi \
313-
1>$(E2E_SYMFONY_ACTUAL_STDOUT) \
314-
2>$(E2E_SYMFONY_ACTUAL_STDERR) || true
312+
php $(E2E_symfony6_PHAR) --version --no-ansi \
313+
1>$(E2E_symfony6_ACTUAL_STDOUT) \
314+
2>$(E2E_symfony6_ACTUAL_STDERR) || true
315315

316-
$(DIFF) $(E2E_SYMFONY_EXPECTED_STDOUT) $(E2E_SYMFONY_ACTUAL_STDOUT)
317-
$(DIFF) $(E2E_SYMFONY_EXPECTED_STDERR) $(E2E_SYMFONY_ACTUAL_STDERR)
316+
$(DIFF) $(E2E_symfony6_EXPECTED_STDOUT) $(E2E_symfony6_ACTUAL_STDOUT)
317+
$(DIFF) $(E2E_symfony6_EXPECTED_STDERR) $(E2E_symfony6_ACTUAL_STDERR)
318318

319-
.PHONY: e2e_symfony_runtime
320-
e2e_symfony_runtime: $(SCOPED_BOX_BIN) $(E2E_SYMFONY_RUNTIME_DIR)/vendor $(E2E_SYMFONY_RUNTIME_DIR)/.env.local.php
319+
.PHONY: e2e_symfony6_runtime
320+
e2e_symfony6_runtime: $(SCOPED_BOX_BIN) $(E2E_symfony6_RUNTIME_DIR)/vendor $(E2E_symfony6_RUNTIME_DIR)/.env.local.php
321321
@# Packages a fresh Symfony app
322-
@mkdir -p $(E2E_SYMFONY_RUNTIME_OUTPUT_DIR)
323-
php $(E2E_SYMFONY_RUNTIME_CONSOLE) --version --no-ansi \
324-
1>$(E2E_SYMFONY_RUNTIME_EXPECTED_STDOUT) \
325-
2>$(E2E_SYMFONY_RUNTIME_EXPECTED_STDERR)
322+
@mkdir -p $(E2E_symfony6_RUNTIME_OUTPUT_DIR)
323+
php $(E2E_symfony6_RUNTIME_CONSOLE) --version --no-ansi \
324+
1>$(E2E_symfony6_RUNTIME_EXPECTED_STDOUT) \
325+
2>$(E2E_symfony6_RUNTIME_EXPECTED_STDERR)
326326

327327
@# Clear the cache: we want to make sure it works on a clean installation
328-
$(E2E_SYMFONY_RUNTIME_CONSOLE) cache:pool:clear cache.global_clearer --env=prod --ansi
329-
$(E2E_SYMFONY_RUNTIME_CONSOLE) cache:clear --env=prod --ansi
330-
rm -rf $(E2E_SYMFONY_RUNTIME_DIR)/var/cache/prod/*
328+
$(E2E_symfony6_RUNTIME_CONSOLE) cache:pool:clear cache.global_clearer --env=prod --ansi
329+
$(E2E_symfony6_RUNTIME_CONSOLE) cache:clear --env=prod --ansi
330+
rm -rf $(E2E_symfony6_RUNTIME_DIR)/var/cache/prod/*
331331

332-
$(SCOPED_BOX) compile --working-dir=$(E2E_SYMFONY_RUNTIME_DIR) --no-parallel --ansi
333-
mv -fv $(E2E_SYMFONY_RUNTIME_TMP_PHAR) $(E2E_SYMFONY_RUNTIME_PHAR)
332+
$(SCOPED_BOX) compile --working-dir=$(E2E_symfony6_RUNTIME_DIR) --no-parallel --ansi
333+
mv -fv $(E2E_symfony6_RUNTIME_TMP_PHAR) $(E2E_symfony6_RUNTIME_PHAR)
334334

335-
php $(E2E_SYMFONY_RUNTIME_PHAR) --version --no-ansi \
336-
1>$(E2E_SYMFONY_RUNTIME_ACTUAL_STDOUT) \
337-
2>$(E2E_SYMFONY_RUNTIME_ACTUAL_STDERR) || true
335+
php $(E2E_symfony6_RUNTIME_PHAR) --version --no-ansi \
336+
1>$(E2E_symfony6_RUNTIME_ACTUAL_STDOUT) \
337+
2>$(E2E_symfony6_RUNTIME_ACTUAL_STDERR) || true
338338

339-
$(DIFF) $(E2E_SYMFONY_RUNTIME_EXPECTED_STDOUT) $(E2E_SYMFONY_RUNTIME_ACTUAL_STDOUT)
340-
$(DIFF) $(E2E_SYMFONY_RUNTIME_EXPECTED_STDERR) $(E2E_SYMFONY_RUNTIME_ACTUAL_STDERR)
339+
$(DIFF) $(E2E_symfony6_RUNTIME_EXPECTED_STDOUT) $(E2E_symfony6_RUNTIME_ACTUAL_STDOUT)
340+
$(DIFF) $(E2E_symfony6_RUNTIME_EXPECTED_STDERR) $(E2E_symfony6_RUNTIME_ACTUAL_STDERR)
341341

342342
.PHONY: e2e_composer_installed_versions
343343
e2e_composer_installed_versions: $(SCOPED_BOX_BIN) $(E2E_COMPOSER_INSTALLED_DIR)/vendor
@@ -467,25 +467,25 @@ $(E2E_SCOPER_EXPOSE_SYMBOLS_DIR)/composer.lock: $(E2E_SCOPER_EXPOSE_SYMBOLS_DIR)
467467
@echo "$(ERROR_COLOR)$(@) is not up to date. You may want to run the following command:$(NO_COLOR)"
468468
@echo "$$ composer update --lock --working-dir=$(E2E_SCOPER_EXPOSE_SYMBOLS_DIR) && touch -c $(@)"
469469

470-
$(E2E_SYMFONY_DIR)/.env.local.php: $(E2E_SYMFONY_DIR)/vendor $(E2E_SYMFONY_DIR)/.env
471-
composer dump-env prod --working-dir=$(E2E_SYMFONY_DIR) --ansi
470+
$(E2E_symfony6_DIR)/.env.local.php: $(E2E_symfony6_DIR)/vendor $(E2E_symfony6_DIR)/.env
471+
composer dump-env prod --working-dir=$(E2E_symfony6_DIR) --ansi
472472
touch -c $@
473-
$(E2E_SYMFONY_DIR)/vendor:
474-
composer install --ansi --working-dir=$(E2E_SYMFONY_DIR)
473+
$(E2E_symfony6_DIR)/vendor:
474+
composer install --ansi --working-dir=$(E2E_symfony6_DIR)
475475
touch -c $@
476-
$(E2E_SYMFONY_DIR)/composer.lock: $(E2E_SYMFONY_DIR)/composer.json
476+
$(E2E_symfony6_DIR)/composer.lock: $(E2E_symfony6_DIR)/composer.json
477477
@echo "$(ERROR_COLOR)$(@) is not up to date. You may want to run the following command:$(NO_COLOR)"
478-
@echo "$$ composer update --lock --working-dir=$(E2E_SYMFONY_DIR) && touch -c $(@)"
478+
@echo "$$ composer update --lock --working-dir=$(E2E_symfony6_DIR) && touch -c $(@)"
479479

480-
$(E2E_SYMFONY_RUNTIME_DIR)/.env.local.php: $(E2E_SYMFONY_RUNTIME_DIR)/vendor $(E2E_SYMFONY_RUNTIME_DIR)/.env
481-
composer dump-env prod --working-dir=$(E2E_SYMFONY_RUNTIME_DIR) --ansi
480+
$(E2E_symfony6_RUNTIME_DIR)/.env.local.php: $(E2E_symfony6_RUNTIME_DIR)/vendor $(E2E_symfony6_RUNTIME_DIR)/.env
481+
composer dump-env prod --working-dir=$(E2E_symfony6_RUNTIME_DIR) --ansi
482482
touch -c $@
483-
$(E2E_SYMFONY_RUNTIME_DIR)/vendor:
484-
composer install --ansi --working-dir=$(E2E_SYMFONY_RUNTIME_DIR)
483+
$(E2E_symfony6_RUNTIME_DIR)/vendor:
484+
composer install --ansi --working-dir=$(E2E_symfony6_RUNTIME_DIR)
485485
touch -c $@
486-
$(E2E_SYMFONY_RUNTIME_DIR)/composer.lock: $(E2E_SYMFONY_RUNTIME_DIR)/composer.json
486+
$(E2E_symfony6_RUNTIME_DIR)/composer.lock: $(E2E_symfony6_RUNTIME_DIR)/composer.json
487487
@echo "$(ERROR_COLOR)$(@) is not up to date. You may want to run the following command:$(NO_COLOR)"
488-
@echo "$$ composer update --lock --working-dir=$(E2E_SYMFONY_RUNTIME_DIR) && touch -c $(@)"
488+
@echo "$$ composer update --lock --working-dir=$(E2E_symfony6_RUNTIME_DIR) && touch -c $(@)"
489489

490490
$(E2E_COMPOSER_INSTALLED_DIR)/vendor: $(E2E_COMPOSER_INSTALLED_DIR)/composer.lock
491491
composer install --ansi --working-dir=$(E2E_COMPOSER_INSTALLED_DIR)

‎tests/AutoReview/GAE2ECollectorTest.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,16 @@
2424
#[CoversClass(GAE2ECollector::class)]
2525
class GAE2ECollectorTest extends TestCase
2626
{
27+
private const E2E_NAME_REGEX = '/^e2e_[\p{L}\d_]+$/';
28+
2729
public function test_it_collects_the_e2e_test_names(): void
2830
{
2931
$names = GAE2ECollector::getExecutedE2ETests();
3032

3133
self::assertGreaterThan(0, count($names));
3234

3335
foreach ($names as $name) {
34-
self::assertMatchesRegularExpression('/^e2e_[\p{L}_]+$/', $name);
36+
self::assertMatchesRegularExpression(self::E2E_NAME_REGEX, $name);
3537
}
3638
}
3739
}

0 commit comments

Comments
 (0)