Skip to content

Commit c996fb4

Browse files
tomreecetomreece
authored
Merge branch 'develop' into AM/severity-levels
2 parents f958045 + ef5be1d commit c996fb4

38 files changed

+952
-98
lines changed

‎CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,12 @@ Magento Functional Testing Framework Changelog
8888
* [MFTF 3.0.0 RC2](https://www.youtube.com/watch?v=BJOQAw6dX5o)
8989
* [MFTF 3.0.0 RC3](https://www.youtube.com/watch?v=scLb7pi8pR0)
9090

91+
2.6.4
92+
-----
93+
94+
### Fixes
95+
* added dependency to packages MFTF used but never specified in composer.json
96+
9197
2.6.3
9298
-----
9399

‎_config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
theme: jekyll-theme-hacker

‎bin/mftf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ try {
3131
$version = $version['version'];
3232
$application = new Symfony\Component\Console\Application();
3333
$application->setName('Magento Functional Testing Framework CLI');
34-
$application->setVersion('3.0.0');
34+
$application->setVersion($version);
3535
/** @var \Magento\FunctionalTestingFramework\Console\CommandListInterface $commandList */
3636
$commandList = new \Magento\FunctionalTestingFramework\Console\CommandList;
3737
foreach ($commandList->getCommands() as $command) {

‎composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/magento2-functional-testing-framework",
33
"description": "Magento2 Functional Testing Framework",
44
"type": "library",
5-
"version": "3.0.0-RC5",
5+
"version": "3.0.0",
66
"license": "AGPL-3.0",
77
"keywords": ["magento", "automation", "functional", "testing"],
88
"config": {
@@ -30,6 +30,7 @@
3030
"spomky-labs/otphp": "^10.0",
3131
"symfony/console": "^4.4",
3232
"symfony/finder": "^5.0",
33+
"symfony/http-foundation": "^5.0",
3334
"symfony/mime": "^5.0",
3435
"symfony/process": "^4.4",
3536
"vlucas/phpdotenv": "^2.4",

‎composer.lock

Lines changed: 134 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dev/tests/verification/Resources/ActionGroupReturningValueTest.txt

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
<?php
2+
namespace Magento\AcceptanceTest\_default\Backend;
3+
4+
use Magento\FunctionalTestingFramework\AcceptanceTester;
5+
use \Codeception\Util\Locator;
6+
use Yandex\Allure\Adapter\Annotation\Features;
7+
use Yandex\Allure\Adapter\Annotation\Stories;
8+
use Yandex\Allure\Adapter\Annotation\Title;
9+
use Yandex\Allure\Adapter\Annotation\Description;
10+
use Yandex\Allure\Adapter\Annotation\Parameter;
11+
use Yandex\Allure\Adapter\Annotation\Severity;
12+
use Yandex\Allure\Adapter\Model\SeverityLevel;
13+
use Yandex\Allure\Adapter\Annotation\TestCaseId;
14+
15+
/**
16+
* @group functional
17+
* @Description("<h3>Test files</h3>verification/TestModule/Test/ActionGroupFunctionalTest/ActionGroupReturningValueTest.xml<br>")
18+
*/
19+
class ActionGroupReturningValueTestCest
20+
{
21+
/**
22+
* @param AcceptanceTester $I
23+
* @throws \Exception
24+
*/
25+
public function _before(AcceptanceTester $I)
26+
{
27+
$I->createEntity("createPersonParam", "hook", "ReplacementPerson", [], []); // stepKey: createPersonParam
28+
$I->comment("Entering Action Group [beforeGroup] FunctionalActionGroup");
29+
$I->fillField("#foo", "myData1"); // stepKey: fillField1BeforeGroup
30+
$I->fillField("#bar", "myData2"); // stepKey: fillField2BeforeGroup
31+
$I->comment("Exiting Action Group [beforeGroup] FunctionalActionGroup");
32+
}
33+
34+
/**
35+
* @param AcceptanceTester $I
36+
* @throws \Exception
37+
*/
38+
public function _after(AcceptanceTester $I)
39+
{
40+
$I->comment("Entering Action Group [afterGroup] FunctionalActionGroup");
41+
$I->fillField("#foo", "myData1"); // stepKey: fillField1AfterGroup
42+
$I->fillField("#bar", "myData2"); // stepKey: fillField2AfterGroup
43+
$I->comment("Exiting Action Group [afterGroup] FunctionalActionGroup");
44+
}
45+
46+
/**
47+
* @param AcceptanceTester $I
48+
* @throws \Exception
49+
*/
50+
public function _failed(AcceptanceTester $I)
51+
{
52+
$I->saveScreenshot(); // stepKey: saveScreenshot
53+
}
54+
55+
/**
56+
* @Severity(level = SeverityLevel::CRITICAL)
57+
* @Features({"TestModule"})
58+
* @Stories({"MQE-433"})
59+
* @Parameter(name = "AcceptanceTester", value="$I")
60+
* @param AcceptanceTester $I
61+
* @return void
62+
* @throws \Exception
63+
*/
64+
public function ActionGroupReturningValueTest(AcceptanceTester $I)
65+
{
66+
$I->amOnPage("/someUrl"); // stepKey: step1
67+
$I->comment("Entering Action Group [actionGroupWithReturnValue1] FunctionalActionGroupWithReturnValueActionGroup");
68+
$grabTextFrom1ActionGroupWithReturnValue1 = $I->grabTextFrom("#foo"); // stepKey: grabTextFrom1ActionGroupWithReturnValue1
69+
$actionGroupWithReturnValue1 = $I->return($grabTextFrom1ActionGroupWithReturnValue1); // stepKey: returnActionGroupWithReturnValue1
70+
$I->comment("Exiting Action Group [actionGroupWithReturnValue1] FunctionalActionGroupWithReturnValueActionGroup");
71+
$I->comment("Entering Action Group [actionGroupWithStringUsage1] actionGroupWithStringUsage");
72+
$I->see($actionGroupWithReturnValue1, "#element .{$actionGroupWithReturnValue1}"); // stepKey: see1ActionGroupWithStringUsage1
73+
$I->comment("Exiting Action Group [actionGroupWithStringUsage1] actionGroupWithStringUsage");
74+
}
75+
}

‎dev/tests/verification/Resources/ExtendedActionGroupReturningValueTest.txt

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?php
2+
namespace Magento\AcceptanceTest\_default\Backend;
3+
4+
use Magento\FunctionalTestingFramework\AcceptanceTester;
5+
use \Codeception\Util\Locator;
6+
use Yandex\Allure\Adapter\Annotation\Features;
7+
use Yandex\Allure\Adapter\Annotation\Stories;
8+
use Yandex\Allure\Adapter\Annotation\Title;
9+
use Yandex\Allure\Adapter\Annotation\Description;
10+
use Yandex\Allure\Adapter\Annotation\Parameter;
11+
use Yandex\Allure\Adapter\Annotation\Severity;
12+
use Yandex\Allure\Adapter\Model\SeverityLevel;
13+
use Yandex\Allure\Adapter\Annotation\TestCaseId;
14+
15+
/**
16+
* @Title("[NO TESTCASEID]: Extended ActionGroup Returning Value Test")
17+
* @Description("<h3>Test files</h3>verification/TestModule/Test/ActionGroupTest/ExtendedActionGroupReturningValueTest.xml<br>")
18+
*/
19+
class ExtendedActionGroupReturningValueTestCest
20+
{
21+
/**
22+
* @Severity(level = SeverityLevel::CRITICAL)
23+
* @Features({"TestModule"})
24+
* @Parameter(name = "AcceptanceTester", value="$I")
25+
* @param AcceptanceTester $I
26+
* @return void
27+
* @throws \Exception
28+
*/
29+
public function ExtendedActionGroupReturningValueTest(AcceptanceTester $I)
30+
{
31+
$I->comment("Entering Action Group [actionGroupReturningValue] ActionGroupReturningValueActionGroup");
32+
$grabProducts1ActionGroupReturningValue = $I->grabMultiple("selector"); // stepKey: grabProducts1ActionGroupReturningValue
33+
$I->assertCount(99, $grabProducts1ActionGroupReturningValue); // stepKey: assertCountActionGroupReturningValue
34+
$actionGroupReturningValue = $I->return($grabProducts1ActionGroupReturningValue); // stepKey: returnProducts1ActionGroupReturningValue
35+
$I->comment("Exiting Action Group [actionGroupReturningValue] ActionGroupReturningValueActionGroup");
36+
$I->comment("Entering Action Group [actionGroupWithStringUsage1] actionGroupWithStringUsage");
37+
$I->see($actionGroupReturningValue, "#element .{$actionGroupReturningValue}"); // stepKey: see1ActionGroupWithStringUsage1
38+
$I->comment("Exiting Action Group [actionGroupWithStringUsage1] actionGroupWithStringUsage");
39+
}
40+
}

0 commit comments

Comments
 (0)