Skip to content

MFTF 2.4.2 - Merge develop to master #376

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 48 commits into from
Jun 28, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
6363af9
MQE-1580: Remove the "page" attribute from the Action Group annotatio…
ivy00johns May 31, 2019
6a528c5
MQE-1580: Remove the "page" attribute from the Action Group annotatio…
ivy00johns Jun 3, 2019
9bdfa62
MQE-1580: Remove the "page" attribute from the Action Group annotatio…
ivy00johns Jun 4, 2019
d3556ac
MQE-1580: Remove the "page" attribute from the Action Group annotatio…
ivy00johns Jun 5, 2019
0d0f789
MQE-1580: Remove the "page" attribute from the Action Group annotatio…
ivy00johns Jun 5, 2019
c5b651b
MQE-659: [ALLURE] Include the test "stepKey" in the MFTF Allure Report
okolesnyk Jun 5, 2019
eb87ccf
MQE-659: [ALLURE] Include the test "stepKey" in the MFTF Allure Report
okolesnyk Jun 5, 2019
8aee6af
MQE-659: [ALLURE] Include the test "stepKey" in the MFTF Allure Report
okolesnyk Jun 6, 2019
ff12364
MQE-1580: Remove the "page" attribute from the Action Group annotatio…
ivy00johns Jun 6, 2019
17b8b9d
MQE-659: [ALLURE] Include the test "stepKey" in the MFTF Allure Report
okolesnyk Jun 6, 2019
29e2477
MQE-1580: Remove the "page" attribute from the Action Group annotatio…
ivy00johns Jun 6, 2019
9c7bf5f
MQE-1234: Allow XML Parser to read XML comment into comment action
okolesnyk Jun 7, 2019
4074560
MQE-659: [ALLURE] Include the test "stepKey" in the MFTF Allure Report
okolesnyk Jun 7, 2019
5a52151
Merge branch 'MQE-659-alex-edition' of github.com:magento/magento2-fu…
okolesnyk Jun 7, 2019
9e19969
MQE-659: [ALLURE] Include the test "stepKey" in the MFTF Allure Report
okolesnyk Jun 7, 2019
45ceeda
Merge branch 'MQE-659-alex-edition' of github.com:magento/magento2-fu…
okolesnyk Jun 7, 2019
b8f7667
MQE-1234: Allow XML Parser to read XML comment into comment action
okolesnyk Jun 7, 2019
839c742
Merge branch 'develop' into MQE-1234-alex-edition
okolesnyk Jun 7, 2019
ccb68aa
Merge branch 'develop' into MQE-1580
ivy00johns Jun 10, 2019
11ad7df
MQE-1580: Remove the "page" attribute from the Action Group annotatio…
ivy00johns Jun 10, 2019
96210c9
MQE-1580: Remove the "page" attribute from the Action Group annotatio…
ivy00johns Jun 10, 2019
aa45620
MQE-1580: Remove the "page" attribute from the Action Group annotatio…
ivy00johns Jun 10, 2019
4dadaf7
MQE-1580: Remove the "page" attribute from the Action Group annotatio…
ivy00johns Jun 10, 2019
9e44d05
MQE-1234: Allow XML Parser to read XML comment into comment action
okolesnyk Jun 10, 2019
20ae1d7
Merge branch 'MQE-1234-alex-edition' of github.com:magento/magento2-f…
okolesnyk Jun 10, 2019
f6eb3ab
MQE-1234: Allow XML Parser to read XML comment into comment action
KevinBKozan Jun 11, 2019
d43aad5
Merge branch 'develop' of github.com:magento/magento2-functional-test…
Jun 11, 2019
b7d2830
Updated Selenium version number.
Jun 11, 2019
4c0c7df
Fixed spelling error.
dobooth Jun 11, 2019
e397e0f
MQE-1427: Support _CREDS in <magentoCLI> action and in Data
ivy00johns Jun 12, 2019
b90e9e2
MQE-1580: Remove the "page" attribute from the Action Group annotatio…
ivy00johns Jun 12, 2019
f5f2e68
Merge remote-tracking branch 'origin/MQE-1580' into MQE-1580
ivy00johns Jun 12, 2019
fcecdd4
MQE-1580: Remove the "page" attribute from the Action Group annotatio…
ivy00johns Jun 12, 2019
daf51e0
MQE-1234: Allow XML Parser to read XML comment into comment action
okolesnyk Jun 12, 2019
c116bdb
Merge branch 'develop' into MQE-1234-alex-edition
KevinBKozan Jun 13, 2019
46d0de1
Merge pull request #360 from magento/MQE-1580
soumyau Jun 13, 2019
ced1533
Merge branch 'develop' into MQE-1234-alex-edition
KevinBKozan Jun 14, 2019
dad12a6
Merge branch 'develop' into dobooth-patch-1
tomreece Jun 14, 2019
3a77cc5
Merge pull request #367 from magento/dobooth-patch-1
tomreece Jun 14, 2019
dd47be6
Merge branch 'develop' into db_selenium_version
tomreece Jun 14, 2019
bafc0c9
Merge branch 'develop' into MQE-1234-alex-edition
KevinBKozan Jun 17, 2019
1dd7cd2
Merge pull request #362 from magento/MQE-1234-alex-edition
KevinBKozan Jun 18, 2019
e4448fd
Merge branch 'develop' into db_selenium_version
tomreece Jun 18, 2019
2a0b811
Merge pull request #366 from magento-devdocs/db_selenium_version
tomreece Jun 18, 2019
94d0c15
MQE-1597: MFTF 2.4.0 and above has incompatible dependencies with msp…
soumyau Jun 24, 2019
2a723c0
Merge pull request #372 from magento/MQE-1597
soumyau Jun 26, 2019
7818b9c
MQE-1613: Add release to CHANGELOG.MD
KevinBKozan Jun 27, 2019
4d55d3f
Merge pull request #375 from magento/MQE-1613
KevinBKozan Jun 27, 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
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
Magento Functional Testing Framework Changelog
================================================

2.4.2
-----
* Traceability
* Test action `stepKey`s are now included in both console output and Allure report.
* XML Comments are now automatically converted into a `<comment>` action.

### Fixes
* Moved `epfremme/swagger-php` dependency to `suggests` block due to a conflict with Magento extensions.

2.4.1
-----
* Traceability
Expand Down
2 changes: 1 addition & 1 deletion bin/mftf
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.4.1');
$application->setVersion('2.4.2');
/** @var \Magento\FunctionalTestingFramework\Console\CommandListInterface $commandList */
$commandList = new \Magento\FunctionalTestingFramework\Console\CommandList;
foreach ($commandList->getCommands() as $command) {
Expand Down
6 changes: 4 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.4.1",
"version": "2.4.2",
"license": "AGPL-3.0",
"keywords": ["magento", "automation", "functional", "testing"],
"config": {
Expand All @@ -14,7 +14,6 @@
"ext-curl": "*",
"codeception/codeception": "~2.3.4 || ~2.4.0 ",
"consolidation/robo": "^1.0.0",
"epfremme/swagger-php": "^2.0",
"flow/jsonpath": ">0.2",
"fzaninotto/faker": "^1.6",
"monolog/monolog": "^1.0",
Expand All @@ -36,6 +35,9 @@
"php-coveralls/php-coveralls": "^1.0",
"symfony/stopwatch": "~3.4.6"
},
"suggest": {
"epfremme/swagger-php": "^2.0"
},
"autoload": {
"files": ["src/Magento/FunctionalTestingFramework/_bootstrap.php"],
"psr-4": {
Expand Down
175 changes: 34 additions & 141 deletions composer.lock

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

Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../../../../../../../src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
<page name="MFTFDocPage" url="guides/v2.2/magento-functional-testing-framework/release-2/introduction.html" area="storefront" module="MFTF_DevDocs">
<page name="MFTFDocPage" url="mftf/docs/introduction.html" area="storefront" module="MFTF_DevDocs">
<section name="contentSection" />
</page>
</pages>
2 changes: 2 additions & 0 deletions dev/tests/functional/tests/MFTF/DevDocs/Test/DevDocsTest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
xsi:noNamespaceSchemaLocation="../../../../../../../src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
<test name="DevDocsTest">
<annotations>
<!-- Comment in Annotations for DevDocs Test are not affecting test generation -->
<features value="DevDocs available"/>
<stories value="MFTF DevDocs available"/>
<title value="Magento Functional Testing Framework Documentation is available."/>
Expand All @@ -18,6 +19,7 @@
<group value="mftf"/>
</annotations>

<!-- Open MFTF DevDocs Page -->
<amOnPage stepKey="openMFTFDevDocPage" url="{{MFTFDocPage.url}}" />
<see stepKey="verifyPageIntroText" selector="{{contentSection.pageIntro}}" userInput="Introduction to the Magento Functional Testing Framework" />
</test>
Expand Down
Loading