Skip to content

Master to develop 2.3.12 #299

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.

Sign up for GitHub

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 6 commits into from
Jan 22, 2019
Merged

Master to develop 2.3.12 #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1df8a23
MQE-1387: Resolve conflict for allure-codeception and allure-phpunit …
okolesnyk Dec 18, 2018
28470cd
MQE-1387: Resolve conflict for allure-codeception and allure-phpunit …
okolesnyk Dec 18, 2018
14b66e8
Merge pull request #285 from magento/2.3
okolesnyk Dec 19, 2018
4468f6a
MQE-1387: Resolve conflict for allure-codeception and allure-phpunit …
okolesnyk Dec 19, 2018
599004b
MQE-1387: Resolve conflict for allure-codeception and allure-phpunit …
okolesnyk Dec 19, 2018
b0f2a13
Merge branch 'develop' into MasterToDevelop-2.3.12
KevinBKozan Jan 22, 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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
Magento Functional Testing Framework Changelog
================================================
2.3.12
-----
### Enhancements
* Fetched latest allure-codeception package

2.3.11
-----
Expand Down
2 changes: 1 addition & 1 deletion bin/mftf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ try {
try {
$application = new Symfony\Component\Console\Application();
$application->setName('Magento Functional Testing Framework CLI');
$application->setVersion('2.3.11');
$application->setVersion('2.3.12');
/** @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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
"name": "magento/magento2-functional-testing-framework",
"description": "Magento2 Functional Testing Framework",
"type": "library",
"version": "2.3.11",
"version": "2.3.12",
"license": "AGPL-3.0",
"keywords": ["magento", "automation", "functional", "testing"],
"config": {
"sort-packages": true
},
"require": {
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0|~7.2.0",
"allure-framework/allure-codeception": "~1.3.0",
"ext-curl": "*",
"allure-framework/allure-codeception": "~1.2.6",
"codeception/codeception": "~2.3.4",
"consolidation/robo": "^1.0.0",
"epfremme/swagger-php": "^2.0",
Expand Down
12 changes: 6 additions & 6 deletions composer.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion etc/config/codeception.dist.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ extensions:
- Magento\FunctionalTestingFramework\Extension\TestContextExtension
- Magento\FunctionalTestingFramework\Allure\Adapter\MagentoAllureAdapter
config:
Yandex\Allure\Adapter\AllureAdapter:
Magento\FunctionalTestingFramework\Allure\Adapter\MagentoAllureAdapter:
deletePreviousResults: true
outputDirectory: allure-results
ignoredAnnotations:
Expand Down
4 changes: 2 additions & 2 deletions src/Magento/FunctionalTestingFramework/Allure/Adapter/MagentoAllureAdapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
namespace Magento\FunctionalTestingFramework\Allure\Adapter;

use Magento\FunctionalTestingFramework\Suite\Handlers\SuiteObjectHandler;
use Yandex\Allure\Adapter\AllureAdapter;
use Yandex\Allure\Codeception\AllureCodeception;
use Yandex\Allure\Adapter\Event\StepStartedEvent;
use Yandex\Allure\Adapter\Event\StepFinishedEvent;
use Yandex\Allure\Adapter\Event\StepFailedEvent;
Expand All @@ -23,7 +23,7 @@
* @package Magento\FunctionalTestingFramework\Allure
*/

class MagentoAllureAdapter extends AllureAdapter
class MagentoAllureAdapter extends AllureCodeception
{
/**
* Array of group values passed to test runner command
Expand Down