Skip to content

Merge master to develop #462

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 42 commits into from
Sep 23, 2019
Merged
Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
44159b5
Adding action group ref file.
dobooth Aug 13, 2019
5895db4
Small grammar change.
dobooth Aug 15, 2019
17fea8e
moving template to devdocs.
dobooth Aug 16, 2019
8e2fa00
Merge pull request #419 from magento-devdocs/db_actiongroup_ref
KevinBKozan Aug 16, 2019
f5e0799
Putting selectors.md back
dobooth Aug 16, 2019
c608c2c
Merge pull request #423 from magento-devdocs/db_selectors
KevinBKozan Aug 19, 2019
3bf88ed
MQE-1715: .credentials file must exist but it should not have to
KevinBKozan Aug 30, 2019
9015ee9
MQE-1715: .credentials file must exist but it should not have to
KevinBKozan Aug 30, 2019
d9de524
Merge pull request #438 from magento/MQE-1715
okolesnyk Aug 30, 2019
7222259
MQE-1510 (#446)
KevinBKozan Sep 10, 2019
fa579d1
MQE-1755: mftf run:test Test1 Test2 does not run before/after hooks c…
soumyau Sep 10, 2019
3b84f12
MQE-1755: mftf run:test Test1 Test2 does not run before/after hooks c…
soumyau Sep 11, 2019
8597fcb
MQE-1755: mftf run:test Test1 Test2 does not run before/after hooks c…
soumyau Sep 11, 2019
fb444bd
Merge pull request #447 from magento/MQE-1753
jilu1 Sep 11, 2019
9cfeb9c
MQE-1755: mftf run:test Test1 Test2 does not run before/after hooks c…
soumyau Sep 11, 2019
6a5798e
MQE-1755: mftf run:test Test1 Test2 does not run before/after hooks c…
soumyau Sep 11, 2019
88030f3
Merge pull request #448 from magento/MQE-1755
soumyau Sep 13, 2019
55a8dda
Merge pull request #451 from magento/MQE-1754
jilu1 Sep 13, 2019
c113b9f
MQE-1743: Changelog and Composer Bump (#449)
KevinBKozan Sep 13, 2019
d97b013
MQE-1582: Enable Testers To Run Skipped Tests
KevinBKozan Sep 13, 2019
eca4dbc
Merge pull request #452 from magento/MQE-1582
KevinBKozan Sep 13, 2019
f63fac8
MQE-1765: Introduce API Endpoint and Request Headers to Allure artifacts
KevinBKozan Sep 16, 2019
93fd35d
MQE-1765: Introduce API Endpoint and Request Headers to Allure artifacts
KevinBKozan Sep 16, 2019
d3c7759
Merge pull request #454 from magento/Remove-Artifacts
KevinBKozan Sep 17, 2019
7accc4c
MQE-1671: updated CHANGELOG.md to include vault integration
jilu1 Sep 17, 2019
73fbfa5
Merge pull request #456 from magento/MQE-1671
KevinBKozan Sep 17, 2019
d58eb6b
MQE-1768: incorrect credential key for carriers_fedex_account in .cre…
jilu1 Sep 17, 2019
2c4f210
Merge pull request #457 from magento/MQE-1768
KevinBKozan Sep 17, 2019
007c83c
Merge branch 'master' into 2.5.0-RC
KevinBKozan Sep 17, 2019
5aa3796
Merge pull request #458 from magento/2.5.0-RC
KevinBKozan Sep 18, 2019
5fb8569
MQE-1671: document using credentials with vault in MFTF tests
jilu1 Sep 18, 2019
ff17f04
Formatting
dobooth Sep 18, 2019
e73f8b8
First update
dobooth Sep 18, 2019
f980fe6
Formatting
dobooth Sep 18, 2019
2e228d0
Formatting
dobooth Sep 18, 2019
627b0ee
MQE-1671: document using credentials with vault in MFTF tests
jilu1 Sep 18, 2019
b5aa05a
MQE-1671: document using credentials with vault in MFTF tests
jilu1 Sep 18, 2019
3c3f2ce
MQE-1671: document using credentials with vault in MFTF tests
jilu1 Sep 18, 2019
902bad6
MQE-1671: document using credentials with vault in MFTF tests
jilu1 Sep 18, 2019
d3f71ae
Merge pull request #459 from magento/MQE-1671-master
KevinBKozan Sep 19, 2019
a466aa3
Merge branch 'develop' into MasterToDevelop
KevinBKozan Sep 19, 2019
e447ac0
Merge branch 'develop' into MasterToDevelop
KevinBKozan Sep 23, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
MQE-1755: mftf run:test Test1 Test2 does not run before/after hooks c…
…orrectly

fixed unit tests
  • Loading branch information
soumyau committed Sep 11, 2019
commit 3b84f12a963a789bded006226d0dfd46463de279
39 changes: 21 additions & 18 deletions src/Magento/FunctionalTestingFramework/Console/RunTestCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ protected function configure()
* @param OutputInterface $output
* @return integer
* @throws \Exception
*
* @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
protected function execute(InputInterface $input, OutputInterface $output): int
{
Expand Down Expand Up @@ -86,26 +84,29 @@ protected function execute(InputInterface $input, OutputInterface $output): int

$testConfigArray = json_decode($testConfiguration, true);

// run tests not referenced in suites
$this->runTests($testConfigArray['tests'], $output);
if (isset($testConfigArray['tests'])) {
$this->runTests($testConfigArray['tests'], $output);
}

// run tests in suites
$this->runTestsInSuite($testConfigArray['suites'], $output);
if (isset($testConfigArray['suites'])) {
$this->runTestsInSuite($testConfigArray['suites'], $output);
}

return $this->returnCode;

}

/**
* Run tests not referenced in suites
* @param array $testsConfig
*
* @param array $tests
* @param OutputInterface $output
* @return void
* @throws TestFrameworkException
*
* @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
private function runTests($testsConfig, OutputInterface $output) {


$tests = $testsConfig ?? [];
private function runTests(array $tests, OutputInterface $output)
{
$codeceptionCommand = realpath(PROJECT_ROOT . '/vendor/bin/codecept') . ' run functional ';
$testsDirectory = TESTS_MODULE_PATH .
DIRECTORY_SEPARATOR .
Expand Down Expand Up @@ -135,17 +136,19 @@ private function runTests($testsConfig, OutputInterface $output) {

/**
* Run tests referenced in suites within suites' context.
*
* @param array $suitesConfig
* @param OutputInterface $output
* @return void
*
* @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
private function runTestsInSuite($suitesConfig, OutputInterface $output) {

$suites = $suitesConfig ?? [];
private function runTestsInSuite(array $suitesConfig, OutputInterface $output)
{
$codeceptionCommand = realpath(PROJECT_ROOT . '/vendor/bin/codecept') . ' run functional --verbose --steps ';
$testGroups = array_keys($suites);
//for tests in suites, run them as a group to run before and after block
foreach ($testGroups as $testGroup) {
$fullCommand = $codeceptionCommand . " -g {$testGroup}";
foreach (array_keys($suitesConfig) as $suite) {
$fullCommand = $codeceptionCommand . " -g {$suite}";
$process = new Process($fullCommand);
$process->setWorkingDirectory(TESTS_BP);
$process->setIdleTimeout(600);
Expand Down