Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/npm_and_yarn/playwright/test-1.…
Browse files Browse the repository at this point in the history
…44.1
  • Loading branch information
nanasess committed Jun 6, 2024
2 parents 948a6c2 + b6effb1 commit 8c8c7cd
Show file tree
Hide file tree
Showing 5 changed files with 638 additions and 666 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@ jobs:
- name: Setup to EC-CUBE
run: |
docker compose up -d --wait
while [ ! -e "data/config/config.php" ]
do
printf "."
sleep 1
done
docker compose exec -T ec-cube composer install
docker compose exec -T ec-cube composer require ec-cube2/cli "dev-master@dev" -W
docker compose exec -T ec-cube composer update 'symfony/*' -W
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,12 @@ jobs:
fi
- run: |
docker compose up -d --wait
while [ ! -e "data/config/config.php" ]
do
printf "."
sleep 1
done
cat data/config/config.php
docker compose exec -T ec-cube composer install
- name: Run to PHPUnit
run: docker compose exec -T ec-cube php data/vendor/bin/phpunit --exclude-group classloader,mysql_prepare
Expand All @@ -76,3 +82,6 @@ jobs:
with:
name: linux-php${{ matrix.php }}-${{ matrix.db }}-logs
path: data/logs

- if: failure()
run: docker compose logs -n 200
70 changes: 35 additions & 35 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"license": "GPL",
"dependencies": {
"@babel/polyfill": "^7.12.1",
"css-loader": "^7.1.1",
"css-loader": "^7.1.2",
"date-fns": "^3.6.0",
"date-fns-tz": "^3.1.3",
"jquery": "3",
Expand All @@ -20,8 +20,8 @@
"webpack": "^5.91.0"
},
"devDependencies": {
"@babel/core": "^7.24.5",
"@babel/preset-env": "^7.24.5",
"@babel/core": "^7.24.6",
"@babel/preset-env": "^7.24.6",
"@faker-js/faker": "^8.4.1",
"@playwright/test": "^1.44.1",
"@types/date-fns": "^2.6.0",
Expand All @@ -37,7 +37,7 @@
"eslint-plugin-import": "^2.29.1",
"tar": "^7.1.0",
"typescript": "^5.4.5",
"tar": "^7.0.1",
"tar": "^7.2.0",
"typescript": "^5.4.5",
"webpack-cli": "^4.10.0",
"zaproxy": "^1.0.1"
Expand Down
Loading

0 comments on commit 8c8c7cd

Please sign in to comment.