Skip to content

Commit 0dd0ed5

Browse files
committed
Functional Tests : Update matrix
1 parent fb191b2 commit 0dd0ed5

4 files changed

Lines changed: 43 additions & 8 deletions

File tree

.github/workflows/php.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ jobs:
7373
php-version: '7.4'
7474
- prestashop-version: '9.0.3'
7575
php-version: '8.1'
76+
- prestashop-version: '9.1.x'
77+
php-version: '8.1'
7678
- prestashop-version: 'develop'
7779
php-version: '8.1'
7880
steps:

.github/workflows/ui-test.yml

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,29 @@ jobs:
2626
matrix:
2727
include:
2828
- PS_VERSION: '8.0.5'
29+
PS_VERSION_DOCKER: '8.0.5'
2930
PHP_VERSION: '8.1'
31+
PS_THEME_FO: 'classic'
3032
- PS_VERSION: '8.1.7'
33+
PS_VERSION_DOCKER: '8.1.7'
3134
PHP_VERSION: '8.1'
32-
- PS_VERSION: '9.0.x'
33-
PHP_VERSION: '8.2'
35+
PS_THEME_FO: 'classic'
36+
- PS_VERSION: '9.0.3'
37+
PS_VERSION_DOCKER: '9.0.3-3.0-classic'
38+
PHP_VERSION: '8.4'
39+
PS_THEME_FO: 'classic'
40+
- PS_VERSION: '9.1.x'
41+
PS_VERSION_DOCKER: '9.1.x'
42+
PHP_VERSION: '8.4'
43+
PS_THEME_FO: 'classic'
3444
- PS_VERSION: 'nightly'
35-
PHP_VERSION: '8.2'
45+
PS_VERSION_DOCKER: 'nightly'
46+
PHP_VERSION: '8.4'
47+
PS_THEME_FO: 'hummingbird'
3648

3749
env:
3850
PS_VERSION: ${{ matrix.PS_VERSION }}
51+
PS_THEME_FO: ${{ matrix.PS_THEME_FO }}
3952

4053
steps:
4154
- name: Checkout
@@ -61,7 +74,7 @@ jobs:
6174
working-directory: tests/UI/
6275
timeout-minutes: 15
6376
env:
64-
PS_VERSION: ${{ matrix.PS_VERSION }}
77+
PS_VERSION: ${{ matrix.PS_VERSION_DOCKER }}
6578
PHP_VERSION: ${{ matrix.PHP_VERSION }}
6679
run: |
6780
docker compose -f "docker-compose.yml" up -d --build
@@ -122,10 +135,12 @@ jobs:
122135
PHP_VERSION: '8.1'
123136
- PS_VERSION: '8.1.7'
124137
PHP_VERSION: '8.1'
125-
- PS_VERSION: '9.0.x'
126-
PHP_VERSION: '8.2'
138+
- PS_VERSION: '9.0.3'
139+
PHP_VERSION: '8.4'
140+
- PS_VERSION: '9.1.x'
141+
PHP_VERSION: '8.4'
127142
- PS_VERSION: 'nightly'
128-
PHP_VERSION: '8.2'
143+
PHP_VERSION: '8.4'
129144

130145
env:
131146
PS_VERSION: ${{ matrix.PS_VERSION }}

tests/UI/campaigns/01_installation/04_resetModule.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ test.describe('Wishlist module - Reset module', () => {
6666
});
6767

6868
// >= 9.1.x : Hummingbird is enabled, but blockwishlist is disabled
69-
if (semver.gte(utilsTest.getPSVersion(), '9.1.0')) {
69+
if (semver.gt(utilsTest.getPSVersion(), '9.1.0')) {
7070
test(`should enable the module ${dataModules.blockwishlist.name}`, async () => {
7171
await utilsTest.addContextItem(test.info(), 'testIdentifier', 'searchModule', baseContext);
7272

tests/phpstan/phpstan-9.1.x.neon

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
includes:
2+
- %currentWorkingDirectory%/tests/phpstan/phpstan.neon
3+
4+
parameters:
5+
ignoreErrors:
6+
- '#Access to property \$php_self on an unknown class PrestaShop\\PrestaShop\\Core\\Context\\LegacyControllerContext.#'
7+
- '#Call to method addC[Ss]+\(\) on an unknown class PrestaShop\\PrestaShop\\Core\\Context\\LegacyControllerContext.#'
8+
- '#Call to method addJ[Ss]+\(\) on an unknown class PrestaShop\\PrestaShop\\Core\\Context\\LegacyControllerContext.#'
9+
- '#Method BlockWishListActionModuleFrontController\:\:addProductToCartAction\(\) is unused.#'
10+
- '#Method BlockWishListActionModuleFrontController\:\:addProductToWishListAction\(\) is unused.#'
11+
- '#Method BlockWishListActionModuleFrontController\:\:createNewWishListAction\(\) is unused.#'
12+
- '#Method BlockWishListActionModuleFrontController\:\:deleteProductFromWishListAction\(\) is unused.#'
13+
- '#Method BlockWishListActionModuleFrontController\:\:deleteWishListAction\(\) is unused.#'
14+
- '#Method BlockWishListActionModuleFrontController\:\:getAllWishListAction\(\) is unused.#'
15+
- '#Method BlockWishListActionModuleFrontController\:\:getUrlByIdWishListAction\(\) is unused.#'
16+
- '#Method BlockWishListActionModuleFrontController\:\:renameWishListAction\(\) is unused.#'
17+
- '#Method BlockWishListActionModuleFrontController\:\:updateProductFromWishListAction\(\) is unused.#'
18+
- '#Parameter \$request of method PrestaShop\\Module\\BlockWishList\\Controller\\WishlistConfigurationAdminController\:\:configurationAction\(\) has invalid type Symfony\\Component\\HttpFoundation\\Request.#'

0 commit comments

Comments
 (0)