Skip to content

Fetched latest Allure Codeception Adapter to resolve conflict with PHPUnit Allure adapter #285

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 2 commits into from
Dec 19, 2018
Merged

Fetched latest Allure Codeception Adapter to resolve conflict with PHPUnit Allure adapter #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 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
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 composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"require": {
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0|~7.2.0",
"allure-framework/allure-codeception": "~1.2.6",
"allure-framework/allure-codeception": "~1.3.0",
"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 @@ -16,7 +16,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 @@ -7,7 +7,7 @@

use Magento\FunctionalTestingFramework\Data\Argument\Interpreter\NullType;
use Magento\FunctionalTestingFramework\Suite\Handlers\SuiteObjectHandler;
use Yandex\Allure\Adapter\AllureAdapter;
use Yandex\Allure\Codeception\AllureCodeception;
use Yandex\Allure\Adapter\Event\StepStartedEvent;
use Codeception\Event\SuiteEvent;
use Codeception\Event\StepEvent;
Expand All @@ -20,7 +20,7 @@
* @package Magento\FunctionalTestingFramework\Allure
*/

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