Skip to content

Commit 4e01490

Browse files
jilu1jilu1
committed
Merge remote-tracking branch 'origin/develop' into MQE-1963
2 parents e32eac1 + 76693d9 commit 4e01490

21 files changed

+160
-280
lines changed

‎CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
11
Magento Functional Testing Framework Changelog
22
================================================
33

4+
2.6.2
5+
-----
6+
7+
### Fixes
8+
* Fixed float conversion error in test generation
9+
10+
2.6.1
11+
-----
12+
13+
* Usability
14+
* Introduced new `.env` configuration `ELASTICSEARCH_VERSION` to support multiple elasticsearch versions
15+
* Maintainability
16+
* Added deprecation notices for upcoming MFTF 3.0.0
17+
* Replaced facebook webdriver with php-webdriver to support PHP version updates
18+
419
2.6.0
520
-----
621

‎composer.json

Lines changed: 6 additions & 2 deletions
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": "2.6.0",
5+
"version": "2.6.2",
66
"license": "AGPL-3.0",
77
"keywords": ["magento", "automation", "functional", "testing"],
88
"config": {
@@ -25,7 +25,8 @@
2525
"monolog/monolog": "^1.0",
2626
"mustache/mustache": "~2.5",
2727
"symfony/process": "^2.8 || ^3.1 || ^4.0",
28-
"vlucas/phpdotenv": "^2.4"
28+
"vlucas/phpdotenv": "^2.4",
29+
"php-webdriver/webdriver": "^1.8.0"
2930
},
3031
"require-dev": {
3132
"squizlabs/php_codesniffer": "~3.2",
@@ -44,6 +45,9 @@
4445
"suggest": {
4546
"epfremme/swagger-php": "^2.0"
4647
},
48+
"replace": {
49+
"facebook/webdriver": "^1.7.1"
50+
},
4751
"autoload": {
4852
"files": ["src/Magento/FunctionalTestingFramework/_bootstrap.php"],
4953
"psr-4": {

‎composer.lock

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

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class AssertTestCest
4949
$I->assertEmpty([], "pass"); // stepKey: assertEmpty
5050
$I->assertEquals($text, "Copyright © 2013-2017 Magento, Inc. All rights reserved.", "pass"); // stepKey: assertEquals1
5151
$I->assertEquals("Copyright © 2013-2017 Magento, Inc. All rights reserved.", $text, "pass"); // stepKey: assertEquals2
52+
$I->assertEquals(1.5, $text, "pass"); // stepKey: assertFloatTypeIsCorrect
5253
$I->assertFalse(false, "pass"); // stepKey: assertFalse1
5354
$I->assertFileNotExists("/out.txt", "pass"); // stepKey: assertFileNotExists1
5455
$I->assertFileNotExists($text, "pass"); // stepKey: assertFileNotExists2

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@ class BasicFunctionalTestCest
139139
$I->moveMouseOver(".functionalTestSelector"); // stepKey: moveMouseOverKey1
140140
$I->openNewTab(); // stepKey: openNewTabKey1
141141
$I->pauseExecution(); // stepKey: pauseExecutionKey1
142-
$I->performOn("#selector", function(\WebDriverElement $el) {return $el->isDisplayed();}, 10); // stepKey: performOnKey1
143142
$I->pressKey("#page", "a"); // stepKey: pressKey1
144143
$I->pressKey("#page", ['ctrl', 'a'],'new'); // stepKey: pressKey2
145144
$I->pressKey("#page", ['shift', '111'],'1','x'); // stepKey: pressKey3

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

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +0,0 @@
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-
* @Description("<h3>Test files</h3>verification/TestModule/Test/ExecuteInSeleniumTest.xml<br>")
17-
*/
18-
class ExecuteInSeleniumTestCest
19-
{
20-
/**
21-
* @Features({"TestModule"})
22-
* @Parameter(name = "AcceptanceTester", value="$I")
23-
* @param AcceptanceTester $I
24-
* @return void
25-
* @throws \Exception
26-
*/
27-
public function ExecuteInSeleniumTest(AcceptanceTester $I)
28-
{
29-
$I->executeInSelenium(function ($webdriver) { return "Hello, World!"}); // stepKey: executeInSeleniumStep
30-
}
31-
}

‎dev/tests/verification/TestModule/ActionGroup/XmlDuplicateActionGroup.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@
7878
<doubleClick selector="1" stepKey="dblclick2"/>
7979
<dragAndDrop selector1="1" selector2="2" stepKey="dragndrop1"/>
8080
<dragAndDrop selector1="1" selector2="2" stepKey="dragndrop2"/>
81-
<executeInSelenium function="1" stepKey="executeSelenium1"/>
82-
<executeInSelenium function="1" stepKey="executeSelenium2"/>
8381
<executeJS function="1" stepKey="execJS1"/>
8482
<executeJS function="1" stepKey="execJS2"/>
8583
<fillField stepKey="fill1"/>
@@ -126,8 +124,6 @@
126124
<parseFloat stepKey="parsefloat12"/>
127125
<pauseExecution stepKey="pause1"/>
128126
<pauseExecution stepKey="pause12"/>
129-
<performOn selector="1" function="1" stepKey="performon1"/>
130-
<performOn selector="1" function="1" stepKey="performon12"/>
131127
<pressKey selector="1" stepKey="press1"/>
132128
<pressKey selector="1" stepKey="press12"/>
133129
<reloadPage stepKey="reload1"/>

‎dev/tests/verification/TestModule/Test/AssertTest.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@
5454
<expectedResult type="string">Copyright © 2013-2017 Magento, Inc. All rights reserved.</expectedResult>
5555
<actualResult type="variable">text</actualResult>
5656
</assertEquals>
57+
<assertEquals stepKey="assertFloatTypeIsCorrect" message="pass">
58+
<expectedResult type="float">1.5</expectedResult>
59+
<actualResult type="variable">text</actualResult>
60+
</assertEquals>
5761
<assertFalse stepKey="assertFalse1" message="pass">
5862
<actualResult type="bool">0</actualResult>
5963
</assertFalse>

‎dev/tests/verification/TestModule/Test/BasicFunctionalTest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@
8989
<moveMouseOver selector=".functionalTestSelector" stepKey="moveMouseOverKey1"/>
9090
<openNewTab stepKey="openNewTabKey1"/>
9191
<pauseExecution stepKey="pauseExecutionKey1"/>
92-
<performOn selector="#selector" function="function(\WebDriverElement $el) {return $el->isDisplayed();}" stepKey="performOnKey1"/>
9392
<pressKey selector="#page" userInput="a" stepKey="pressKey1"/>
9493
<pressKey selector="#page" parameterArray="[['ctrl','a'],'new']" stepKey="pressKey2"/>
9594
<pressKey selector="#page" parameterArray="[['shift','111'],'1','x']" stepKey="pressKey3"/>

‎dev/tests/verification/TestModule/Test/ExecuteInSeleniumTest.xml

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎dev/tests/verification/TestModule/Test/XmlDuplicateTest.xml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,6 @@
8282
<doubleClick selector="1" stepKey="dblclick2"/>
8383
<dragAndDrop selector1="1" selector2="2" stepKey="dragndrop1"/>
8484
<dragAndDrop selector1="1" selector2="2" stepKey="dragndrop2"/>
85-
<executeInSelenium function="1" stepKey="executeSelenium1"/>
86-
<executeInSelenium function="1" stepKey="executeSelenium2"/>
8785
<executeJS function="1" stepKey="execJS1"/>
8886
<executeJS function="1" stepKey="execJS2"/>
8987
<fillField stepKey="fill1"/>
@@ -130,8 +128,6 @@
130128
<parseFloat stepKey="parsefloat12"/>
131129
<pauseExecution stepKey="pause1"/>
132130
<pauseExecution stepKey="pause12"/>
133-
<performOn selector="1" function="1" stepKey="performon1"/>
134-
<performOn selector="1" function="1" stepKey="performon12"/>
135131
<pressKey selector="1" stepKey="press1"/>
136132
<pressKey selector="1" stepKey="press12"/>
137133
<reloadPage stepKey="reload1"/>
@@ -298,8 +294,6 @@
298294
<doubleClick selector="1" stepKey="dblclick2"/>
299295
<dragAndDrop selector1="1" selector2="2" stepKey="dragndrop1"/>
300296
<dragAndDrop selector1="1" selector2="2" stepKey="dragndrop2"/>
301-
<executeInSelenium function="1" stepKey="executeSelenium1"/>
302-
<executeInSelenium function="1" stepKey="executeSelenium2"/>
303297
<executeJS function="1" stepKey="execJS1"/>
304298
<executeJS function="1" stepKey="execJS2"/>
305299
<fillField stepKey="fill1"/>
@@ -346,8 +340,6 @@
346340
<parseFloat stepKey="parsefloat12"/>
347341
<pauseExecution stepKey="pause1"/>
348342
<pauseExecution stepKey="pause12"/>
349-
<performOn selector="1" function="1" stepKey="performon1"/>
350-
<performOn selector="1" function="1" stepKey="performon12"/>
351343
<pressKey selector="1" stepKey="press1"/>
352344
<pressKey selector="1" stepKey="press12"/>
353345
<reloadPage stepKey="reload1"/>
@@ -513,8 +505,6 @@
513505
<doubleClick selector="1" stepKey="dblclick2"/>
514506
<dragAndDrop selector1="1" selector2="2" stepKey="dragndrop1"/>
515507
<dragAndDrop selector1="1" selector2="2" stepKey="dragndrop2"/>
516-
<executeInSelenium function="1" stepKey="executeSelenium1"/>
517-
<executeInSelenium function="1" stepKey="executeSelenium2"/>
518508
<executeJS function="1" stepKey="execJS1"/>
519509
<executeJS function="1" stepKey="execJS2"/>
520510
<fillField stepKey="fill1"/>
@@ -561,8 +551,6 @@
561551
<parseFloat stepKey="parsefloat12"/>
562552
<pauseExecution stepKey="pause1"/>
563553
<pauseExecution stepKey="pause12"/>
564-
<performOn selector="1" function="1" stepKey="performon1"/>
565-
<performOn selector="1" function="1" stepKey="performon12"/>
566554
<pressKey selector="1" stepKey="press1"/>
567555
<pressKey selector="1" stepKey="press12"/>
568556
<reloadPage stepKey="reload1"/>

‎dev/tests/verification/Tests/ExecuteInSeleniumTest.php

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎docs/actiongroup-list.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)