Skip to content

Commit e917415

Browse files
author
Magento CICD
authored
merge magento/2.3-develop into magento-performance/MAGETWO-85904-2.3
2 parents 9ca010d + 65c0a93 commit e917415

File tree

412 files changed

+8740
-4312
lines changed

Some content is hidden

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

412 files changed

+8740
-4312
lines changed

‎dev/tests/acceptance/.env.example

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,11 @@ MAGENTO_ADMIN_PASSWORD=
4949
#TESTS_BP=
5050
#FW_BP=
5151
#TESTS_MODULE_PATH=
52+
53+
#*** These properties impact the modules loaded into MFTF, you can point to your own full path, or a custom set of modules located with the core set
5254
#MODULE_WHITELIST=
53-
#MFTF_DEBUG=true
55+
#CUSTOM_MODULE_PATHS=
5456

57+
#*** Bool property which allows the user to toggle debug output during test execution
58+
#MFTF_DEBUG=
5559
#*** End of .env ***#

‎dev/tests/acceptance/RoboFile.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ function buildProject()
4646
function generateTests($opts = ['config' => null])
4747
{
4848
require 'tests'. DIRECTORY_SEPARATOR . 'functional' . DIRECTORY_SEPARATOR . '_bootstrap.php';
49-
\Magento\FunctionalTestingFramework\Util\TestGenerator::getInstance()->createAllCestFiles($opts['config']);
49+
\Magento\FunctionalTestingFramework\Util\TestGenerator::getInstance()->createAllTestFiles($opts['config']);
5050
$this->say("Generate Tests Command Run");
5151
}
5252

‎dev/tests/acceptance/composer.json

Lines changed: 110 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,119 @@
2222
"consolidation/robo": "^1.0.0",
2323
"symfony/process": ">=2.7 <3.4",
2424
"henrikbjorn/lurker": "^1.2",
25-
"magento/magento2-functional-testing-framework": "1.0.0",
25+
"magento/magento2-functional-testing-framework": "~2.0.0",
2626
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
2727
"vlucas/phpdotenv": "~2.4"
2828
},
29+
"replace": {
30+
"magento/magento2-functional-test-module-marketplace": "100.0.0-dev",
31+
"magento/magento2-functional-test-module-admin-notification": "100.0.0-dev",
32+
"magento/magento2-functional-test-module-advanced-pricing-import-export": "100.0.0-dev",
33+
"magento/magento2-functional-test-module-authorization": "100.0.0-dev",
34+
"magento/magento2-functional-test-module-authorizenet": "100.0.0-dev",
35+
"magento/magento2-functional-test-module-backend": "100.0.0-dev",
36+
"magento/magento2-functional-test-module-backup": "100.0.0-dev",
37+
"magento/magento2-functional-test-module-braintree": "100.0.0-dev",
38+
"magento/magento2-functional-test-module-bundle": "100.0.0-dev",
39+
"magento/magento2-functional-test-module-bundle-import-export": "100.0.0-dev",
40+
"magento/magento2-functional-test-module-cache-invalidate": "100.0.0-dev",
41+
"magento/magento2-functional-test-module-captcha": "100.0.0-dev",
42+
"magento/magento2-functional-test-module-catalog": "100.0.0-dev",
43+
"magento/magento2-functional-test-module-catalog-import-export": "100.0.0-dev",
44+
"magento/magento2-functional-test-module-catalog-inventory": "100.0.0-dev",
45+
"magento/magento2-functional-test-module-catalog-rule": "100.0.0-dev",
46+
"magento/magento2-functional-test-module-catalog-rule-configurable": "100.0.0-dev",
47+
"magento/magento2-functional-test-module-catalog-search": "100.0.0-dev",
48+
"magento/magento2-functional-test-module-catalog-url-rewrite": "100.0.0-dev",
49+
"magento/magento2-functional-test-module-catalog-widget": "100.0.0-dev",
50+
"magento/magento2-functional-test-module-checkout": "100.0.0-dev",
51+
"magento/magento2-functional-test-module-checkout-agreements": "100.0.0-dev",
52+
"magento/magento2-functional-test-module-cms": "100.0.0-dev",
53+
"magento/magento2-functional-test-module-cms-url-rewrite": "100.0.0-dev",
54+
"magento/magento2-functional-test-module-config": "100.0.0-dev",
55+
"magento/magento2-functional-test-module-configurable-import-export": "100.0.0-dev",
56+
"magento/magento2-functional-test-module-configurable-product": "100.0.0-dev",
57+
"magento/magento2-functional-test-module-configurable-product-sales": "100.0.0-dev",
58+
"magento/magento2-functional-test-module-contact": "100.0.0-dev",
59+
"magento/magento2-functional-test-module-cookie": "100.0.0-dev",
60+
"magento/magento2-functional-test-module-cron": "100.0.0-dev",
61+
"magento/magento2-functional-test-module-currency-symbol": "100.0.0-dev",
62+
"magento/magento2-functional-test-module-customer": "100.0.0-dev",
63+
"magento/magento2-functional-test-module-customer-import-export": "100.0.0-dev",
64+
"magento/magento2-functional-test-module-deploy": "100.0.0-dev",
65+
"magento/magento2-functional-test-module-developer": "100.0.0-dev",
66+
"magento/magento2-functional-test-module-dhl": "100.0.0-dev",
67+
"magento/magento2-functional-test-module-directory": "100.0.0-dev",
68+
"magento/magento2-functional-test-module-downloadable": "100.0.0-dev",
69+
"magento/magento2-functional-test-module-downloadable-import-export": "100.0.0-dev",
70+
"magento/magento2-functional-test-module-eav": "100.0.0-dev",
71+
"magento/magento2-functional-test-module-email": "100.0.0-dev",
72+
"magento/magento2-functional-test-module-encryption-key": "100.0.0-dev",
73+
"magento/magento2-functional-test-module-fedex": "100.0.0-dev",
74+
"magento/magento2-functional-test-module-gift-message": "100.0.0-dev",
75+
"magento/magento2-functional-test-module-google-adwords": "100.0.0-dev",
76+
"magento/magento2-functional-test-module-google-analytics": "100.0.0-dev",
77+
"magento/magento2-functional-test-module-google-optimizer": "100.0.0-dev",
78+
"magento/magento2-functional-test-module-graph-ql": "100.0.0-dev",
79+
"magento/magento2-functional-test-module-grouped-import-export": "100.0.0-dev",
80+
"magento/magento2-functional-test-module-grouped-product": "100.0.0-dev",
81+
"magento/magento2-functional-test-module-import-export": "100.0.0-dev",
82+
"magento/magento2-functional-test-module-indexer": "100.0.0-dev",
83+
"magento/magento2-functional-test-module-instant-purchase": "100.0.0-dev",
84+
"magento/magento2-functional-test-module-integration": "100.0.0-dev",
85+
"magento/magento2-functional-test-module-layered-navigation": "100.0.0-dev",
86+
"magento/magento2-functional-test-module-media-storage": "100.0.0-dev",
87+
"magento/magento2-functional-test-module-msrp": "100.0.0-dev",
88+
"magento/magento2-functional-test-module-multishipping": "100.0.0-dev",
89+
"magento/magento2-functional-test-module-new-relic-reporting": "100.0.0-dev",
90+
"magento/magento2-functional-test-module-newsletter": "100.0.0-dev",
91+
"magento/magento2-functional-test-module-offline-payments": "100.0.0-dev",
92+
"magento/magento2-functional-test-module-offline-shipping": "100.0.0-dev",
93+
"magento/magento2-functional-test-module-page-cache": "100.0.0-dev",
94+
"magento/magento2-functional-test-module-payment": "100.0.0-dev",
95+
"magento/magento2-functional-test-module-paypal": "100.0.0-dev",
96+
"magento/magento2-functional-test-module-persistent": "100.0.0-dev",
97+
"magento/magento2-functional-test-module-product-alert": "100.0.0-dev",
98+
"magento/magento2-functional-test-module-product-video": "100.0.0-dev",
99+
"magento/magento2-functional-test-module-quote": "100.0.0-dev",
100+
"magento/magento2-functional-test-module-reports": "100.0.0-dev",
101+
"magento/magento2-functional-test-module-require-js": "100.0.0-dev",
102+
"magento/magento2-functional-test-module-review": "100.0.0-dev",
103+
"magento/magento2-functional-test-module-robots": "100.0.0-dev",
104+
"magento/magento2-functional-test-module-rss": "100.0.0-dev",
105+
"magento/magento2-functional-test-module-rule": "100.0.0-dev",
106+
"magento/magento2-functional-test-module-sales": "100.0.0-dev",
107+
"magento/magento2-functional-test-module-sales-inventory": "100.0.0-dev",
108+
"magento/magento2-functional-test-module-sales-rule": "100.0.0-dev",
109+
"magento/magento2-functional-test-module-sales-sequence": "100.0.0-dev",
110+
"magento/magento2-functional-test-module-sample-data": "100.0.0-dev",
111+
"magento/magento2-functional-test-module-search": "100.0.0-dev",
112+
"magento/magento2-functional-test-module-security": "100.0.0-dev",
113+
"magento/magento2-functional-test-module-send-friend": "100.0.0-dev",
114+
"magento/magento2-functional-test-module-shipping": "100.0.0-dev",
115+
"magento/magento2-functional-test-module-sitemap": "100.0.0-dev",
116+
"magento/magento2-functional-test-module-store": "100.0.0-dev",
117+
"magento/magento2-functional-test-module-swagger": "100.0.0-dev",
118+
"magento/magento2-functional-test-module-swatches": "100.0.0-dev",
119+
"magento/magento2-functional-test-module-swatches-layered-navigation": "100.0.0-dev",
120+
"magento/magento2-functional-test-module-tax": "100.0.0-dev",
121+
"magento/magento2-functional-test-module-tax-import-export": "100.0.0-dev",
122+
"magento/magento2-functional-test-module-theme": "100.0.0-dev",
123+
"magento/magento2-functional-test-module-translation": "100.0.0-dev",
124+
"magento/magento2-functional-test-module-ui": "100.0.0-dev",
125+
"magento/magento2-functional-test-module-ups": "100.0.0-dev",
126+
"magento/magento2-functional-test-module-url-rewrite": "100.0.0-dev",
127+
"magento/magento2-functional-test-module-user": "100.0.0-dev",
128+
"magento/magento2-functional-test-module-usps": "100.0.0-dev",
129+
"magento/magento2-functional-test-module-variable": "100.0.0-dev",
130+
"magento/magento2-functional-test-module-vault": "100.0.0-dev",
131+
"magento/magento2-functional-test-module-version": "100.0.0-dev",
132+
"magento/magento2-functional-test-module-webapi": "100.0.0-dev",
133+
"magento/magento2-functional-test-module-webapi-security": "100.0.0-dev",
134+
"magento/magento2-functional-test-module-weee": "100.0.0-dev",
135+
"magento/magento2-functional-test-module-widget": "100.0.0-dev",
136+
"magento/magento2-functional-test-module-wishlist": "100.0.0-dev"
137+
},
29138
"autoload": {
30139
"psr-4": {
31140
"Magento\\": "tests/functional/Magento"

0 commit comments

Comments
 (0)