Skip to content

Commit e42fc90

Browse files
KevinBKozanKevinBKozan
committed
Merge branch 'sprint-develop' into MQE-590
2 parents 169097c + 1ce05f7 commit e42fc90

File tree

60 files changed

+1225
-1206
lines changed

Some content is hidden

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

60 files changed

+1225
-1206
lines changed

‎.gitattributes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Declare files that will always have LF line endings on checkout.
2+
dev/tests/verification/Resources/TestSuiteGeneration1.txt text=auto !eol
3+
dev/tests/verification/Resources/*.txt text eol=lf

‎CHANGELOG.MD

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
* MFTF Version 1.0 - Changelog
2+
* Initial commit of MFTF v1.0.0
3+
4+
* Core Features:
5+
* **Traceability** for clear logging and reporting capabilities
6+
* **Modularity** to run tests based on modules/extensions installed
7+
* **Customizability** to have an ability to customize existed tests
8+
* **Readability** using clear declarative XML test steps
9+
* **Maintainability** based on simple test creation and overall structure
10+
11+
* Supported Systems:
12+
* OS
13+
* Windows 10
14+
* OSX (Sierra)
15+
* Browser
16+
* Chrome (Latest) with ChromeDriver Latest
17+
* Known Issues:
18+
* Support for Firefox is curently incomplete. This will be resolved to support Firefox 57 (Quantum) and latest Gecko driver in next minor release.
19+
* MAGENTO_BASE_URL in .env file must have final "/" e.g. "http://magento.com/"

‎LICENSE_APL3 renamed to ‎LICENSE_AGPL3.txt

File renamed without changes.

‎README.md

Lines changed: 69 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,72 @@
1-
# Magento2 Functional Testing Framework
1+
# Magento Functional Testing Framework
22

3-
Customized codeception modules, helpers, page objects and step objects for Magento 2.2.x. This library package can be used as dependency for Magento Acceptance Test projects for Magento 2 Community Edition ([magento/acceptance-test-ce](https://github.com/magento-pangolin/acceptance-test-ce/)) or Magento 2 Enterprise Edition in ([magento/acceptance-test-ee](https://github.com/magento-pangolin/acceptance-test-ee/)) or acceptance test projects for Magento 2 extensions.
3+
[![Build Status](https://travis-ci.com/magento/magento2-functional-testing-framework.svg?token=3FCSKYBzqzZZAxa2jjcc&branch=Travis-Codacy-Integration-Fix)](https://travis-ci.com/magento/magento2-functional-testing-framework)
4+
5+
----
6+
7+
## System Requirements
8+
[Magento Functional Testing Framework system requirements](http://devdocs.magento.com/guides/v2.2/magento-functional-testing-framework/getting-started.html#prepare-environment)
49

510
## Installation
6-
Add the package into your acceptance test project composer.json:
7-
```
8-
{
9-
"require": {
10-
"magento/acceptance-test-framework": "dev-develop"
11-
}
12-
}
13-
```
14-
Then run:
15-
```
16-
composer update
17-
```
11+
To install the Magento Functional Testing Framework, see [Getting Started](http://devdocs.magento.com/guides/v2.2/magento-functional-testing-framework/getting-started.html)
12+
13+
## Contributing
14+
Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations, or just good suggestions.
15+
16+
To learn about how to make a contribution, click [here][1].
17+
18+
To open an issue, click [here][2].
19+
20+
To suggest documentation improvements, click [here][3].
21+
22+
[1]: <http://devdocs.magento.com/guides/v2.2/magento-functional-testing-framework/contribution-guidelines.html>
23+
[2]: <https://github.com/magento/magento2-functional-testing-framework/issues>
24+
[3]: <http://devdocs.magento.com>
25+
26+
### Labels applied by the MFTF team
27+
28+
Refer to the tables with descriptions of each label below. These labels are applied by the MFTF development team to community contributed issues and pull requests, to communicate status, impact, or which team is working on it.
29+
30+
### Pull Request Status
31+
32+
Label| Description
33+
---|---
34+
**accept**| The pull request has been accepted and will be merged into mainline code.
35+
**reject**| The pull request has been rejected and will not be merged into mainline code. Possible reasons can include but are not limited to: issue has already been fixed in another code contribution, or there is an issue with the code contribution.
36+
**needsUpdate**| The Magento Team needs additional information from the reporter to properly prioritize and process the pull request.
37+
38+
### Issue Resolution Status
39+
40+
Label| Description
41+
---|---
42+
**acknowledged**| The Magento Team has validated the issue and an internal ticket has been created.
43+
**needsUpdate**| The Magento Team needs additional information from the reporter to properly prioritize and process the issue or pull request.
44+
**cannot reproduce**| The Magento Team has not confirmed that this issue contains the minimum required information to reproduce.
45+
**non-issue**| The Magento Team has not recognised any issue according to provided information.
46+
47+
### Domains Impacted
48+
49+
Label| Description
50+
---|---
51+
**PROD**| Affects the Product team (mostly feature requests or business logic change).
52+
**DOC**| Affects Documentation domain.
53+
**TECH**| Affects Architect Group (mostly to make decisions around technology changes).
54+
55+
### Type
56+
57+
Label| Description
58+
---|---
59+
**bugfix**| The issue or pull request relates to bug fixing.
60+
**enhancement**| The issue or pull request that raises the MFTF to a higher degree (for example new features, optimization, refactoring, etc).
61+
62+
## Reporting security issues
63+
64+
To report security vulnerabilities in Magento software or web sites, please e-mail <a href="mailto:[email protected]">[email protected]</a>. Please do not report security issues using GitHub. Be sure to encrypt your e-mail with our <a href="https://info2.magento.com/rs/magentoenterprise/images/security_at_magento.asc">encryption key</a> if it includes sensitive information. Learn more about reporting security issues <a href="https://magento.com/security/reporting-magento-security-issue">here</a>.
65+
66+
Stay up-to-date on the latest security news and patches for Magento by signing up for <a href="https://magento.com/security/sign-up">Security Alert Notifications</a>.
67+
68+
## License
69+
70+
Each Magento source file included in this distribution is licensed under AGPL 3.0
71+
72+
Please see LICENSE_AGPL3.txt for the full text of the AGPL 3.0 license or contact [email protected] for a copy.

‎bin/phpunit-checks

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
# Copyright © Magento, Inc. All rights reserved.
22
# See COPYING.txt for license details.
33

4-
echo "===============================UNIT TESTS==============================="
5-
vendor/bin/phpunit --configuration dev/tests/phpunit.xml --testsuite unit --coverage-xml build/coverage-xml
4+
set -e
65

7-
echo "===============================VERIFICATION TESTS==============================="
8-
vendor/bin/phpunit --configuration dev/tests/phpunit.xml --testsuite verification --coverage-xml build/coverage-xml
6+
echo "==============================="
7+
echo " UNIT TESTS"
8+
echo "==============================="
9+
vendor/bin/phpunit --configuration dev/tests/phpunit.xml --testsuite unit
10+
11+
echo "==============================="
12+
echo " VERIFICATION TESTS"
13+
echo "==============================="
14+
vendor/bin/phpunit --configuration dev/tests/phpunit.xml --testsuite verification

‎bin/phpunit-checks.bat

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+
@echo ===============================UNIT TESTS===============================
5+
@echo off
6+
call vendor\bin\phpunit --configuration dev\tests\phpunit.xml --testsuite unit --coverage-xml build\coverage-xml
7+
8+
@echo off
9+
@echo ===============================VERIFICATION TESTS===============================
10+
call vendor\bin\phpunit --configuration dev\tests\phpunit.xml --testsuite verification --coverage-xml build\coverage-xml

‎bin/static-checks

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,30 @@
11
# Copyright © Magento, Inc. All rights reserved.
22
# See COPYING.txt for license details.
33

4-
echo "===============================PHP CODE SNIFFER REPORT==============================="
4+
set -e
5+
6+
echo "==============================="
7+
echo " CODE SNIFFER"
8+
echo "==============================="
59
vendor/bin/phpcs ./src --standard=./dev/tests/static/Magento
610
vendor/bin/phpcs ./dev/tests/unit --standard=./dev/tests/static/Magento
711
vendor/bin/phpcs ./dev/tests/verification --standard=./dev/tests/static/Magento --ignore=dev/tests/verification/_generated
12+
echo ""
813

9-
echo "===============================COPY PASTE DETECTOR REPORT==============================="
14+
echo "==============================="
15+
echo " COPY PASTE DETECTOR"
16+
echo "==============================="
1017
vendor/bin/phpcpd ./src
18+
echo ""
1119

12-
echo "===============================PHP MESS DETECTOR REPORT==============================="
20+
echo "==============================="
21+
echo " MESS DETECTOR"
22+
echo "==============================="
1323
vendor/bin/phpmd ./src text /dev/tests/static/Magento/CodeMessDetector/ruleset.xml --exclude _generated
24+
echo ""
1425

15-
echo "===============================MAGENTO COPYRIGHT REPORT==============================="
26+
echo "==============================="
27+
echo " MAGENTO COPYRIGHT CHECK"
28+
echo "==============================="
1629
bin/copyright-check
17-
30+
echo ""

‎bin/static-checks.bat

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
:: Copyright © Magento, Inc. All rights reserved.
2+
:: See COPYING.txt for license details.
3+
4+
@echo off
5+
@echo ===============================PHP CODE SNIFFER REPORT===============================
6+
call vendor\bin\phpcs .\src --standard=.\dev\tests\static\Magento
7+
call vendor\bin\phpcs .\dev\tests\unit --standard=.\dev\tests\static\Magento
8+
call vendor\bin\phpcs .\dev\tests\verification --standard=.\dev\tests\static\Magento --ignore=dev\tests\verification\_generated
9+
10+
@echo ===============================COPY PASTE DETECTOR REPORT===============================
11+
call vendor\bin\phpcpd .\src
12+
13+
@echo "===============================PHP MESS DETECTOR REPORT===============================
14+
vendor\bin\phpmd .\src text \dev\tests\static\Magento\CodeMessDetector\ruleset.xml --exclude _generated
15+
16+
@echo ===============================MAGENTO COPYRIGHT REPORT===============================
17+
echo msgbox "INFO:Copyright check currently not run as part of .bat implementation" > "%temp%\popup.vbs"
18+
wscript.exe "%temp%\popup.vbs"
19+
::bin\copyright-check

‎composer.json

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
11
{
22
"name": "magento/magento2-functional-testing-framework",
3-
"type": "library",
43
"description": "Magento2 Functional Testing Framework",
4+
"type": "library",
5+
"version": "1.0.0",
6+
"license": "AGPL-3.0",
57
"keywords": ["magento", "automation", "functional", "testing"],
8+
"config": {
9+
"sort-packages": true
10+
},
611
"require": {
712
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
813
"codeception/codeception": "~2.3.4",
14+
"epfremme/swagger-php": "^2.0",
915
"flow/jsonpath": ">0.2",
1016
"fzaninotto/faker": "^1.6",
11-
"mustache/mustache": "~2.5",
12-
"epfremme/swagger-php": "^2.0"
17+
"mustache/mustache": "~2.5"
1318
},
1419
"require-dev": {
1520
"squizlabs/php_codesniffer": "1.5.3",
@@ -21,12 +26,12 @@
2126
},
2227
"autoload": {
2328
"psr-4": {
24-
"Magento\\FunctionalTestingFramework\\": ["src/Magento/FunctionalTestingFramework"]
29+
"Magento\\FunctionalTestingFramework\\": "src/Magento/FunctionalTestingFramework"
2530
}
2631
},
2732
"autoload-dev": {
2833
"psr-4": {
29-
"tests\\unit\\Magento\\FunctionalTestingFramework\\": ["dev/tests/unit/Magento/FunctionalTestingFramework"]
34+
"tests\\unit\\Magento\\FunctionalTestingFramework\\": "dev/tests/unit/Magento/FunctionalTestingFramework"
3035
}
3136
},
3237
"extra": {

‎dev/tests/unit/Magento/FunctionalTestFramework/Test/Objects/ActionObjectTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class ActionObjectTest extends TestCase
2727
*/
2828
public function testConstructOrderBefore()
2929
{
30-
$actionObject = new ActionObject('mergeKey', 'type', [], null, 'before');
30+
$actionObject = new ActionObject('stepKey', 'type', [], null, 'before');
3131
$this->assertEquals(0, $actionObject->getOrderOffset());
3232
}
3333

@@ -36,7 +36,7 @@ public function testConstructOrderBefore()
3636
*/
3737
public function testConstructOrderAfter()
3838
{
39-
$actionObject = new ActionObject('mergeKey', 'type', [], null, 'after');
39+
$actionObject = new ActionObject('stepKey', 'type', [], null, 'after');
4040
$this->assertEquals(1, $actionObject->getOrderOffset());
4141
}
4242

0 commit comments

Comments
 (0)