Skip to content

Commit e7bbcfe

Browse files
okolesnykokolesnyk
committed
Merge branch 'MQE-599' of github.com:magento-pangolin/magento2ce into sprint-develop
2 parents 1985c8e + 8909eab commit e7bbcfe

File tree

238 files changed

+3104
-4089
lines changed

Some content is hidden

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

238 files changed

+3104
-4089
lines changed

‎dev/tests/acceptance/README.md

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
# Magento Functional Testing Framework
2+
3+
----
4+
5+
## System Requirements
6+
[Magento Functional Testing Framework system requirements](http://devdocs.magento.com/guides/v2.2/magento-functional-testing-framework/getting-started.html#prepare-environment)
7+
8+
## Installation
9+
To install the Magento Functional Testing Framework, see [Getting Started](http://devdocs.magento.com/guides/v2.2/magento-functional-testing-framework/getting-started.html)
10+
11+
## Contributing
12+
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.
13+
14+
To learn about how to make a contribution, click [here][1].
15+
16+
To open an issue, click [here][2].
17+
18+
To suggest documentation improvements, click [here][3].
19+
20+
[1]: <http://devdocs.magento.com/guides/v2.2/magento-functional-testing-framework/contribution-guidelines.html>
21+
[2]: <https://github.com/magento/magento2-functional-testing-framework/issues>
22+
[3]: <http://devdocs.magento.com>
23+
24+
### Labels applied by the MFTF team
25+
26+
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.
27+
28+
### Pull Request Status
29+
30+
Label| Description
31+
---|---
32+
**accept**| The pull request has been accepted and will be merged into mainline code.
33+
**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.
34+
**needsUpdate**| The Magento Team needs additional information from the reporter to properly prioritize and process the pull request.
35+
36+
### Issue Resolution Status
37+
38+
Label| Description
39+
---|---
40+
**acknowledged**| The Magento Team has validated the issue and an internal ticket has been created.
41+
**needsUpdate**| The Magento Team needs additional information from the reporter to properly prioritize and process the issue or pull request.
42+
**cannot reproduce**| The Magento Team has not confirmed that this issue contains the minimum required information to reproduce.
43+
**non-issue**| The Magento Team has not recognised any issue according to provided information.
44+
45+
### Domains Impacted
46+
47+
Label| Description
48+
---|---
49+
**PROD**| Affects the Product team (mostly feature requests or business logic change).
50+
**DOC**| Affects Documentation domain.
51+
**TECH**| Affects Architect Group (mostly to make decisions around technology changes).
52+
53+
### Type
54+
55+
Label| Description
56+
---|---
57+
**bugfix**| The issue or pull request relates to bug fixing.
58+
**enhancement**| The issue or pull request that raises the MFTF to a higher degree (for example new features, optimization, refactoring, etc).
59+
60+
## Reporting security issues
61+
62+
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>.
63+
64+
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>.
65+
66+
## License
67+
68+
Each Magento source file included in this distribution is licensed under APL 3.0
69+
70+
Please see LICENSE_APL3.txt for the full text of the APL 3.0 license or contact [email protected] for a copy.

‎dev/tests/acceptance/composer.json

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"name": "magento/magento2ce-functional-tests",
3+
"description": "Magento 2 (Open Source) Functional Tests",
4+
"type": "project",
5+
"version": "1.0.0-dev",
6+
"license": [
7+
"OSL-3.0",
8+
"AFL-3.0"
9+
],
10+
"config": {
11+
"sort-packages": true
12+
},
13+
"require": {
14+
"allure-framework/allure-codeception": "dev-master#af40af5ae2b717618a42fe3e137d75878508c75d",
15+
"codeception/codeception": "~2.3.4",
16+
"consolidation/robo": "^1.0.0",
17+
"henrikbjorn/lurker": "^1.2",
18+
"magento/magento2-functional-testing-framework": "1.0.0",
19+
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
20+
"vlucas/phpdotenv": "~2.4"
21+
},
22+
"autoload": {
23+
"psr-4": {
24+
"Magento\\": "tests/functional/Magento"
25+
}
26+
},
27+
"prefer-stable": true
28+
}

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
# Magento 2 Acceptance Tests
1+
# Magento 2 Functional Tests
22

3-
The Acceptance Tests Module for **Magento_AdminNotification** Module.
3+
The Functional Tests Module for **Magento_AdminNotification** Module.

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification/composer.json

Lines changed: 15 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,35 @@
11
{
2-
"name": "magento/magento2-functional-test-admin-notification",
3-
"description": "Magento 2 Acceptance Test Module Admin Notification",
4-
"repositories": [
5-
{
6-
"type" : "composer",
7-
"url" : "https://repo.magento.com/"
8-
}
2+
"name": "magento/magento2-functional-test-module-admin-notification",
3+
"description": "Magento 2 Functional Test Module Admin Notification",
4+
"type": "magento2-test-module",
5+
"version": "100.0.0-dev",
6+
"license": [
7+
"OSL-3.0",
8+
"AFL-3.0"
99
],
1010
"config": {
1111
"sort-packages": true
1212
},
1313
"require": {
14-
"php": "~7.0",
15-
"allure-framework/allure-codeception": "dev-master",
16-
"codeception/codeception": "2.2|2.3",
17-
"consolidation/robo": "^1.0.0",
18-
"henrikbjorn/lurker": "^1.2",
19-
"magento/magento2-functional-testing-framework": "dev-develop",
20-
"vlucas/phpdotenv": "~2.4"
14+
"magento/magento2-functional-testing-framework": "1.0.0",
15+
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
2116
},
2217
"suggest": {
23-
"magento/magento2-functional-test-module-store": "dev-master",
24-
"magento/magento2-functional-test-module-backend": "dev-master",
25-
"magento/magento2-functional-test-media-storage": "dev-master",
26-
"magento/magento2-functional-test-module-ui": "dev-master"
18+
"magento/magento2-functional-test-module-backend": "100.0.0-dev",
19+
"magento/magento2-functional-test-module-media-storage": "100.0.0-dev",
20+
"magento/magento2-functional-test-module-store": "100.0.0-dev",
21+
"magento/magento2-functional-test-module-ui": "100.0.0-dev"
2722
},
28-
"type": "magento2-test-module",
29-
"version": "dev-master",
30-
"license": [
31-
"OSL-3.0",
32-
"AFL-3.0"
33-
],
3423
"autoload": {
3524
"psr-4": {
36-
"Magento\\FunctionalTest\\": [
37-
"tests/functional/Magento/FunctionalTest",
38-
"generated/Magento/FunctionalTest"
39-
]
25+
"Magento\\FunctionalTest\\AdminNotification\\": ""
4026
}
4127
},
4228
"extra": {
4329
"map": [
4430
[
4531
"*",
46-
"tests/functional/Magento/FunctionalTest/AdminNotification"
32+
"dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdminNotification"
4733
]
4834
]
4935
}

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
# Magento 2 Acceptance Tests
1+
# Magento 2 Functional Tests
22

3-
The Acceptance Tests Module for **Magento_AdvancedPricingImportExport** Module.
3+
The Functional Tests Module for **Magento_AdvancedPricingImportExport** Module.

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport/composer.json

Lines changed: 17 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,38 @@
11
{
22
"name": "magento/magento2-functional-test-module-advanced-pricing-import-export",
3-
"description": "Magento 2 Acceptance Test Module Advanced Pricing Import Export",
4-
"repositories": [
5-
{
6-
"type" : "composer",
7-
"url" : "https://repo.magento.com/"
8-
}
3+
"description": "Magento 2 Functional Test Module Advanced Pricing Import Export",
4+
"type": "magento2-test-module",
5+
"version": "100.0.0-dev",
6+
"license": [
7+
"OSL-3.0",
8+
"AFL-3.0"
99
],
1010
"config": {
1111
"sort-packages": true
1212
},
1313
"require": {
14-
"php": "~7.0",
15-
"allure-framework/allure-codeception": "dev-master",
16-
"codeception/codeception": "2.2|2.3",
17-
"consolidation/robo": "^1.0.0",
18-
"henrikbjorn/lurker": "^1.2",
19-
"magento/magento2-functional-testing-framework": "dev-develop",
20-
"vlucas/phpdotenv": "~2.4"
14+
"magento/magento2-functional-testing-framework": "1.0.0",
15+
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
2116
},
2217
"suggest": {
23-
"magento/magento2-functional-test-module-store": "dev-master",
24-
"magento/magento2-functional-test-module-catalog": "dev-master",
25-
"magento/magento2-functional-test-module-catalog-inventory": "dev-master",
26-
"magento/magento2-functional-test-module-eav": "dev-master",
27-
"magento/magento2-functional-test-module-import-export": "dev-master",
28-
"magento/magento2-functional-test-module-catalog-import-export": "dev-master",
29-
"magento/magento2-functional-test-module-customer": "dev-master"
18+
"magento/magento2-functional-test-module-catalog": "100.0.0-dev",
19+
"magento/magento2-functional-test-module-catalog-import-export": "100.0.0-dev",
20+
"magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
21+
"magento/magento2-functional-test-module-customer": "100.0.0-dev",
22+
"magento/magento2-functional-test-module-eav": "100.0.0-dev",
23+
"magento/magento2-functional-test-module-import-export": "100.0.0-dev",
24+
"magento/magento2-functional-test-module-store": "100.0.0-dev"
3025
},
31-
"type": "magento2-test-module",
32-
"version": "dev-master",
33-
"license": [
34-
"OSL-3.0",
35-
"AFL-3.0"
36-
],
3726
"autoload": {
38-
"psr-0": {
39-
"Yandex": "vendor/allure-framework/allure-codeception/src/"
40-
},
4127
"psr-4": {
42-
"Magento\\FunctionalTestingFramework\\": [
43-
"vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework"
44-
],
45-
"Magento\\FunctionalTest\\": [
46-
"tests/functional/Magento/FunctionalTest",
47-
"generated/Magento/FunctionalTest"
48-
]
28+
"Magento\\FunctionalTest\\AdvancedPricingImportExport\\": ""
4929
}
5030
},
5131
"extra": {
5232
"map": [
5333
[
5434
"*",
55-
"tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport"
35+
"dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedPricingImportExport"
5636
]
5737
]
5838
}

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/composer.json

Lines changed: 12 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,28 @@
11
{
22
"name": "magento/magento2-functional-test-module-analytics",
33
"description": "Magento 2 Acceptance Test Module Analytics",
4-
"repositories": [
5-
{
6-
"type" : "composer",
7-
"url" : "https://repo.magento.com/"
8-
}
4+
"type": "magento2-test-module",
5+
"version": "100.0.0-dev",
6+
"license": [
7+
"OSL-3.0",
8+
"AFL-3.0"
99
],
1010
"config": {
1111
"sort-packages": true
1212
},
1313
"require": {
14-
"php": "~7.0",
15-
"allure-framework/allure-codeception": "dev-master",
16-
"codeception/codeception": "2.2|2.3",
17-
"consolidation/robo": "^1.0.0",
18-
"henrikbjorn/lurker": "^1.2",
19-
"magento/magento2-functional-testing-framework": "dev-develop",
20-
"vlucas/phpdotenv": "~2.4"
14+
"magento/magento2-functional-testing-framework": "1.0.0",
15+
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
2116
},
2217
"suggest": {
23-
"magento/magento2-functional-test-module-backend": "dev-master",
24-
"magento/magento2-functional-test-module-config": "dev-master",
25-
"magento/magento2-functional-test-module-integration": "dev-master",
26-
"magento/magento2-functional-test-module-store": "dev-master"
18+
"magento/magento2-functional-test-module-backend": "100.0.0-dev",
19+
"magento/magento2-functional-test-module-config": "100.0.0-dev",
20+
"magento/magento2-functional-test-module-integration": "100.0.0-dev",
21+
"magento/magento2-functional-test-module-store": "100.0.0-dev"
2722
},
28-
"type": "magento2-test-module",
29-
"version": "dev-master",
30-
"license": [
31-
"OSL-3.0",
32-
"AFL-3.0"
33-
],
3423
"autoload": {
35-
"psr-0": {
36-
"Yandex": "vendor/allure-framework/allure-codeception/src/"
37-
},
3824
"psr-4": {
39-
"Magento\\FunctionalTestingFramework\\": [
40-
"vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework"
41-
],
42-
"Magento\\FunctionalTest\\": [
43-
"tests/functional/Magento/FunctionalTest",
44-
"generated/Magento/FunctionalTest"
45-
]
25+
"Magento\\FunctionalTest\\Analytics\\": ""
4626
}
4727
},
4828
"extra": {

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorization/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
# Magento 2 Acceptance Tests
1+
# Magento 2 Functional Tests
22

3-
The Acceptance Tests Module for **Magento_Authorization** Module.
3+
The Functional Tests Module for **Magento_Authorization** Module.

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorization/composer.json

Lines changed: 11 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,32 @@
11
{
22
"name": "magento/magento2-functional-test-module-authorization",
3-
"description": "Magento 2 Acceptance Test Module Authorization",
4-
"repositories": [
5-
{
6-
"type" : "composer",
7-
"url" : "https://repo.magento.com/"
8-
}
3+
"description": "Magento 2 Functional Test Module Authorization",
4+
"type": "magento2-test-module",
5+
"version": "100.0.0-dev",
6+
"license": [
7+
"OSL-3.0",
8+
"AFL-3.0"
99
],
1010
"config": {
1111
"sort-packages": true
1212
},
1313
"require": {
14-
"php": "~7.0",
15-
"allure-framework/allure-codeception": "dev-master",
16-
"codeception/codeception": "2.2|2.3",
17-
"consolidation/robo": "^1.0.0",
18-
"henrikbjorn/lurker": "^1.2",
19-
"magento/magento2-functional-testing-framework": "dev-develop",
20-
"vlucas/phpdotenv": "~2.4"
14+
"magento/magento2-functional-testing-framework": "1.0.0",
15+
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
2116
},
2217
"suggest": {
23-
"magento/magento2-functional-test-module-backend": "dev-master"
18+
"magento/magento2-functional-test-module-backend": "100.0.0-dev"
2419
},
25-
"type": "magento2-test-module",
26-
"version": "dev-master",
27-
"license": [
28-
"OSL-3.0",
29-
"AFL-3.0"
30-
],
3120
"autoload": {
32-
"psr-0": {
33-
"Yandex": "vendor/allure-framework/allure-codeception/src/"
34-
},
3521
"psr-4": {
36-
"Magento\\FunctionalTestingFramework\\": [
37-
"vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework"
38-
],
39-
"Magento\\FunctionalTest\\": [
40-
"tests/functional/Magento/FunctionalTest",
41-
"generated/Magento/FunctionalTest"
42-
]
22+
"Magento\\FunctionalTest\\Authorization\\": ""
4323
}
4424
},
4525
"extra": {
4626
"map": [
4727
[
4828
"*",
49-
"tests/functional/Magento/FunctionalTest/Authorization"
29+
"dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorization"
5030
]
5131
]
5232
}

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Authorizenet/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
# Magento 2 Acceptance Tests
1+
# Magento 2 Functional Tests
22

3-
The Acceptance Tests Module for **Magento_Authorizenet** Module.
3+
The Functional Tests Module for **Magento_Authorizenet** Module.

0 commit comments

Comments
 (0)