Skip to content

Commit fcd4967

Browse files
authored
Merge branch 'magento-commerce:develop' into ACQE-2580
2 parents cb37563 + f1fef97 commit fcd4967

File tree

78 files changed

+322
-16120
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+322
-16120
lines changed

.github/workflows/main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
php-versions: ['7.4', '8.0', '8.1', '8.2']
15+
php-versions: ['8.0', '8.1', '8.2']
1616
steps:
1717
- uses: actions/checkout@v2
1818

@@ -54,7 +54,7 @@ jobs:
5454
strategy:
5555
fail-fast: false
5656
matrix:
57-
php-versions: ['7.4', '8.0', '8.1', '8.2']
57+
php-versions: ['8.0', '8.1', '8.2']
5858
steps:
5959
- uses: actions/checkout@v2
6060

@@ -86,7 +86,7 @@ jobs:
8686
strategy:
8787
fail-fast: false
8888
matrix:
89-
php-versions: ['7.4', '8.0', '8.1', '8.2']
89+
php-versions: ['8.0', '8.1', '8.2']
9090
steps:
9191
- uses: actions/checkout@v2
9292

@@ -118,7 +118,7 @@ jobs:
118118
strategy:
119119
fail-fast: false
120120
matrix:
121-
php-versions: ['7.4', '8.0', '8.1', '8.2']
121+
php-versions: ['8.0', '8.1', '8.2']
122122

123123
services:
124124
chrome:

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ dev/tests/functional.suite.yml
2222
/v2/
2323
dev/.credentials.example
2424
dev/tests/.phpunit.result.cache
25-
dev/tests/verification/TestModule/Test/testFile.xml
25+
dev/tests/verification/TestModule/Test/testFile.xml

CHANGELOG.md

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

4+
3.12.0
5+
---------
6+
7+
### Fixes
8+
* Removed obsolete docs/directories
9+
10+
3.11.1
11+
---------
12+
13+
### Fixes
14+
15+
* Removed environment variable MAGENTO_ADMIN_PASSWORD
16+
* Fixed WaitForElementClickable action cannot be used more than once
17+
418
3.11.0
519
---------
620
### Enhancements
@@ -12,6 +26,7 @@ Magento Functional Testing Framework Changelog
1226

1327
* Fixed incorrect MFTF test dependencies path
1428
* Removed PHP 7.3 build check from MFTF PR build as PHP 7.3 is no longer supported
29+
* Fixed fatal error when running generate:tests --config parallel -g
1530

1631

1732
3.10.3

composer.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,28 @@
22
"name": "magento/magento2-functional-testing-framework",
33
"description": "Magento2 Functional Testing Framework",
44
"type": "library",
5-
"version": "3.11.0",
5+
"version": "3.12.0",
66
"license": "AGPL-3.0",
77
"keywords": ["magento", "automation", "functional", "testing"],
88
"config": {
99
"sort-packages": true
1010
},
1111
"require": {
12-
"php": ">=7.4",
12+
"php": ">=8.0",
1313
"ext-curl": "*",
1414
"ext-dom": "*",
1515
"ext-iconv": "*",
1616
"ext-intl": "*",
1717
"ext-json": "*",
1818
"ext-openssl": "*",
1919
"allure-framework/allure-codeception": "^1.4",
20+
"allure-framework/allure-phpunit": "^2",
2021
"aws/aws-sdk-php": "^3.132",
2122
"codeception/codeception": "^4.1",
2223
"codeception/module-asserts": "^1.1",
2324
"codeception/module-sequence": "^1.0",
2425
"codeception/module-webdriver": "^1.0",
25-
"composer/composer": "^2.0, !=2.2.16",
26+
"composer/composer": "^1.9 || ^2.0, !=2.2.16",
2627
"csharpru/vault-php": "^4.2.1",
2728
"guzzlehttp/guzzle": "^7.3.0",
2829
"laminas/laminas-diactoros": "^2.8",
@@ -32,6 +33,7 @@
3233
"php-webdriver/webdriver": "^1.9.0",
3334
"spomky-labs/otphp": "^10.0",
3435
"symfony/console": "^4.4||^5.4",
36+
"symfony/string": "^5.4",
3537
"symfony/dotenv": "^5.3",
3638
"symfony/finder": "^5.0",
3739
"symfony/http-foundation": "^5.0",

0 commit comments

Comments
 (0)