Skip to content

MFTF 2.5.4 #528

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 126 commits into from
Dec 12, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
126 commits
Select commit Hold shift + click to select a range
90320b1
#339: allow direct execution of the bin/magento executable instead of…
powli Apr 25, 2019
f132281
Fix phpcs issues
powli Apr 30, 2019
669ca53
Add possibility to include multiple non primitive types in an array
ochnygosch Aug 28, 2019
938a6ab
Correct formatting to adhere to psr-2 coding standards
ochnygosch Aug 28, 2019
b3f9db9
Correct formatting to adhere to psr-2 coding standards
ochnygosch Aug 28, 2019
070654d
Add unit test for diveres data array
ochnygosch Oct 1, 2019
491802c
Adhere to code style guide
ochnygosch Oct 1, 2019
36a243a
MQE-1644: Add ability to see JS log in Allure
KevinBKozan Oct 16, 2019
997a9ef
MQE-1644: Add ability to see JS log in Allure
KevinBKozan Oct 17, 2019
dc0bf75
MQE-1644: Add ability to see JS log in Allure
KevinBKozan Oct 17, 2019
31073a3
MQE-1644: Add ability to see JS log in Allure
KevinBKozan Oct 17, 2019
d7d14c3
MQE-1644: Add ability to see JS log in Allure
KevinBKozan Oct 17, 2019
2b8710b
Merge branch 'develop' into MQE-1644
KevinBKozan Oct 17, 2019
f1ecc23
Merge branch 'develop' into CLI-direct-shell-exec
soumyau Oct 18, 2019
6a5f52a
Merge branch 'fDiverseArray' of https://github.com/ochnygosch/magento…
tomreece Oct 18, 2019
cd94d20
MQE-1749: Review Community PR #433
tomreece Oct 18, 2019
b7ee3f8
Work in progress before vacation
tomreece Oct 18, 2019
b37e2b3
Merge branch 'develop' into ochnygosch-fDiverseArray
tomreece Oct 18, 2019
255e0a7
Merge branch 'develop' into CLI-direct-shell-exec
powli Oct 18, 2019
f110875
Merge pull request #490 from magento/ochnygosch-fDiverseArray
KevinBKozan Oct 21, 2019
39d987a
MQE-1644: Add ability to see JS log in Allure
KevinBKozan Oct 22, 2019
bdd0735
Merge branch 'develop' into CLI-direct-shell-exec
soumyau Oct 22, 2019
e175381
Merge pull request #343 from netresearch/CLI-direct-shell-exec
soumyau Oct 23, 2019
ac6daba
Merge branch 'develop' into MQE-1644
KevinBKozan Oct 23, 2019
c3f7c05
Merge pull request #489 from magento/MQE-1644
KevinBKozan Oct 23, 2019
d8c58af
MQE-1782: MFTF run:group can't run test in a suite
KevinBKozan Oct 23, 2019
8e7494d
MQE-1782: MFTF run:group can't run test in a suite
KevinBKozan Oct 24, 2019
09d8bfd
MQE-1782: MFTF run:group can't run test in a suite
KevinBKozan Oct 25, 2019
2a9df73
MQE-1782: MFTF run:group can't run test in a suite
KevinBKozan Oct 28, 2019
9cb452b
MQE-1782: MFTF run:group can't run test in a suite
KevinBKozan Oct 28, 2019
8016574
Merge branch 'develop' into MQE-1782
KevinBKozan Oct 29, 2019
640c2c9
Merge pull request #497 from magento/MQE-1782
KevinBKozan Oct 30, 2019
5497d21
MQE-1845: Convert Writing tests with actiongroups
tomreece Oct 30, 2019
7ac812b
MQE-1257: MFTF Troubleshoot command
jilu1 Oct 30, 2019
7bdcafd
MQE-1257: MFTF Troubleshoot command
jilu1 Oct 30, 2019
4fdf441
MQE-1257: MFTF Troubleshoot command
jilu1 Oct 30, 2019
aa1629d
Editorial pass
dobooth Nov 1, 2019
1416cfb
Merge pull request #499 from magento/MQE-1845
tomreece Nov 1, 2019
f1299b1
MQE-1257: MFTF doctor command
jilu1 Nov 8, 2019
7c0dafd
MQE-1712: Get Error HTTP response code: 500 when using magentoCLI wit…
KevinBKozan Nov 11, 2019
3d46fc7
Merge pull request #503 from magento/MQE-1712
KevinBKozan Nov 12, 2019
bfe90fd
expanding on credential usage docs to explicitly call out how to use …
filmaj Nov 12, 2019
e894f75
Grammar fixup.
dobooth Nov 12, 2019
6dd9655
remove vault-based credentials usage details for now
filmaj Nov 13, 2019
6c13d9d
Merge pull request #505 from filmaj/credential-usage-docs
KevinBKozan Nov 14, 2019
467c157
MQE-1884: MFTF - <after> failures override other failures
soumyau Nov 14, 2019
722f312
MQE-1884: MFTF - <after> failures override other failures
soumyau Nov 14, 2019
960320a
MQE-1884: MFTF - <after> failures override other failures
soumyau Nov 15, 2019
25c5706
MQE-1257: MFTF doctor command
jilu1 Nov 14, 2019
4908777
MQE-1257: MFTF doctor command
jilu1 Nov 15, 2019
db8712b
MQE-1884: MFTF - <after> failures override other failures
soumyau Nov 18, 2019
78d396f
MQE-1884: MFTF - <after> failures override other failures
soumyau Nov 19, 2019
6db9c8d
MQE-1884: MFTF - <after> failures override other failures
soumyau Nov 19, 2019
d3e6a72
MQE-1884: MFTF - <after> failures override other failures
soumyau Nov 19, 2019
bea39a9
MQE-1257: MFTF doctor command
jilu1 Nov 19, 2019
485c49b
Merge remote-tracking branch 'origin/develop' into MQE-1257
jilu1 Nov 19, 2019
de359cb
MQE-1257: MFTF doctor command
jilu1 Nov 19, 2019
795f09e
MQE-1884: MFTF - <after> failures override other failures
soumyau Nov 19, 2019
f101b0e
Merge pull request #500 from magento/MQE-1257
jilu1 Nov 19, 2019
3373f7d
MQE-1765: Introduce API Endpoint and Request Headers to Allure artifacts
KevinBKozan Nov 20, 2019
001e5e2
MQE-1470: add interface to handle file path and url format
jilu1 Nov 20, 2019
b5ea617
MQE-1765: Introduce API Endpoint and Request Headers to Allure artifacts
KevinBKozan Nov 20, 2019
44bd4bd
MQE-1765: Introduce API Endpoint and Request Headers to Allure artifact
KevinBKozan Nov 20, 2019
d8f3980
Merge remote-tracking branch 'origin/develop' into MQE-1470
jilu1 Nov 21, 2019
f039692
MQE-1774: Review community PR #343
soumyau Nov 21, 2019
de5bed6
MQE-1774: Review community PR #343
soumyau Nov 21, 2019
be71f94
MQE-1520: Consolidate WAIT_TIMEOUT in .env and pageload_timeout in c…
KevinBKozan Nov 21, 2019
7f8fe40
Merge pull request #511 from magento/MQE-1774
soumyau Nov 21, 2019
d10be09
Merge branch 'develop' into MQE-1884
soumyau Nov 21, 2019
0792413
Merge branch 'develop' into MQE-1520
KevinBKozan Nov 21, 2019
cb5c632
MQE-1470: add interface to handle file path and url format
jilu1 Nov 21, 2019
26ef6b0
Merge pull request #507 from magento/MQE-1884
soumyau Nov 21, 2019
b25e504
Merge remote-tracking branch 'origin/develop' into MQE-1470
jilu1 Nov 21, 2019
ab0d3c5
MQE-1520: Consolidate WAIT_TIMEOUT in .env and pageload_timeout
KevinBKozan Nov 21, 2019
dc004a2
MQE-1627: RetrieveEntityField generation does not consider ActionGroup
KevinBKozan Nov 21, 2019
97f3b3e
MQE-1711: Switch between Developer mode and Production mode takes lon…
soumyau Nov 21, 2019
cc5932a
MQE-1520: Consolidate WAIT_TIMEOUT in .env and pageload_timeout
KevinBKozan Nov 22, 2019
16e1f03
MQE-1711: Switch between Developer mode and Production mode takes lon…
soumyau Nov 22, 2019
fceb17f
MQE-1711: Switch between Developer mode and Production mode takes lon…
soumyau Nov 22, 2019
2e1887e
MQE-1711: Switch between Developer mode and Production mode takes lon…
soumyau Nov 22, 2019
4e7467e
Merge pull request #513 from magento/MQE-1627
soumyau Nov 25, 2019
fc1630f
Merge branch 'develop' into MQE-1765
tomreece Nov 25, 2019
8f72ffc
MQE-1520: Consolidate WAIT_TIMEOUT in .env and pageload_timeout
soumyau Nov 25, 2019
bcd6105
Merge branch 'develop' into MQE-1470
jilu1 Nov 25, 2019
cf353e4
Merge pull request #510 from magento/MQE-1765
tomreece Nov 25, 2019
ecf1f25
Merge branch 'develop' into MQE-1470
jilu1 Nov 25, 2019
d4faf13
MQE-1711: Switch between Developer mode and Production mode takes lon…
soumyau Nov 25, 2019
67472f5
MQE-1711: Switch between Developer mode and Production mode takes lon…
soumyau Nov 25, 2019
e4499a3
Merge pull request #509 from magento/MQE-1470
jilu1 Nov 26, 2019
009e7b6
Merge branch 'develop' into MQE-1520
jilu1 Nov 26, 2019
4bbcab4
Merge pull request #512 from magento/MQE-1520
jilu1 Nov 26, 2019
0f7bd4a
MQE-1711: Switch between Developer mode and Production mode takes lon…
soumyau Nov 26, 2019
aa3f758
Merge remote-tracking branch 'origin/develop' into MQE-1711
soumyau Nov 26, 2019
9e7ce0d
MQE-1711: Switch between Developer mode and Production mode takes lon…
soumyau Nov 26, 2019
f6a7763
MQE-1711: Switch between Developer mode and Production mode takes lon…
soumyau Nov 26, 2019
16d6880
Merge pull request #514 from magento/MQE-1711
soumyau Nov 26, 2019
0cdb294
MQE-1463: Fixes for Suite documentation in devdocs
tomreece Dec 2, 2019
691b675
Add link to action-groups.md
TomashKhamlai Dec 2, 2019
507e26d
Merge pull request #518 from TomashKhamlai/merging-link
KevinBKozan Dec 2, 2019
9aeb0e3
Merge branch 'develop' into MQE-1463
KevinBKozan Dec 2, 2019
1471d80
Grammar and formatting
dobooth Dec 2, 2019
94737d1
Merge pull request #517 from magento/MQE-1463
KevinBKozan Dec 3, 2019
3becb62
MQE-1902: Running bin/magento from MagentoWebDriver causing timeout i…
soumyau Dec 3, 2019
41afe3d
MQE-1902: Running bin/magento from MagentoWebDriver causing timeout i…
soumyau Dec 3, 2019
dea0c05
MQE-1902: Running bin/magento from MagentoWebDriver causing timeout i…
soumyau Dec 3, 2019
50d9cd2
MQE-1902: Running bin/magento from MagentoWebDriver causing timeout i…
soumyau Dec 3, 2019
5946652
MQE-1902: Running bin/magento from MagentoWebDriver causing timeout i…
soumyau Dec 3, 2019
84b9f87
MQE-1902: Running bin/magento from MagentoWebDriver causing timeout i…
soumyau Dec 3, 2019
e207c47
MQE-1902: Running bin/magento from MagentoWebDriver causing timeout i…
soumyau Dec 4, 2019
712cc51
MQE-1902: Running bin/magento from MagentoWebDriver causing timeout i…
soumyau Dec 4, 2019
fa8e51b
MQE-1902: Running bin/magento from MagentoWebDriver causing timeout i…
soumyau Dec 4, 2019
580d6dc
Merge pull request #519 from magento/MQE-1902-2
soumyau Dec 4, 2019
e97567b
Merge branch 'master' into MFTF2.5.4-RC
KevinBKozan Dec 4, 2019
a51f3bf
MQE-1893: CHANGELOG.MD and Composer version bump
KevinBKozan Dec 5, 2019
6ab962c
MQE-1650: Update MFTF configuration to read Test entities from new lo…
KevinBKozan Dec 5, 2019
efed6e2
Merge pull request #521 from magento/MQE-1650-Composer
KevinBKozan Dec 6, 2019
85160a9
Merge branch 'MFTF2.5.4-RC' into MQE-1893
KevinBKozan Dec 6, 2019
ca2e420
MQE-1893: CHANGELOG.MD and Composer version bump
KevinBKozan Dec 6, 2019
61e6c27
MQE-1908: Change doctor command to work with Curl version of MagentoCLI
jilu1 Dec 6, 2019
b4dbaa4
MQE-1905: Inconsistent environment variable naming for MAGENTO_BACKEN…
jilu1 Dec 6, 2019
a243dbd
MQE-1908: Change doctor command to work with Curl version of MagentoCLI
jilu1 Dec 6, 2019
4c204ac
Merge pull request #525 from magento/MQE-1905-2.5.4
jilu1 Dec 6, 2019
8774ac6
Merge pull request #526 from magento/MQE-1908-2.5.4
jilu1 Dec 6, 2019
9cd8891
MQE-1917: ENABLE_BROWSER_LOG = false attaches JS logs to allure
soumyau Dec 9, 2019
245e116
Merge pull request #527 from magento/MQE-1917
soumyau Dec 9, 2019
1ca5694
Merge pull request #522 from magento/MQE-1893
KevinBKozan Dec 10, 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
25 changes: 25 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,30 @@
Magento Functional Testing Framework Changelog
================================================
2.5.4
-----

* Traceability
* Introduced new `mftf doctor` command
* Command verifies and troubleshoots some configuration steps required for running tests
* Please see DevDocs for more details
* `<*Data>` actions now contain `API Endpoint` and `Request Header` artifacts.
* Introduced new `.env` configurations `ENABLE_BROWSER_LOG` and `BROWSER_LOG_BLACKLIST`
* Configuration enables allure artifacts for browser log entries if they are present after the step.
* Blacklist filters out logs from specific sources.
* Customizability
* Introduced `timeout=""` to `magentoCLI` actions.

### GitHub Issues/Pull requests:
* [#317](https://github.com/magento/magento2-functional-testing-framework/pull/317) -- RetrieveEntityField generation does not consider ActionGroup as part of namespace
* [#433](https://github.com/magento/magento2-functional-testing-framework/pull/433) -- Add possibility to include multiple non primitive types in an array

### Fixes
* A test now contains attachments for every exception encountered in the test (fix for a test `<after>` exception overriding all test exceptions).
* Fixed hard requirement for `MAGENTO_BASE_URL` to contain a leading `/`.
* `magentoCLI` actions for `config:sensitive:set` no longer obscure CLI output.
* `WAIT_TIMEOUT` in the `.env` now correctly sets `pageload_timeout` configuration.
* Fixed an issue where `run:group` could not consolidate a `group` that had tests in and out of `<suite>`s.

2.5.3
-----

Expand Down
4 changes: 3 additions & 1 deletion bin/mftf
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,11 @@ try {


try {
$version = json_decode(file_get_contents(FW_BP . DIRECTORY_SEPARATOR . 'composer.json'), true);
$version = $version['version'];
$application = new Symfony\Component\Console\Application();
$application->setName('Magento Functional Testing Framework CLI');
$application->setVersion('2.5.3');
$application->setVersion($version);
/** @var \Magento\FunctionalTestingFramework\Console\CommandListInterface $commandList */
$commandList = new \Magento\FunctionalTestingFramework\Console\CommandList;
foreach ($commandList->getCommands() as $command) {
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "magento/magento2-functional-testing-framework",
"description": "Magento2 Functional Testing Framework",
"type": "library",
"version": "2.5.3",
"version": "2.5.4",
"license": "AGPL-3.0",
"keywords": ["magento", "automation", "functional", "testing"],
"config": {
Expand All @@ -12,7 +12,7 @@
"php": "7.0.2||7.0.4||~7.0.6||~7.1.0||~7.2.0||~7.3.0",
"ext-curl": "*",
"allure-framework/allure-codeception": "~1.3.0",
"codeception/codeception": "~2.3.4 || ~2.4.0 ",
"codeception/codeception": "~2.4.5",
"composer/composer": "^1.4",
"consolidation/robo": "^1.0.0",
"csharpru/vault-php": "~3.5.3",
Expand Down
97 changes: 69 additions & 28 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion dev/tests/_bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@
'MAGENTO_BACKEND_NAME' => 'admin',
'MAGENTO_ADMIN_USERNAME' => 'admin',
'MAGENTO_ADMIN_PASSWORD' => 'admin123',
'DEFAULT_TIMEZONE' => 'America/Los_Angeles'
'DEFAULT_TIMEZONE' => 'America/Los_Angeles',
'WAIT_TIMEOUT' => '10'
];

foreach ($TEST_ENVS as $key => $value) {
Expand Down
13 changes: 9 additions & 4 deletions dev/tests/functional/standalone_bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@

require_once realpath(PROJECT_ROOT . '/vendor/autoload.php');

$envFilePath = dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR;
defined('ENV_FILE_PATH') || define('ENV_FILE_PATH', $envFilePath);

//Load constants from .env file
$envFilePath = dirname(dirname(__DIR__));
if (file_exists($envFilePath . DIRECTORY_SEPARATOR . '.env')) {
$env = new \Dotenv\Loader($envFilePath . DIRECTORY_SEPARATOR . '.env');
if (file_exists(ENV_FILE_PATH . '.env')) {
$env = new \Dotenv\Loader(ENV_FILE_PATH . '.env');
$env->load();

foreach ($_ENV as $key => $var) {
Expand Down Expand Up @@ -47,7 +49,10 @@

defined('DEFAULT_TIMEZONE') || define('DEFAULT_TIMEZONE', 'America/Los_Angeles');
$env->setEnvironmentVariable('DEFAULT_TIMEZONE', DEFAULT_TIMEZONE);


defined('WAIT_TIMEOUT') || define('WAIT_TIMEOUT', 30);
$env->setEnvironmentVariable('WAIT_TIMEOUT', 30);

try {
new DateTimeZone(DEFAULT_TIMEZONE);
} catch (\Exception $e) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
namespace Tests\unit\Magento\FunctionalTestingFramework\Allure;

use Magento\FunctionalTestingFramework\Allure\AllureHelper;
use Magento\FunctionalTestingFramework\Allure\Event\AddUniqueAttachmentEvent;
use Yandex\Allure\Adapter\Allure;
use Yandex\Allure\Adapter\Event\AddAttachmentEvent;
use Yandex\Allure\Adapter\Event\StepFinishedEvent;
Expand All @@ -24,6 +25,7 @@ class AllureHelperTest extends TestCase
public function tearDown()
{
Allure::setDefaultLifecycle();
AspectMock::clean();
}

/**
Expand Down Expand Up @@ -85,13 +87,48 @@ public function testAddAttachmentToLastStep()
}

/**
* Mock file system manipulation function
* AddAttachment actions should have files with different attachment names
* @throws \Yandex\Allure\Adapter\AllureException
*/
public function testAddAttachementUniqueName()
{
$this->mockCopyFile();
$expectedData = "string";
$expectedCaption = "caption";

//Prepare Allure lifecycle
Allure::lifecycle()->fire(new StepStartedEvent('firstStep'));

//Call function twice
AllureHelper::addAttachmentToCurrentStep($expectedData, $expectedCaption);
AllureHelper::addAttachmentToCurrentStep($expectedData, $expectedCaption);

// Assert file names for both attachments are not the same.
$step = Allure::lifecycle()->getStepStorage()->pollLast();
$attachmentOne = $step->getAttachments()[0]->getSource();
$attachmentTwo = $step->getAttachments()[1]->getSource();
$this->assertNotEquals($attachmentOne, $attachmentTwo);
}

/**
* Mock entire attachment writing mechanisms
* @throws \Exception
*/
public function mockAttachmentWriteEvent()
{
AspectMock::double(AddAttachmentEvent::class, [
AspectMock::double(AddUniqueAttachmentEvent::class, [
"getAttachmentFileName" => self::MOCK_FILENAME
]);
}

/**
* Mock only file writing mechanism
* @throws \Exception
*/
public function mockCopyFile()
{
AspectMock::double(AddUniqueAttachmentEvent::class, [
"copyFile" => true
]);
}
}
Loading