Skip to content

Commit 80a7457

Browse files
jilu1jilu1
authored
Merge branch 'develop' into imported-magento-arcticfoxes-magento2-functional-testing-framework-875
2 parents 6868d79 + 929296d commit 80a7457

File tree

248 files changed

+11757
-6791
lines changed

Some content is hidden

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

248 files changed

+11757
-6791
lines changed

‎.github/.metadata.json

+32
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

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

@@ -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
@@ -38,22 +39,22 @@ jobs:
3839
- name: Run tests
3940
run: vendor/bin/phpunit --configuration dev/tests/phpunit.xml --testsuite unit --coverage-clover clover.xml
4041

41-
- name: Monitor coverage
42-
if: github.event_name == 'pull_request'
43-
uses: slavcodev/coverage-monitor-action@1.1.0
44-
with:
45-
github_token: ${{ secrets.GITHUB_TOKEN }}
46-
clover_file: "clover.xml"
47-
threshold_alert: 10
48-
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
4950

5051
verification-tests:
5152
name: Verification Tests
5253
runs-on: ubuntu-latest
5354
strategy:
5455
fail-fast: false
5556
matrix:
56-
php-versions: ['7.3', '7.4']
57+
php-versions: ['7.3', '7.4', '8.0', '8.1']
5758
steps:
5859
- uses: actions/checkout@v2
5960

@@ -85,7 +86,7 @@ jobs:
8586
strategy:
8687
fail-fast: false
8788
matrix:
88-
php-versions: ['7.3', '7.4']
89+
php-versions: ['7.3', '7.4', '8.0', '8.1']
8990
steps:
9091
- uses: actions/checkout@v2
9192

@@ -117,7 +118,7 @@ jobs:
117118
strategy:
118119
fail-fast: false
119120
matrix:
120-
php-versions: ['7.3', '7.4']
121+
php-versions: ['7.3', '7.4', '8.0', '8.1']
121122

122123
services:
123124
chrome:

‎.gitignore

+3
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

+130
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,135 @@
11
Magento Functional Testing Framework Changelog
22
================================================
3+
3.7.2
4+
---------
5+
6+
### Bug fix:
7+
* Failed tests weren't logged correctly to `failed` file which caused a failure during run:failed command execution
8+
9+
10+
3.7.1
11+
---------
12+
13+
### GitHub Pull Requests:
14+
* [#873](https://github.com/magento/magento2-functional-testing-framework/pull/873) -- Add check for isBuiltin method (for PHP 8 compatibility) by @karyna-tsymbal-atwix
15+
16+
### Updates
17+
* Moved `hoa/console` to suggest section to avoid issues with PHP8.0
18+
* Update `vlucas/phpdotenv` to the latest versions
19+
* `<seeInCurrentUrl />` encodes special character which caused test failed
20+
* Add filter for groups, now we can generate tests with specific group annotation
21+
* Seprated a `run:failed` command to `generate:failed` and `run:failed`
22+
* `run:failed` command can execute failed tests without need to regenerate failed tests
23+
* Deleting MagentoPwaWebDriver file and moving it to Pwa_tests repo
24+
25+
26+
3.7.0
27+
---------
28+
29+
### GitHub Pull Requests:
30+
31+
* [#842](https://github.com/magento/magento2-functional-testing-framework/pull/842) -- Eliminated AspectMock from FileStorageTest
32+
* [#843](https://github.com/magento/magento2-functional-testing-framework/pull/843) -- Eliminated AspectMock from ObjectExtensionUtilTest
33+
* [#844](https://github.com/magento/magento2-functional-testing-framework/pull/844) -- Eliminated AspectMock from TestObjectHandlerTest
34+
* [#845](https://github.com/magento/magento2-functional-testing-framework/pull/845) -- Eliminated AspectMock from SuiteObjectHandlerTest
35+
* [#846](https://github.com/magento/magento2-functional-testing-framework/pull/846) -- Eliminated AspectMock from ActionGroupObjectTest
36+
* [#847](https://github.com/magento/magento2-functional-testing-framework/pull/847) -- Removed not used mocked object
37+
* [#848](https://github.com/magento/magento2-functional-testing-framework/pull/848) -- Eliminated AspectMock usage from ActionObjectTest
38+
* [#850](https://github.com/magento/magento2-functional-testing-framework/pull/850) -- Eliminated AspectMock from TestGeneratorTest
39+
* [#852](https://github.com/magento/magento2-functional-testing-framework/pull/852) -- Eliminated AspectMock from ModuleResolverTest
40+
* [#853](https://github.com/magento/magento2-functional-testing-framework/pull/853) -- Eliminated AspectMock from PersistedObjectHandlerTest
41+
* [#855](https://github.com/magento/magento2-functional-testing-framework/pull/855) -- Eliminated AspectMock from OperationDataArrayResolverTest
42+
* [#856](https://github.com/magento/magento2-functional-testing-framework/pull/856) -- Eliminated AspectMock from DataExtensionUtilTest
43+
* [#857](https://github.com/magento/magento2-functional-testing-framework/pull/857) -- Eliminated AspectMock from ParallelGroupSorterTest
44+
* [#859](https://github.com/magento/magento2-functional-testing-framework/pull/859) -- Eliminated AspectMock usage from SuiteGeneratorTest
45+
* [#861](https://github.com/magento/magento2-functional-testing-framework/pull/861) -- Eliminated aspect mock from mock module resolver builder
46+
* [#862](https://github.com/magento/magento2-functional-testing-framework/pull/862) -- Eliminated AspectMock where it was imported but never used
47+
* [#863](https://github.com/magento/magento2-functional-testing-framework/pull/863) -- Eliminated AspectMock from MagentoTestCase
48+
* [#864](https://github.com/magento/magento2-functional-testing-framework/pull/864) -- Eliminated AspectMock usage from TestLoggingUtil
49+
* [#865](https://github.com/magento/magento2-functional-testing-framework/pull/865) -- Eliminated aspect mock from object handler uti
50+
* [#866](https://github.com/magento/magento2-functional-testing-framework/pull/866) -- Added access/secret key config parameters
51+
* [#867](https://github.com/magento/magento2-functional-testing-framework/pull/867) -- Added empty query and fragment testing to the UrlFormatterTest
52+
* [#868](https://github.com/magento/magento2-functional-testing-framework/pull/868) -- PHP 8 support - fix code related to changes in CURL
53+
* [#869](https://github.com/magento/magento2-functional-testing-framework/pull/869) -- The squizlabs/php_codesniffer composer dependency has been updated to version 3.6.0
54+
* [#870](https://github.com/magento/magento2-functional-testing-framework/pull/870) -- Removing the csharpru/vault-php-guzzle6-transport not needed dependency
55+
* [#871](https://github.com/magento/magento2-functional-testing-framework/pull/871) -- Changed loose comparisons into strict
56+
* [#872](https://github.com/magento/magento2-functional-testing-framework/pull/872) -- Fix broken MFTF tests
57+
58+
3.6.1
59+
---------
60+
61+
### Enhancements
62+
63+
* Maintainability
64+
* Updated allure dependencies to pull package from new repo `allure-framework/allure-php-api`.
65+
66+
3.6.0
67+
---------
68+
69+
### Enhancements
70+
71+
* Maintainability
72+
* Updated composer dependencies to be PHP 8 compatible with the except of codeception/aspect-mock.
73+
74+
### GitHub Pull Requests:
75+
76+
* [#830](https://github.com/magento/magento2-functional-testing-framework/pull/830) -- Add ability to configure multiple OTPs
77+
* [#832](https://github.com/magento/magento2-functional-testing-framework/pull/832) -- Updated monolog/monolog to ^2.2
78+
* [#833](https://github.com/magento/magento2-functional-testing-framework/pull/833) -- Removed usage of AspectMock in FilesystemTest
79+
* [#834](https://github.com/magento/magento2-functional-testing-framework/pull/834) -- Removed usage of AspectMock in AnnotationsCheckTest
80+
* [#838](https://github.com/magento/magento2-functional-testing-framework/pull/838) -- Removed usage of AspectMock in DeprecatedEntityUsageCheckTest
81+
* [#841](https://github.com/magento/magento2-functional-testing-framework/pull/841) -- Removed usage of AspectMock in GenerationErrorHandlerTest
82+
* [#854](https://github.com/magento/magento2-functional-testing-framework/pull/854) -- Updated "monolog" to the latest version 2.3.1
83+
84+
3.5.1
85+
---------
86+
87+
### GitHub Pull Requests:
88+
89+
* [#825](https://github.com/magento/magento2-functional-testing-framework/pull/825) -- Update allure-codeception in order to support php8
90+
91+
3.5.0
92+
---------
93+
94+
### Enhancements
95+
96+
* Customizability
97+
* Added new `config:parallel --groups` option in `generate:tests` command to generate and split tests/suites into required number of execution time balanced groups.
98+
99+
### Fixes
100+
101+
* Added --no-sandbox chrome option in functional suite configuration.
102+
103+
### GitHub Pull Requests:
104+
105+
* [#824](https://github.com/magento/magento2-functional-testing-framework/pull/824) -- Fix typo in introduction.md
106+
* [#816](https://github.com/magento/magento2-functional-testing-framework/pull/816) -- Update mftf.md
107+
* [#812](https://github.com/magento/magento2-functional-testing-framework/pull/812) -- Added examples and modified url links in assertions.md
108+
109+
3.4.0
110+
---------
111+
112+
### Enhancements
113+
114+
* Maintainability
115+
* Added support for composer 2.
116+
117+
3.3.0
118+
---------
119+
120+
### Enhancements
121+
122+
* Usability
123+
* [#817](https://github.com/magento/magento2-functional-testing-framework/pull/817) -- Add support for admin WebAPI token refresh.
124+
125+
* Maintainability
126+
* [#814](https://github.com/magento/magento2-functional-testing-framework/pull/814) -- Update dependencies in order to make mftf php8 compatible, fix running phpcpd
127+
* [#815](https://github.com/magento/magento2-functional-testing-framework/pull/815) -- Upgrade csharpru/vault-php to 4.1
128+
129+
### Fixes
130+
131+
* Fixed test generation error in a split suite group (--config=parallel) to allow generation of subsequent groups.
132+
* Fixed an issue where test extends from a skipped parent is not properly skipped.
3133

4134
3.2.1
5135
---------

‎composer.json

+16-21
Original file line numberDiff line numberDiff line change
@@ -2,57 +2,52 @@
22
"name": "magento/magento2-functional-testing-framework",
33
"description": "Magento2 Functional Testing Framework",
44
"type": "library",
5-
"version": "3.2.1",
5+
"version": "3.7.2",
66
"license": "AGPL-3.0",
77
"keywords": ["magento", "automation", "functional", "testing"],
88
"config": {
99
"sort-packages": true
1010
},
1111
"require": {
12-
"php": "^7.3",
12+
"php": ">7.3",
1313
"ext-curl": "*",
1414
"ext-dom": "*",
1515
"ext-intl": "*",
1616
"ext-json": "*",
1717
"ext-openssl": "*",
18-
"allure-framework/allure-codeception": "~1.4.0",
18+
"allure-framework/allure-codeception": "^1.4",
1919
"aws/aws-sdk-php": "^3.132",
20-
"codeception/codeception": "~4.1.4",
20+
"codeception/codeception": "^4.1",
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",
26-
"csharpru/vault-php-guzzle6-transport": "^2.0",
27-
"hoa/console": "~3.0",
28-
"monolog/monolog": "^1.17",
24+
"composer/composer": "^1.9||^2.0",
25+
"csharpru/vault-php": "^4.2.1",
26+
"guzzlehttp/guzzle": "^7.3.0",
27+
"monolog/monolog": "^2.3",
2928
"mustache/mustache": "~2.5",
30-
"php-webdriver/webdriver": "^1.8.0",
29+
"nikic/php-parser": "^4.4",
30+
"php-webdriver/webdriver": "^1.9.0",
3131
"spomky-labs/otphp": "^10.0",
3232
"symfony/console": "^4.4",
33+
"symfony/dotenv": "^5.3",
3334
"symfony/finder": "^5.0",
3435
"symfony/http-foundation": "^5.0",
3536
"symfony/mime": "^5.0",
3637
"symfony/process": "^4.4",
37-
"vlucas/phpdotenv": "^2.4",
3838
"weew/helpers-array": "^1.3"
3939
},
4040
"require-dev": {
4141
"brainmaestro/composer-git-hooks": "^2.3.1",
4242
"codacy/coverage": "^1.4",
43-
"codeception/aspect-mock": "^3.0",
44-
"doctrine/cache": "<1.7.0",
45-
"goaop/framework": "~2.3.4",
46-
"php-coveralls/php-coveralls": "^1.0",
43+
"php-coveralls/php-coveralls": "^1.0||^2.2",
4744
"phpmd/phpmd": "^2.8.0",
4845
"phpunit/phpunit": "^9.0",
49-
"rregeer/phpunit-coverage-check": "^0.1.4",
50-
"sebastian/phpcpd": "~5.0.0",
51-
"squizlabs/php_codesniffer": "~3.5.4",
52-
"symfony/stopwatch": "~3.4.6"
46+
"sebastian/phpcpd": "~6.0.0",
47+
"squizlabs/php_codesniffer": "~3.6.0"
5348
},
54-
"replace": {
55-
"facebook/webdriver": "^1.7.1"
49+
"suggest": {
50+
"hoa/console": "Enables <pause /> action and interactive console functionality"
5651
},
5752
"autoload": {
5853
"files": ["src/Magento/FunctionalTestingFramework/_bootstrap.php"],

0 commit comments

Comments
 (0)