Skip to content

Commit d505966

Browse files
soumyausoumyau
committed
MQE-1961: Remove deprecated actions
resolved conflicts with develop
2 parents 5c3ef36 + b68484f commit d505966

18 files changed

+196
-125
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
1515
/**
1616
* @Title("[NO TESTCASEID]: A Functional Cest")
1717
* @group functional
18-
* @Description("<h3>Test files</h3>verification/TestModule/Test/BasicFunctionalTest.xml<br>")
18+
* @Description("<h3 class='y-label y-label_status_broken'>Deprecated Notice(s):</h3><ul><li>DEPRECATED ACTION in Test: at step performOnKey1 'performOn' is DEPRECATED and will be removed in MFTF 3.0.0.</li></ul><h3>Test files</h3>verification/TestModule/Test/BasicFunctionalTest.xml<br>")
1919
*/
2020
class BasicFunctionalTestCest
2121
{

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

Whitespace-only changes.

‎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>

‎docs/actiongroup-list.md

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

‎docs/mftf-tests.md

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

‎docs/test/actions.md

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ This step can be referenced within the test using `conditionalClickStep1`.
2222

2323
The value format should met the following principles:
2424

25-
* Must be unique within [`<test>`](../test.md#test-tag).
26-
* Naming should be as descriptive as possible:
27-
* Describe the action performed.
28-
* Briefly describe the purpose.
29-
* Describe which data is in use.
30-
* Should be in camelCase with lowercase first letter.
31-
* Should be the last attribute of an element.
25+
* Must be unique within [`<test>`](../test.md#test-tag).
26+
* Naming should be as descriptive as possible:
27+
* Describe the action performed.
28+
* Briefly describe the purpose.
29+
* Describe which data is in use.
30+
* Should be in camelCase with lowercase first letter.
31+
* Should be the last attribute of an element.
3232

3333
### `before` and `after`
3434

@@ -142,25 +142,25 @@ Here, [`<click>`](#click) performs a click on a button that can be found by the
142142

143143
The following test actions return a variable:
144144

145-
* [grabAttributeFrom](#grabattributefrom)
146-
* [grabCookie](#grabcookie)
147-
* [grabFromCurrentUrl](#grabfromcurrenturl)
148-
* [grabMultiple](#grabmultiple)
149-
* [grabPageSource](#grabpagesource)
150-
* [grabTextFrom](#grabtextfrom)
151-
* [grabValueFrom](#grabvaluefrom)
152-
* [executeJS](#executejs)
145+
* [grabAttributeFrom](#grabattributefrom)
146+
* [grabCookie](#grabcookie)
147+
* [grabFromCurrentUrl](#grabfromcurrenturl)
148+
* [grabMultiple](#grabmultiple)
149+
* [grabPageSource](#grabpagesource)
150+
* [grabTextFrom](#grabtextfrom)
151+
* [grabValueFrom](#grabvaluefrom)
152+
* [executeJS](#executejs)
153153

154154
Learn more in [Using data returned by test actions](../data.md#use-data-returned-by-test-actions).
155155

156156
## Actions handling data entities
157157

158158
The following test actions handle data entities using [metadata](../metadata.md):
159159

160-
* [createData](#createdata)
161-
* [deleteData](#deletedata)
162-
* [updateData](#updatedata)
163-
* [getData](#getdata)
160+
* [createData](#createdata)
161+
* [deleteData](#deletedata)
162+
* [updateData](#updatedata)
163+
* [getData](#getdata)
164164

165165
Learn more in [Handling a REST API response](../metadata.md#rest-response).
166166

@@ -1269,7 +1269,6 @@ Attribute|Type|Use|Description
12691269
`before`|string|optional| `stepKey` of action that must be executed next.
12701270
`after`|string|optional| `stepKey` of preceding action.
12711271

1272-
12731272
#### Example
12741273
```xml
12751274
<magentoCron stepKey="runStagingCronJobs" groups="staging"/>
@@ -1944,13 +1943,13 @@ Attribute|Type|Use|Description
19441943
#### Examples
19451944

19461945
```xml
1947-
<!-- Verify there are 10 `<div id="product" ... >...</div>` elements on the page. -->
1946+
<!-- Verify there are 10 `<div class="product" ... >...</div>` elements on the page. -->
19481947
<seeNumberOfElements userInput="10" selector="div.product" stepKey="seeTenProducts"/>
19491948
```
19501949

19511950
```xml
1952-
<!-- Verify there are between 5 and 10 `<div id="product" ... >...</div>` elements on the page. -->
1953-
<seeNumberOfElements userInput="[5, 10]" selector=".product" stepKey="seeFiveToTenProducts"/>
1951+
<!-- Verify there are between 5 and 10 `<div class="product" ... >...</div>` elements on the page. -->
1952+
<seeNumberOfElements parameterArray="[5, 10]" selector="div.product" stepKey="seeFiveToTenProducts"/>
19541953
```
19551954

19561955
### seeOptionIsSelected

‎etc/config/.env.example

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,6 @@ MODULE_WHITELIST=Magento_Framework,ConfigurableProductWishlist,ConfigurableProdu
6363
#ENABLE_BROWSER_LOG=true
6464
#BROWSER_LOG_BLACKLIST=other
6565

66+
#*** Elastic Search version used for test ***#
67+
ELASTICSEARCH_VERSION=7
6668
#*** End of .env ***#

0 commit comments

Comments
 (0)