Skip to content

Commit d26ecae

Browse files
authored
Merge branch 'develop' into imported-magento-magento2-functional-testing-framework-812
2 parents bede92f + 1eafa70 commit d26ecae

30 files changed

+2275
-1361
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ jobs:
2121
with:
2222
php-version: ${{ matrix.php-versions }}
2323
extensions: curl, dom, intl, json, openssl
24+
coverage: xdebug
2425

2526
- name: Cache Composer packages
2627
id: composer-cache
@@ -40,7 +41,7 @@ jobs:
4041

4142
- name: Monitor coverage
4243
if: github.event_name == 'pull_request'
43-
uses: slavcodev/coverage-monitor-action@1.1.0
44+
uses: slavcodev/coverage-monitor-action@1.2.0
4445
with:
4546
github_token: ${{ secrets.GITHUB_TOKEN }}
4647
clover_file: "clover.xml"

CHANGELOG.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,31 @@
11
Magento Functional Testing Framework Changelog
22
================================================
33

4+
3.4.0
5+
---------
6+
7+
### Enhancements
8+
9+
* Maintainability
10+
* Added support for composer 2.
11+
12+
3.3.0
13+
---------
14+
15+
### Enhancements
16+
17+
* Usability
18+
* [#817](https://github.com/magento/magento2-functional-testing-framework/pull/817) -- Add support for admin WebAPI token refresh
19+
20+
* Maintainability
21+
* [#814](https://github.com/magento/magento2-functional-testing-framework/pull/814) -- Update dependencies in order to make mftf php8 compatible, fix running phpcpd
22+
* [#815](https://github.com/magento/magento2-functional-testing-framework/pull/815) -- Upgrade csharpru/vault-php to 4.1
23+
24+
### Fixes
25+
26+
* Fixed test generation error in a split suite group (--config=parallel) to allow generation of subsequent groups.
27+
* Fixed an issue where test extends from a skipped parent is not properly skipped.
28+
429
3.2.1
530
---------
631

composer.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/magento2-functional-testing-framework",
33
"description": "Magento2 Functional Testing Framework",
44
"type": "library",
5-
"version": "3.2.1",
5+
"version": "3.4.0",
66
"license": "AGPL-3.0",
77
"keywords": ["magento", "automation", "functional", "testing"],
88
"config": {
@@ -21,8 +21,8 @@
2121
"codeception/module-asserts": "^1.1",
2222
"codeception/module-sequence": "^1.0",
2323
"codeception/module-webdriver": "^1.0",
24-
"composer/composer": "^1.9",
25-
"csharpru/vault-php": "~3.5.3",
24+
"composer/composer": "^1.9||^2.0",
25+
"csharpru/vault-php": "^4.1.0",
2626
"csharpru/vault-php-guzzle6-transport": "^2.0",
2727
"hoa/console": "~3.0",
2828
"monolog/monolog": "^1.17",
@@ -35,7 +35,8 @@
3535
"symfony/mime": "^5.0",
3636
"symfony/process": "^4.4",
3737
"vlucas/phpdotenv": "^2.4",
38-
"weew/helpers-array": "^1.3"
38+
"weew/helpers-array": "^1.3",
39+
"nikic/php-parser": "~4.4.0"
3940
},
4041
"require-dev": {
4142
"brainmaestro/composer-git-hooks": "^2.3.1",
@@ -47,7 +48,7 @@
4748
"phpmd/phpmd": "^2.8.0",
4849
"phpunit/phpunit": "^9.0",
4950
"rregeer/phpunit-coverage-check": "^0.1.4",
50-
"sebastian/phpcpd": "~5.0.0",
51+
"sebastian/phpcpd": "~6.0.0",
5152
"squizlabs/php_codesniffer": "~3.5.4",
5253
"symfony/stopwatch": "~3.4.6"
5354
},

0 commit comments

Comments
 (0)