Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions .env.test.dist

This file was deleted.

24 changes: 10 additions & 14 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ jobs:
APP_ENV: test
DATABASE_URL: ${{ matrix.database == 'mysql' && format('mysql://root:root@127.0.0.1/sylius?serverVersion={0}', matrix.mysql) || format('pgsql://postgres:postgres@127.0.0.1/sylius?serverVersion={0}', matrix.postgres) }}
TEST_SYLIUS_STATE_MACHINE_ADAPTER: "${{ matrix.state_machine_adapter }}"
TEST_SYLIUS_INVOICING_PDF_GENERATION_DISABLED: ${{ matrix.wkhtmltopdf == false }}

steps:
-
Expand Down Expand Up @@ -122,12 +123,6 @@ jobs:
wget https://github.com/wkhtmltopdf/packaging/releases/download/${{ matrix.wkhtmltopdf }}/wkhtmltox_${{ matrix.wkhtmltopdf }}.jammy_amd64.deb
sudo dpkg -i wkhtmltox_${{ matrix.wkhtmltopdf }}.jammy_amd64.deb

-
name: Disable PDF generation
if: matrix.wkhtmltopdf == false
run: |
mv tests/Application/etc/sylius_invoicing_pdf_generation_disabled.yaml tests/Application/config/packages

-
name: Get Composer cache directory
id: composer-cache
Expand Down Expand Up @@ -182,27 +177,27 @@ jobs:

-
name: Install JS dependencies
run: (cd tests/Application && yarn install)
run: (cd vendor/sylius/test-application && yarn install)

-
name: Prepare test application database
run: |
(cd tests/Application && bin/console doctrine:database:create -vvv)
(cd tests/Application && bin/console doctrine:migrations:migrate -n -vvv -q)
vendor/bin/console doctrine:database:create -vvv
vendor/bin/console doctrine:migrations:migrate -n -vvv -q

-
name: Prepare test application assets
run: |
(cd tests/Application && bin/console assets:install public -vvv)
(cd tests/Application && yarn build:prod)
vendor/bin/console assets:install public -vvv
(cd vendor/sylius/test-application && yarn build:prod)

-
name: Prepare test application cache
run: (cd tests/Application && bin/console cache:warmup -vvv)
run: vendor/bin/console cache:warmup -vvv

-
name: Load fixtures in test application
run: (cd tests/Application && bin/console sylius:fixtures:load -n)
run: vendor/bin/console sylius:fixtures:load -n

-
name: Run security check
Expand Down Expand Up @@ -234,6 +229,7 @@ jobs:
uses: actions/upload-artifact@v4
if: failure()
with:
name: Behat logs
name: Behat logs - ${{ github.run_id }}-${{ github.run_number }}
path: etc/build/
if-no-files-found: ignore
overwrite: true
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
/etc/build/*
!/etc/build/.gitkeep

/tests/Application/yarn.lock
/tests/Application/private/invoices/*
/tests/TestApplication/.env.local
/tests/TestApplication/.env.*.local
4 changes: 4 additions & 0 deletions assets/admin/controllers.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"controllers": [],
"entrypoints": []
}
File renamed without changes.
4 changes: 4 additions & 0 deletions assets/shop/controllers.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"controllers": [],
"entrypoints": []
}
File renamed without changes.
4 changes: 2 additions & 2 deletions behat.yml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ default:
show_auto: false

FriendsOfBehat\SymfonyExtension:
bootstrap: tests/Application/config/bootstrap.php
bootstrap: vendor/sylius/test-application/config/bootstrap.php
kernel:
class: Tests\Sylius\InvoicingPlugin\Application\Kernel
class: Sylius\TestApplication\Kernel

FriendsOfBehat\VariadicExtension: ~

Expand Down
11 changes: 9 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"phpunit/phpunit": "^9.5",
"polishsymfonycommunity/symfony-mocker-container": "^1.0",
"sylius-labs/coding-standard": "^4.4",
"sylius/test-application": "^2.0.0@alpha",
"symfony/browser-kit": "^6.4 || ^7.1",
"symfony/debug-bundle": "^6.4 || ^7.1",
"symfony/dotenv": "^6.4 || ^7.1",
Expand Down Expand Up @@ -82,13 +83,19 @@
"dealerdirect/phpcodesniffer-composer-installer": false,
"phpstan/extension-installer": true,
"symfony/thanks": false,
"php-http/discovery": false
"php-http/discovery": false,
"symfony/runtime": false
}
},
"extra": {
"symfony": {
"allow-contrib": false,
"require": "~7.2.0"
},
"branch-alias": {
"dev-2.0": "2.0-dev"
}
},
"public-dir": "vendor/sylius/test-application/public"
},
"prefer-stable": true
}
2 changes: 1 addition & 1 deletion node_modules
10 changes: 6 additions & 4 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>

<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.1/phpunit.xsd"
colors="true"
bootstrap="tests/Application/config/bootstrap.php">
<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.1/phpunit.xsd"
colors="true"
bootstrap="vendor/sylius/test-application/config/bootstrap.php"
>
<testsuites>
<testsuite name="SyliusInvoicingPlugin Test Suite">
<directory>tests</directory>
Expand Down
45 changes: 0 additions & 45 deletions tests/Application/.env

This file was deleted.

21 changes: 0 additions & 21 deletions tests/Application/.env.test

This file was deleted.

20 changes: 0 additions & 20 deletions tests/Application/.eslintrc.js

This file was deleted.

25 changes: 0 additions & 25 deletions tests/Application/.gitignore

This file was deleted.

38 changes: 0 additions & 38 deletions tests/Application/bin/console

This file was deleted.

5 changes: 0 additions & 5 deletions tests/Application/composer.json

This file was deleted.

20 changes: 0 additions & 20 deletions tests/Application/config/bootstrap.php

This file was deleted.

62 changes: 0 additions & 62 deletions tests/Application/config/bundles.php

This file was deleted.

Empty file.
Loading