Skip to content

Commit a734abb

Browse files
authored
Merge branch 'develop' into bugfix/568-urn-catalog
2 parents 80ee17c + d82e6cf commit a734abb

File tree

369 files changed

+6755
-7183
lines changed

Some content is hidden

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

369 files changed

+6755
-7183
lines changed

.travis.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
language: php
22
php:
3-
- 7.0
4-
- 7.1
53
- 7.2
64
- 7.3
5+
services:
6+
- docker
7+
before_install:
8+
- docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-chrome:3.141.59-zirconium
79
install: composer install --no-interaction --prefer-source
810
env:
911
matrix:
1012
- VERIFICATION_TOOL=phpunit-checks
1113
- VERIFICATION_TOOL=static-checks
14+
- VERIFICATION_TOOL=functional
1215
script:
1316
- bin/$VERIFICATION_TOOL
1417
after_success:

CHANGELOG.md

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,74 @@
11
Magento Functional Testing Framework Changelog
22
================================================
3+
3.0.0
4+
-----
5+
### Upgrade Instructions
6+
* Run `bin/mftf reset --hard` to remove old generated configurations.
7+
* Run `bin/mftf build:project` to generate new configurations.
8+
* Run `bin/mftf upgrade:tests`. [See command page for details](./docs/commands/mftf.md#upgradetests).
9+
* After running the above command, some tests may need manually updates:
10+
* Remove all occurrences of `<executeInSelenium>` and `<performOn>`
11+
* Remove all occurrences of `<module file=""/>` from any `<suite>`s
12+
* Ensure all `<assert*>` actions in your tests have a valid schema.
13+
* Lastly, try to generate all tests. Tests should all be generated as a result of the upgrades.
14+
* If not, the most likely issue will be a changed XML schema. Check error messaging and search your codebase for the attributes listed.
15+
16+
2.6.3
17+
-----
18+
19+
### New Feature
20+
* `--filter` option was added to `bin/mftf generate:tests` command. For more details please go to https://devdocs.magento.com/mftf/docs/commands/mftf.html#generatetests
21+
22+
2.6.2
23+
-----
24+
25+
### Fixes
26+
* Fixed float conversion error in test generation
27+
28+
2.6.1
29+
-----
30+
31+
* Usability
32+
* Introduced new `.env` configuration `ELASTICSEARCH_VERSION` to support multiple elasticsearch versions
33+
* Maintainability
34+
* Added deprecation notices for upcoming MFTF 3.0.0
35+
* Replaced facebook webdriver with php-webdriver to support PHP version updates
36+
37+
2.6.0
38+
-----
39+
40+
* Usability
41+
* `magentoCron` action added by community maintainer @lbajsarowicz
42+
* Traceability
43+
* MFTF generated cest files are fully compatible for Codeception `dry-run`.
44+
* Modularity
45+
* `mftf generate:tests` and `mftf run:test` commands now accept suite scoped test names in format `[suitename:testname]...`.
46+
* Maintainability
47+
* Support `deprecated` syntax for the following test entities:
48+
* Test
49+
* Action Group
50+
* Data
51+
* Metadata
52+
* Page
53+
* Section
54+
* Section Element
55+
* See DevDocs for details
56+
* Improved `mftf static-checks` command to allow executing all or specific static checks.
57+
* Added a new static check that checks and reports unused arguments in action groups.
58+
* Customizability
59+
* AWS Secrets Manager has been added as an additional credential storage.
60+
* See DevDocs for details
61+
* Bumped dependencies to latest possible versions
62+
63+
### Fixes
64+
* Fixed missing before, after, failed steps in cest file when generating tests with `--allow-skipped` option.
65+
* Fixed suites and tests display issue in Allure `Suites` page after `mftf run:group` command.
66+
* `createData` action now shows a meaningful error message at runtime when the entity does not exist.
67+
68+
### GitHub Issues/Pull requests:
69+
* [#537](https://github.com/magento/magento2-functional-testing-framework/pull/537) -- Refactor of TestGenerator class
70+
* [#538](https://github.com/magento/magento2-functional-testing-framework/pull/538) -- FEATURE: <magentoCron> command to execute Cron Jobs
71+
372
2.5.4
473
-----
574
[Demo Video](https://www.youtube.com/watch?v=tguvkw1HWKg)

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ See the license [here][] or contact [[email protected]][] for a copy.
7070

7171
<!-- Link Definitions -->
7272
[Getting Started]: docs/getting-started.md
73-
[Contribution Guidelines]: .github/CONTRIBUTING.html
73+
[Contribution Guidelines]: https://github.com/magento/magento2-functional-testing-framework/blob/develop/.github/CONTRIBUTING.md
7474
[DevDocs Contributing]: https://github.com/magento/devdocs/blob/master/.github/CONTRIBUTING.md
7575
7676
[encryption key]: https://info2.magento.com/rs/magentoenterprise/images/security_at_magento.asc
7777
[here]: https://magento.com/security/reporting-magento-security-issue
7878
[Security Alert Notifications]: https://magento.com/security/sign-up
7979
[here]: LICENSE_AGPL3.txt
80-
80+

bin/functional

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Copyright © Magento, Inc. All rights reserved.
2+
# See COPYING.txt for license details.
3+
4+
set -e
5+
6+
echo "==============================="
7+
echo " EXECUTE DevDocsTest "
8+
echo "==============================="
9+
bin/mftf build:project
10+
bin/mftf run:test DevDocsTest -f

composer.json

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,31 @@
22
"name": "magento/magento2-functional-testing-framework",
33
"description": "Magento2 Functional Testing Framework",
44
"type": "library",
5-
"version": "2.5.4",
5+
"version": "3.0.0",
66
"license": "AGPL-3.0",
77
"keywords": ["magento", "automation", "functional", "testing"],
88
"config": {
99
"sort-packages": true
1010
},
1111
"require": {
12-
"php": "7.0.2||7.0.4||~7.0.6||~7.1.0||~7.2.0||~7.3.0",
12+
"php": "~7.2.0||~7.3.0",
1313
"ext-curl": "*",
14+
"ext-dom": "*",
1415
"ext-json": "*",
1516
"ext-openssl": "*",
1617
"allure-framework/allure-codeception": "~1.3.0",
1718
"aws/aws-sdk-php": "^3.132",
1819
"codeception/codeception": "~2.4.5",
19-
"composer/composer": "^1.4",
20-
"consolidation/robo": "^1.0.0",
20+
"composer/composer": "^1.6",
2121
"csharpru/vault-php": "~3.5.3",
2222
"csharpru/vault-php-guzzle6-transport": "^2.0",
23-
"flow/jsonpath": ">0.2",
24-
"fzaninotto/faker": "^1.6",
2523
"monolog/monolog": "^1.0",
2624
"mustache/mustache": "~2.5",
27-
"symfony/process": "^2.8 || ^3.1 || ^4.0",
25+
"php-webdriver/webdriver": "^1.8.0",
26+
"symfony/console": "^4.4",
27+
"symfony/finder": "^4.4",
28+
"symfony/mime": "^5.0",
29+
"symfony/process": "^4.4",
2830
"vlucas/phpdotenv": "^2.4"
2931
},
3032
"require-dev": {
@@ -44,11 +46,14 @@
4446
"suggest": {
4547
"epfremme/swagger-php": "^2.0"
4648
},
49+
"replace": {
50+
"facebook/webdriver": "^1.7.1"
51+
},
4752
"autoload": {
4853
"files": ["src/Magento/FunctionalTestingFramework/_bootstrap.php"],
4954
"psr-4": {
5055
"Magento\\FunctionalTestingFramework\\": "src/Magento/FunctionalTestingFramework",
51-
"MFTF\\": "dev/tests/functional/MFTF"
56+
"MFTF\\": "dev/tests/functional/tests/MFTF"
5257
}
5358
},
5459
"autoload-dev": {

0 commit comments

Comments
 (0)