Merge remote-tracking branch 'origin/develop' into MQE-1963

Author: jilu1

CHANGELOG.md

@@ -1,6 +1,21 @@
 Magento Functional Testing Framework Changelog
 ================================================
 
+2.6.2
+-----
+
+### Fixes
+* Fixed float conversion error in test generation
+
+2.6.1
+-----
+
+* Usability
+    * Introduced new `.env` configuration `ELASTICSEARCH_VERSION` to support multiple elasticsearch versions
+* Maintainability
+    * Added deprecation notices for upcoming MFTF 3.0.0
+* Replaced facebook webdriver with php-webdriver to support PHP version updates
+
 2.6.0
 -----
 

composer.json

@@ -2,7 +2,7 @@
     "name": "magento/magento2-functional-testing-framework",
     "description": "Magento2 Functional Testing Framework",
     "type": "library",
-    "version": "2.6.0",
+    "version": "2.6.2",
     "license": "AGPL-3.0",
     "keywords": ["magento", "automation", "functional", "testing"],
     "config": {
@@ -25,7 +25,8 @@
         "monolog/monolog": "^1.0",
         "mustache/mustache": "~2.5",
         "symfony/process": "^2.8 || ^3.1 || ^4.0",
-        "vlucas/phpdotenv": "^2.4"
+        "vlucas/phpdotenv": "^2.4",
+        "php-webdriver/webdriver": "^1.8.0"
     },
     "require-dev": {
         "squizlabs/php_codesniffer": "~3.2",
@@ -44,6 +45,9 @@
     "suggest": {
         "epfremme/swagger-php": "^2.0"
     },
+    "replace": {
+        "facebook/webdriver": "^1.7.1"
+    },
     "autoload": {
         "files": ["src/Magento/FunctionalTestingFramework/_bootstrap.php"],
         "psr-4": {

composer.lock

@@ -49,6 +49,7 @@ class AssertTestCest
 		$I->assertEmpty([], "pass"); // stepKey: assertEmpty
 		$I->assertEquals($text, "Copyright © 2013-2017 Magento, Inc. All rights reserved.", "pass"); // stepKey: assertEquals1
 		$I->assertEquals("Copyright © 2013-2017 Magento, Inc. All rights reserved.", $text, "pass"); // stepKey: assertEquals2
+		$I->assertEquals(1.5, $text, "pass"); // stepKey: assertFloatTypeIsCorrect
 		$I->assertFalse(false, "pass"); // stepKey: assertFalse1
 		$I->assertFileNotExists("/out.txt", "pass"); // stepKey: assertFileNotExists1
 		$I->assertFileNotExists($text, "pass"); // stepKey: assertFileNotExists2

dev/tests/verification/Resources/AssertTest.txt

@@ -15,7 +15,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
 /**
  * @Title("[NO TESTCASEID]: A Functional Cest")
  * @group functional
- * @Description("<h3>Test files</h3>verification/TestModule/Test/BasicFunctionalTest.xml<br>")
+ * @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>")
  */
 class BasicFunctionalTestCest
 {

dev/tests/verification/Resources/BasicFunctionalTest.txt

@@ -13,7 +13,7 @@ use Yandex\Allure\Adapter\Model\SeverityLevel;
 use Yandex\Allure\Adapter\Annotation\TestCaseId;
 
 /**
- * @Description("<h3>Test files</h3>verification/TestModule/Test/ExecuteInSeleniumTest.xml<br>")
+ * @Description("<h3 class='y-label y-label_status_broken'>Deprecated Notice(s):</h3><ul><li>DEPRECATED ACTION in Test: at step executeInSeleniumStep 'executeInSelenium' is DEPRECATED and will be removed in MFTF 3.0.0.</li></ul><h3>Test files</h3>verification/TestModule/Test/ExecuteInSeleniumTest.xml<br>")
  */
 class ExecuteInSeleniumTestCest
 {

dev/tests/verification/Resources/ExecuteInSeleniumTest.txt

@@ -54,6 +54,10 @@
             <expectedResult type="string">Copyright © 2013-2017 Magento, Inc. All rights reserved.</expectedResult>
             <actualResult type="variable">text</actualResult>
         </assertEquals>
+        <assertEquals stepKey="assertFloatTypeIsCorrect" message="pass">
+            <expectedResult type="float">1.5</expectedResult>
+            <actualResult type="variable">text</actualResult>
+        </assertEquals>
         <assertFalse stepKey="assertFalse1" message="pass">
             <actualResult type="bool">0</actualResult>
         </assertFalse>

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

@@ -22,13 +22,13 @@ This step can be referenced within the test using `conditionalClickStep1`.
 
 The value format should met the following principles:
 
-* Must be unique within [`<test>`](../test.md#test-tag).
-* Naming should be as descriptive as possible:
-  * Describe the action performed.
-  * Briefly describe the purpose.
-  * Describe which data is in use.
-* Should be in camelCase with lowercase first letter.
-* Should be the last attribute of an element.
+*  Must be unique within [`<test>`](../test.md#test-tag).
+*  Naming should be as descriptive as possible:
+   *  Describe the action performed.
+   *  Briefly describe the purpose.
+   *  Describe which data is in use.
+*  Should be in camelCase with lowercase first letter.
+*  Should be the last attribute of an element.
 
 ### `before` and `after`
 
@@ -142,25 +142,25 @@ Here, [`<click>`](#click) performs a click on a button that can be found by the
 
 The following test actions return a variable:
 
-* [grabAttributeFrom](#grabattributefrom)
-* [grabCookie](#grabcookie)
-* [grabFromCurrentUrl](#grabfromcurrenturl)
-* [grabMultiple](#grabmultiple)
-* [grabPageSource](#grabpagesource)
-* [grabTextFrom](#grabtextfrom)
-* [grabValueFrom](#grabvaluefrom)
-* [executeJS](#executejs)
+*  [grabAttributeFrom](#grabattributefrom)
+*  [grabCookie](#grabcookie)
+*  [grabFromCurrentUrl](#grabfromcurrenturl)
+*  [grabMultiple](#grabmultiple)
+*  [grabPageSource](#grabpagesource)
+*  [grabTextFrom](#grabtextfrom)
+*  [grabValueFrom](#grabvaluefrom)
+*  [executeJS](#executejs)
 
 Learn more in [Using data returned by test actions](../data.md#use-data-returned-by-test-actions).
 
 ## Actions handling data entities
 
 The following test actions handle data entities using [metadata](../metadata.md):
 
-* [createData](#createdata)
-* [deleteData](#deletedata)
-* [updateData](#updatedata)
-* [getData](#getdata)
+*  [createData](#createdata)
+*  [deleteData](#deletedata)
+*  [updateData](#updatedata)
+*  [getData](#getdata)
 
 Learn more in [Handling a REST API response](../metadata.md#rest-response).
 
@@ -973,6 +973,8 @@ Attribute|Type|Use|Description
 
 ### executeInSelenium
 
+#### NOTE: `executeInSelenium` action is DEPRECATED and will be removed in MFTF 3.0.0.
+
 See [executeInSelenium docs on codeception.com](http://codeception.com/docs/modules/WebDriver#executeInSelenium).
 
 Attribute|Type|Use|Description
@@ -1287,7 +1289,6 @@ Attribute|Type|Use|Description
 `before`|string|optional| `stepKey` of action that must be executed next.
 `after`|string|optional| `stepKey` of preceding action.
 
-
 #### Example
 ```xml
 <magentoCron stepKey="runStagingCronJobs" groups="staging"/>
@@ -1460,6 +1461,8 @@ Attribute|Type|Use|Description
 
 ### performOn
 
+#### NOTE: `performOn` action is DEPRECATED and will be removed in MFTF 3.0.0.
+
 See [performOn docs on codeception.com](http://codeception.com/docs/modules/WebDriver#performOn).
 
 Attribute|Type|Use|Description
@@ -1974,13 +1977,13 @@ Attribute|Type|Use|Description
 #### Examples
 
 ```xml
-<!-- Verify there are 10 `<div id="product" ... >...</div>` elements on the page. -->
+<!-- Verify there are 10 `<div class="product" ... >...</div>` elements on the page. -->
 <seeNumberOfElements userInput="10" selector="div.product" stepKey="seeTenProducts"/>
 ```
 
 ```xml
-<!-- Verify there are between 5 and 10 `<div id="product" ... >...</div>` elements on the page. -->
-<seeNumberOfElements userInput="[5, 10]" selector=".product" stepKey="seeFiveToTenProducts"/>
+<!-- Verify there are between 5 and 10 `<div class="product" ... >...</div>` elements on the page. -->
+<seeNumberOfElements parameterArray="[5, 10]" selector="div.product" stepKey="seeFiveToTenProducts"/>
 ```
 
 ### seeOptionIsSelected

docs/actiongroup-list.md

@@ -63,4 +63,6 @@ MODULE_WHITELIST=Magento_Framework,ConfigurableProductWishlist,ConfigurableProdu
 #ENABLE_BROWSER_LOG=true
 #BROWSER_LOG_BLACKLIST=other
 
+#*** Elastic Search version used for test ***#
+ELASTICSEARCH_VERSION=7
 #*** End of .env ***#