Skip to content

Commit e0d2190

Browse files
authored
Merge pull request #136 from magento-commerce/develop
Getting ready for MFTF 3.7.1 release
2 parents 00b0e54 + d0d55e6 commit e0d2190

File tree

107 files changed

+1711
-1226
lines changed

Some content is hidden

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

107 files changed

+1711
-1226
lines changed

.github/.metadata.json

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"templateVersion": "0.1",
3+
"product": {
4+
"name": "Magento2 Functional Testing Framework (MFTF)",
5+
"description": "MFTF is a framework to write and execute UI Functional tests for Magento 2 projects"
6+
},
7+
"contacts": {
8+
"team": {
9+
"name": "Magento Quality Engineering / Pangolin",
10+
"DL": "GRP-Pangolin",
11+
"slackChannel": "mftf"
12+
}
13+
},
14+
"ticketTracker": {
15+
"functionalJiraQueue": {
16+
"projectKey": "MQE",
17+
"component": "Framework - MFTF"
18+
},
19+
"securityJiraQueue": {
20+
"projectKey": "MAGREQ",
21+
"component": "Test Infrastructure"
22+
}
23+
},
24+
"staticScan": {
25+
"enable": true,
26+
"frequency": "monthly",
27+
"customName": "",
28+
"branchesToScan": [
29+
"develop"
30+
]
31+
}
32+
}

.github/workflows/main.yml

Lines changed: 12 additions & 12 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.3', '7.4', '8.0']
15+
php-versions: ['7.3', '7.4', '8.0', '8.1']
1616
steps:
1717
- uses: actions/checkout@v2
1818

@@ -39,22 +39,22 @@ jobs:
3939
- name: Run tests
4040
run: vendor/bin/phpunit --configuration dev/tests/phpunit.xml --testsuite unit --coverage-clover clover.xml
4141

42-
- name: Monitor coverage
43-
if: github.event_name == 'pull_request'
44-
uses: slavcodev/coverage-monitor-action@1.2.0
45-
with:
46-
github_token: ${{ secrets.GITHUB_TOKEN }}
47-
clover_file: "clover.xml"
48-
threshold_alert: 10
49-
threshold_warning: 20
42+
# - name: Monitor coverage
43+
# if: github.event_name == 'pull_request'
44+
# uses: slavcodev/coverage-monitor-action@1.2.0
45+
# with:
46+
# github_token: ${{ secrets.GITHUB_TOKEN }}
47+
# clover_file: "clover.xml"
48+
# threshold_alert: 10
49+
# threshold_warning: 20
5050

5151
verification-tests:
5252
name: Verification Tests
5353
runs-on: ubuntu-latest
5454
strategy:
5555
fail-fast: false
5656
matrix:
57-
php-versions: ['7.3', '7.4', '8.0']
57+
php-versions: ['7.3', '7.4', '8.0', '8.1']
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.3', '7.4', '8.0']
89+
php-versions: ['7.3', '7.4', '8.0', '8.1']
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.3', '7.4', '8.0']
121+
php-versions: ['7.3', '7.4', '8.0', '8.1']
122122

123123
services:
124124
chrome:

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,6 @@ dev/tests/docs/*
2020
dev/tests/_output
2121
dev/tests/functional.suite.yml
2222
/v2/
23+
dev/.credentials.example
24+
dev/tests/.phpunit.result.cache
25+
dev/tests/verification/TestModule/Test/testFile.xml

CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
Magento Functional Testing Framework Changelog
22
================================================
3+
3.7.1
4+
---------
5+
6+
### GitHub Pull Requests:
7+
* [#873](https://github.com/magento/magento2-functional-testing-framework/pull/873) -- Add check for isBuiltin method (for PHP 8 compatibility) by @karyna-tsymbal-atwix
8+
9+
### Updates
10+
* Moved `hoa/console` to suggest section to avoid issues with PHP8.0
11+
* Update `vlucas/phpdotenv` to the latest versions
12+
* `<seeInCurrentUrl />` encodes special character which caused test failed
13+
* Add filter for groups, now we can generate tests with specific group annotation
14+
* Seprated a `run:failed` command to `generate:failed` and `run:failed`
15+
* `run:failed` command can execute failed tests without need to regenerate failed tests
16+
* Deleting MagentoPwaWebDriver file and moving it to Pwa_tests repo
17+
18+
319
3.7.0
420
---------
521

composer.json

Lines changed: 5 additions & 3 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.7.0",
5+
"version": "3.7.1",
66
"license": "AGPL-3.0",
77
"keywords": ["magento", "automation", "functional", "testing"],
88
"config": {
@@ -24,18 +24,17 @@
2424
"composer/composer": "^1.9||^2.0",
2525
"csharpru/vault-php": "^4.2.1",
2626
"guzzlehttp/guzzle": "^7.3.0",
27-
"hoa/console": "~3.0",
2827
"monolog/monolog": "^2.3",
2928
"mustache/mustache": "~2.5",
3029
"nikic/php-parser": "^4.4",
3130
"php-webdriver/webdriver": "^1.9.0",
3231
"spomky-labs/otphp": "^10.0",
3332
"symfony/console": "^4.4",
33+
"symfony/dotenv": "^5.3",
3434
"symfony/finder": "^5.0",
3535
"symfony/http-foundation": "^5.0",
3636
"symfony/mime": "^5.0",
3737
"symfony/process": "^4.4",
38-
"vlucas/phpdotenv": "^2.4",
3938
"weew/helpers-array": "^1.3"
4039
},
4140
"require-dev": {
@@ -47,6 +46,9 @@
4746
"sebastian/phpcpd": "~6.0.0",
4847
"squizlabs/php_codesniffer": "~3.6.0"
4948
},
49+
"suggest": {
50+
"hoa/console": "Enables <pause /> action and interactive console functionality"
51+
},
5052
"autoload": {
5153
"files": ["src/Magento/FunctionalTestingFramework/_bootstrap.php"],
5254
"psr-4": {

0 commit comments

Comments
 (0)