Skip to content

Commit effdcae

Browse files
committed
[Maintenance] build fix
1 parent 6247710 commit effdcae

File tree

6 files changed

+49
-53
lines changed

6 files changed

+49
-53
lines changed

.github/workflows/build.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ jobs:
7272
name: Run Chrome Headless
7373
run: google-chrome-stable --enable-automation --disable-background-networking --no-default-browser-check --no-first-run --disable-popup-blocking --disable-default-apps --allow-insecure-localhost --disable-translate --disable-extensions --no-sandbox --enable-features=Metal --headless --remote-debugging-port=9222 --window-size=2880,1800 --proxy-server='direct://' --proxy-bypass-list='*' http://127.0.0.1 > /dev/null 2>&1 &
7474

75-
-
75+
-
7676
name: Run webserver
77-
run: (symfony server:start --port=8080 --dir=public --daemon)
77+
run: symfony server:start --port=8080 --daemon
7878

7979
-
8080
name: Get Composer cache directory
@@ -140,24 +140,24 @@ jobs:
140140
-
141141
name: Prepare test application assets
142142
run: |
143-
(cd vendor/bin/console assets:install public -vvv)
143+
(vendor/bin/console assets:install public -vvv)
144144
(cd vendor/sylius/test-application && yarn build:prod)
145145
146146
-
147147
name: Prepare test application cache
148-
run: (cd vendor/bin/console cache:warmup -vvv)
148+
run: (vendor/bin/console cache:warmup -vvv)
149149

150150
-
151151
name: Load fixtures in test application
152-
run: (cd vendor/bin/console sylius:fixtures:load -n)
152+
run: (vendor/bin/console sylius:fixtures:load -n)
153153

154154
-
155155
name: Validate composer.json
156156
run: composer validate --ansi --strict
157157

158158
-
159159
name: Validate database schema
160-
run: (cd vendor/bin/console doctrine:schema:validate)
160+
run: (vendor/bin/console doctrine:schema:validate)
161161

162162
-
163163
name: Run PHPStan

behat.yml.dist

Lines changed: 6 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,8 @@ imports:
33
- tests/Behat/Resources/suites.yml
44

55
default:
6-
formatters:
7-
pretty:
8-
verbose: true
9-
paths: false
10-
snippets: false
11-
126
extensions:
137
DMore\ChromeExtension\Behat\ServiceContainer\ChromeExtension: ~
14-
Robertfausk\Behat\PantherExtension: ~
158

169
FriendsOfBehat\MinkDebugExtension:
1710
directory: etc/build
@@ -22,43 +15,25 @@ default:
2215
files_path: "%paths.base%/vendor/sylius/sylius/src/Sylius/Behat/Resources/fixtures/"
2316
base_url: "https://127.0.0.1:8080/"
2417
default_session: symfony
25-
javascript_session: panther
18+
javascript_session: chrome
2619
sessions:
2720
symfony:
2821
symfony: ~
29-
chromedriver:
30-
chrome:
31-
api_url: http://127.0.0.1:9222
32-
validate_certificate: false
33-
chrome_headless_second_session:
22+
chrome:
3423
chrome:
3524
api_url: http://127.0.0.1:9222
3625
validate_certificate: false
37-
panther:
38-
panther:
39-
options:
40-
webServerDir: '%paths.base%/tests/Application/public'
41-
manager_options:
42-
connection_timeout_in_ms: 5000
43-
request_timeout_in_ms: 120000
44-
chromedriver_arguments:
45-
- --log-path=etc/build/chromedriver.log
46-
- --verbose
47-
capabilities:
48-
acceptSslCerts: true
49-
acceptInsecureCerts: true
50-
unexpectedAlertBehaviour: accept
5126
show_auto: false
5227

5328
FriendsOfBehat\SymfonyExtension:
54-
bootstrap: tests/Application/config/bootstrap.php
29+
bootstrap: vendor/sylius/test-application/config/bootstrap.php
5530
kernel:
56-
class: Tests\Acme\SyliusExamplePlugin\Application\Kernel
31+
class: Sylius\TestApplication\Kernel
5732

5833
FriendsOfBehat\VariadicExtension: ~
5934

35+
SyliusLabs\SuiteTagsExtension: ~
36+
6037
FriendsOfBehat\SuiteSettingsExtension:
6138
paths:
6239
- "features"
63-
64-
SyliusLabs\SuiteTagsExtension: ~

composer.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,17 @@
4242
"symfony/http-client": "^6.4 || ^7.1",
4343
"symfony/intl": "^6.4 || ^7.1",
4444
"symfony/web-profiler-bundle": "^6.4 || ^7.1",
45-
"symfony/webpack-encore-bundle": "^2.2"
45+
"symfony/webpack-encore-bundle": "^2.2",
46+
"symfony/runtime": "^6.4"
4647
},
4748
"config": {
4849
"sort-packages": true,
4950
"allow-plugins": {
5051
"dealerdirect/phpcodesniffer-composer-installer": false,
5152
"php-http/discovery": false,
5253
"phpstan/extension-installer": true,
53-
"symfony/flex": true
54+
"symfony/flex": true,
55+
"symfony/runtime": true
5456
}
5557
},
5658
"extra": {

phpunit.xml.dist

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,40 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/8.5/phpunit.xsd"
5-
colors="true"
6-
bootstrap="tests/Application/config/bootstrap.php">
3+
<phpunit
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
6+
colors="true"
7+
bootstrap="vendor/sylius/test-application/config/bootstrap.php"
8+
>
9+
<php>
10+
<server name="KERNEL_CLASS" value="Sylius\TestApplication\Kernel" />
11+
<server name="IS_DOCTRINE_ORM_SUPPORTED" value="true"/>
12+
<server name="EXPECTED_RESPONSE_DIR" value="../Responses/Expected"/>
13+
14+
<env name="APP_SECRET" value="''" />
15+
<env name="APP_ENV" value="test"/>
16+
</php>
17+
718
<testsuites>
8-
<testsuite name="AcmeSyliusExamplePlugin Test Suite">
19+
<testsuite name="all">
920
<directory>tests</directory>
1021
</testsuite>
11-
</testsuites>
1222

13-
<php>
14-
<ini name="error_reporting" value="-1" />
23+
<testsuite name="unit">
24+
<directory>tests/Unit</directory>
25+
</testsuite>
1526

16-
<server name="KERNEL_CLASS_PATH" value="/tests/Application/AppKernel.php" />
17-
<server name="IS_DOCTRINE_ORM_SUPPORTED" value="true" />
27+
<testsuite name="functional">
28+
<directory>tests/Functional</directory>
29+
</testsuite>
1830

19-
<env name="APP_ENV" value="test"/>
20-
<env name="SHELL_VERBOSITY" value="-1" />
21-
</php>
31+
<testsuite name="integration">
32+
<directory>tests/Integration</directory>
33+
</testsuite>
34+
35+
<testsuite name="non-unit">
36+
<directory>tests/Functional</directory>
37+
<directory>tests/Integration</directory>
38+
</testsuite>
39+
</testsuites>
2240
</phpunit>

tests/TestApplication/.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ DATABASE_URL=mysql://root:root@127.0.0.1/acme_sylius_example_plugin_%kernel.envi
22

33
BUNDLES_TO_ENABLE="Acme\SyliusExamplePlugin\AcmeSyliusExamplePlugin"
44
CONFIGS_TO_IMPORT="@AcmeSyliusExamplePlugin/tests/TestApplication/config/config.yaml"
5-
ROUTES_TO_IMPORT="@AcmeSyliusExamplePlugin/config/routes.yaml"
5+
ROUTES_TO_IMPORT="@AcmeSyliusExamplePlugin/config/shop_routing.yaml"

tests/TestApplication/config/config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
imports:
22
- { resource: "@AcmeSyliusExamplePlugin/config/config.yaml" }
3+
- { resource: "services_test.php" }
34

45
twig:
56
paths:

0 commit comments

Comments
 (0)