Skip to content

Commit 33b1315

Browse files
author
Magento CICD
authored
merge magento/2.3-develop into magento-tsg/2.3-develop-pr2
2 parents 58c1423 + 152b5ee commit 33b1315

34 files changed

+140
-172
lines changed

‎dev/tests/acceptance/.env.example‎

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

4-
#*** Start of example .env ***#
5-
#
6-
# MAGENTO_BASE_URL=http://127.0.0.1:32772/
7-
#
8-
# MAGENTO_BACKEND_NAME=admin
9-
# MAGENTO_ADMIN_USERNAME=admin
10-
# MAGENTO_ADMIN_PASSWORD=123123q
11-
#
12-
# MAGENTO_CLI_COMMAND_PATH=dev/tests/functional/utils/command.php
13-
# MAGENTO_CLI_COMMAND_PARAMETER=command
14-
#
15-
# SELENIUM_HOST=127.0.0.1
16-
# SELENIUM_PORT=4444
17-
# SELENIUM_PROTOCOL=http
18-
# SELENIUM_PATH=/wd/hub
19-
#
20-
# MAGENTO_RESTAPI_SERVER_HOST=127.0.0.1
21-
# MAGENTO_RESTAPI_SERVER_PORT=32769
22-
#
23-
# TESTS_BP=/Users/First_Last/GitHub/magento2ce/dev/tests/acceptance/tests/functional
24-
# FW_BP=/Users/First_Last/GitHub/magento2-functional-testing-framework
25-
# TESTS_MODULE_PATH=/Users/First_Last/GitHub/magento2ce/dev/tests/acceptance/tests/functional/Magento/FunctionalTest
26-
# MODULE_WHITELIST=Magento_NewModule
27-
#
28-
#*** End of example .env ***#
29-
30-
31-
#*** Start of .env ***#
32-
334
#*** Set the base URL for your Magento instance ***#
345
MAGENTO_BASE_URL=
356

@@ -63,4 +34,4 @@ MODULE_WHITELIST=Magento_Framework,Magento_ConfigurableProductWishlist,Magento_C
6334

6435
#*** Bool property which allows the user to toggle debug output during test execution
6536
#MFTF_DEBUG=
66-
#*** End of .env ***#
37+
#*** End of .env ***#

‎dev/tests/acceptance/RoboFile.php‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,15 @@ function buildProject()
4343
* @param array $opts
4444
* @return void
4545
*/
46-
function generateTests($opts = ['config' => null])
46+
function generateTests($opts = ['config' => null, 'force' => false])
4747
{
48+
$GLOBALS['GENERATE_TESTS'] = true;
49+
50+
if ($opts['force'])
51+
{
52+
$GLOBALS['FORCE_PHP_GENERATE'] = true;
53+
}
54+
4855
require 'tests'. DIRECTORY_SEPARATOR . 'functional' . DIRECTORY_SEPARATOR . '_bootstrap.php';
4956
\Magento\FunctionalTestingFramework\Util\TestGenerator::getInstance()->createAllTestFiles($opts['config']);
5057
$this->say("Generate Tests Command Run");

‎dev/tests/acceptance/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"consolidation/robo": "^1.0.0",
2222
"symfony/process": ">=2.7 <3.4",
2323
"henrikbjorn/lurker": "^1.2",
24-
"magento/magento2-functional-testing-framework": "~2.0.2",
24+
"magento/magento2-functional-testing-framework": "~2.1.0",
2525
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
2626
"vlucas/phpdotenv": "~2.4"
2727
},

‎dev/tests/acceptance/composer.lock‎

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dev/tests/acceptance/tests/_bootstrap.php‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,14 @@
2121
defined($key) || define($key, $var);
2222
}
2323
}
24+
if (!defined('MAGENTO_CLI_COMMAND_PATH')) {
25+
define('MAGENTO_CLI_COMMAND_PATH', 'dev/tests/acceptance/utils/command.php');
26+
$env->setEnvironmentVariable('MAGENTO_CLI_COMMAND_PATH', 'dev/tests/acceptance/utils/command.php');
27+
}
28+
if (!defined('MAGENTO_CLI_COMMAND_PARAMETER')) {
29+
define('MAGENTO_CLI_COMMAND_PARAMETER', 'command');
30+
$env->setEnvironmentVariable('MAGENTO_CLI_COMMAND_PARAMETER', 'command');
31+
}
2432
defined('FW_BP') || define('FW_BP', PROJECT_ROOT . $RELATIVE_FW_PATH);
2533

2634
// add the debug flag here

‎dev/tests/acceptance/tests/_suite/sampleSuite.xml‎

Lines changed: 6 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -6,58 +6,20 @@
66
*/
77
-->
88
<suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Suite/etc/suiteSchema.xsd">
9-
<suite name="mySuite">
9+
<suite name="sample">
1010
<before>
11-
<createData entity="_defaultCategory" stepKey="createCategory"/>
12-
<createData entity="_defaultProduct" stepKey="createProduct">
13-
<required-entity createDataKey="createCategory"/>
14-
</createData>
11+
<createData entity="defaultCategory" stepKey="createCategory"/>
1512
</before>
1613
<after>
17-
<deleteData stepKey="deleteMyProduct" createDataKey="createProduct"/>
18-
<deleteData stepKey="deleteMyCategory" createDataKey="createCategory"/>
14+
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
1915
</after>
20-
<include>
21-
<group name="example"/>
22-
<cest test="PersistMultipleEntitiesTest" name="PersistMultipleEntitiesCest"/>
23-
<module name="SampleTests" file="SampleCest.xml"/>
24-
</include>
25-
<exclude>
26-
<group name="testGroup"/>
27-
</exclude>
28-
</suite>
29-
<suite name="Catalog">
3016
<include>
3117
<module name="Catalog" />
18+
<group name="login" />
3219
</include>
3320
<exclude>
34-
<test name="AdminCreateCategoryCest"/>
35-
<test name="AdminCreateSimpleProductCest"/>
36-
</exclude>
37-
</suite>
38-
<suite name="Cms">
39-
<include>
40-
<module name="Cms" />
41-
</include>
42-
<exclude>
43-
<test name="AdminCreateCmsPageCest"/>
44-
</exclude>
45-
</suite>
46-
<suite name="Newsletter">
47-
<include>
48-
<module name="Newsletter"/>
49-
</include>
50-
</suite>
51-
<suite name="MAGETWO36659">
52-
<include>
53-
<module name="Cms" />
54-
<module name="Catalog" />
55-
<module name="Newsletter" />
56-
</include>
57-
<exclude>
58-
<test name="AdminCreateCmsPageCest"/>
59-
<test name="AdminCreateCategoryCest"/>
60-
<test name="AdminCreateSimpleProductCest"/>
21+
<test name="AddImageToWYSIWYGCatalogEditor"/>
22+
<module name="Catalog" file="AdminCreateCategoryTest.xml" />
6123
</exclude>
6224
</suite>
6325
</suites>

‎dev/tests/acceptance/tests/functional.suite.dist.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ modules:
2121
depends: PhpBrowser
2222
part: Json
2323
- \Magento\FunctionalTestingFramework\Module\MagentoSequence
24+
- \Magento\FunctionalTestingFramework\Module\MagentoAssert
2425
- Asserts
2526
config:
2627
\Magento\FunctionalTestingFramework\Module\MagentoWebDriver:

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Test/AdminConfigurationBlankIndustryCest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<stories value="Try to save empty Magento Advanced Reporting vertical"/>
1414
<title value="Try to save empty Magento Advanced Reporting vertical"/>
1515
<description value="An admin user cannot save a blank industry setting on the Advanced Reporting configuration page."/>
16-
<severity value="NORMAL"/>
16+
<severity value="MAJOR"/>
1717
<testCaseId value="MAGETWO-63981"/>
1818
<group value="analytics"/>
1919
<group value="skip"/>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Test/AdminConfigurationEnableDisableAnalyticsCest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<stories value="Enable/disable Advanced Reporting"/>
1414
<title value="Enable Disable Advanced Reporting"/>
1515
<description value="An admin user can enable/disable Advanced Reporting."/>
16-
<severity value="NORMAL"/>
16+
<severity value="MAJOR"/>
1717
<testCaseId value="MAGETWO-66465"/>
1818
<group value="analytics"/>
1919
</annotations>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Test/AdminConfigurationIndustryCest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<stories value="Set Magento Advanced reporting industry"/>
1515
<title value="Set Magento Advanced reporting industry"/>
1616
<description value="An admin user can change the industry setting on the Advanced Reporting configuration page."/>
17-
<severity value="NORMAL"/>
17+
<severity value="MAJOR"/>
1818
<testCaseId value="MAGETWO-63898"/>
1919
<group value="analytics"/>
2020
</annotations>

0 commit comments

Comments
 (0)