Skip to content

Commit 14d1155

Browse files
solveratsolverat
authored
fix test structure (#231)
1 parent b3f3dc6 commit 14d1155

File tree

7 files changed

+50
-29
lines changed

7 files changed

+50
-29
lines changed

‎.gitattributes

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
/.github export-ignore
2+
/docs export-ignore
3+
/tests export-ignore
4+
/.gitattributes export-ignore
5+
/.gitignore export-ignore
6+
/codeception.dist.yml export-ignore
7+
/phpstan.neon export-ignore
8+
/ecs.php export-ignore
9+
/CLA.md export-ignore
10+
/CODE_OF_CONDUCT.md export-ignore
11+
/ISSUE_TEMPLATE.md export-ignore
12+
/PULL_REQUEST_TEMPLATE.md export-ignore

‎.github/workflows/codeception.yml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,15 @@ jobs:
3838
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
3939
strategy:
4040
matrix:
41-
php: [ 8.2 ]
42-
symfony: [ ^6.2 ]
43-
pimcore: [ ~11.0.0 ]
41+
php: [ 8.3 ]
42+
symfony: [ ^6.4 ]
43+
pimcore: [ ~11.4.0 ]
4444
include:
45-
- pimcore: ~11.0.0
46-
template_tag: v11.0.0
45+
- pimcore: ~11.4.0
46+
template_tag: 2024.3
4747
steps:
48-
- uses: actions/checkout@v2
48+
- uses: nanasess/setup-chromedriver@v2
49+
- uses: actions/checkout@v4
4950
with:
5051
path: lib/test-bundle
5152

@@ -99,7 +100,7 @@ jobs:
99100
- name: Setup Chromium
100101
run: |
101102
export DISPLAY=:99
102-
chromedriver --url-base=/wd/hub &
103+
chromedriver --url-base=/wd/hub --port=9515 &
103104
sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
104105
105106
- name: Start Symfony Server
@@ -110,10 +111,10 @@ jobs:
110111
- name: Get Composer Cache Directory
111112
id: composer-cache
112113
run: |
113-
echo "::set-output name=dir::$(composer config cache-files-dir)"
114+
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
114115
115116
- name: Cache Composer Downloads
116-
uses: actions/cache@v1
117+
uses: actions/cache@v4
117118
with:
118119
path: ${{ steps.composer-cache.outputs.dir }}
119120
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -138,7 +139,7 @@ jobs:
138139
vendor/bin/codecept run --env github -c ${{ github.workspace }}/lib/test-bundle
139140
140141
- name: Log Output
141-
uses: actions/upload-artifact@v2
142+
uses: actions/upload-artifact@v4
142143
if: failure()
143144
with:
144145
name: "Logs (PHP ${{ matrix.php }}, Pimcore ${{ matrix.pimcore }}, Symfony ${{ matrix.symfony }})"

‎.github/workflows/ecs.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ jobs:
3737
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
3838
strategy:
3939
matrix:
40-
php: [ 8.2 ]
41-
symfony: [ ^6.2 ]
42-
pimcore: [ ~11.0.0 ]
40+
php: [ 8.3 ]
41+
symfony: [ ^6.4 ]
42+
pimcore: [ ~11.4.0 ]
4343
include:
44-
- pimcore: ~11.0.0
45-
template_tag: v11.0.0
44+
- pimcore: ~11.4.0
45+
template_tag: 2024.3
4646
steps:
47-
- uses: actions/checkout@v2
47+
- uses: actions/checkout@v4
4848
with:
4949
path: lib/test-bundle
5050

@@ -88,10 +88,10 @@ jobs:
8888
- name: Get Composer Cache Directory
8989
id: composer-cache
9090
run: |
91-
echo "::set-output name=dir::$(composer config cache-files-dir)"
91+
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
9292
9393
- name: Cache Composer Downloads
94-
uses: actions/cache@v1
94+
uses: actions/cache@v4
9595
with:
9696
path: ${{ steps.composer-cache.outputs.dir }}
9797
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}

‎.github/workflows/php-stan.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ jobs:
3737
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
3838
strategy:
3939
matrix:
40-
php: [ 8.2 ]
41-
symfony: [ ^6.2 ]
42-
pimcore: [ ~11.0.0 ]
40+
php: [ 8.3 ]
41+
symfony: [ ^6.4 ]
42+
pimcore: [ ~11.4.0 ]
4343
include:
44-
- pimcore: ~11.0.0
45-
template_tag: v11.0.0
44+
- pimcore: ~11.4.0
45+
template_tag: 2024.3
4646
steps:
47-
- uses: actions/checkout@v2
47+
- uses: actions/checkout@v4
4848
with:
4949
path: lib/test-bundle
5050

@@ -88,10 +88,10 @@ jobs:
8888
- name: Get Composer Cache Directory
8989
id: composer-cache
9090
run: |
91-
echo "::set-output name=dir::$(composer config cache-files-dir)"
91+
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
9292
9393
- name: Cache Composer Downloads
94-
uses: actions/cache@v1
94+
uses: actions/cache@v4
9595
with:
9696
path: ${{ steps.composer-cache.outputs.dir }}
9797
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -110,6 +110,10 @@ jobs:
110110
run: |
111111
bin/console assets:install public --relative --symlink
112112
113+
- name: Validate Container
114+
run: |
115+
bin/console lint:container
116+
113117
- name: Php Stan
114118
run: |
115119
bin/console cache:warmup --env=test

‎tests/_envs/github.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ modules:
77
wait: 1
88
window_size: 1280x1024
99
capabilities:
10-
chromeOptions:
11-
args: ['--no-sandbox', '--disable-extensions', '--headless', '--disable-gpu', '--disable-dev-shm-usage']
10+
'goog:chromeOptions':
11+
args: ['--no-sandbox', '--disable-extensions', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--window-size=1280,1024']
1212
prefs:
1313
download.default_directory: '%TEST_BUNDLE_TEST_DIR%/_data/downloads'

‎tests/_envs/local.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ modules:
77
wait: 1
88
capabilities:
99
chromeOptions:
10-
args: ['--no-sandbox', '--disable-extensions', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--window-size=1024,768']
10+
args: ['--disable-extensions', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--window-size=1280,1024']

‎tests/_etc/config/app/config.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ services:
1111
- [setContainer, ['@service_container']]
1212

1313
doctrine:
14+
orm:
15+
entity_managers:
16+
default:
17+
connection: default
1418
dbal:
1519
connections:
1620
default:

0 commit comments

Comments
 (0)