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

# Conflicts:
#	docs/mftf-tests.md

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

@@ -139,7 +139,6 @@ class BasicFunctionalTestCest
 		$I->moveMouseOver(".functionalTestSelector"); // stepKey: moveMouseOverKey1
 		$I->openNewTab(); // stepKey: openNewTabKey1
 		$I->pauseExecution(); // stepKey: pauseExecutionKey1
-		$I->performOn("#selector", function(\WebDriverElement $el) {return $el->isDisplayed();}, 10); // stepKey: performOnKey1
 		$I->pressKey("#page", "a"); // stepKey: pressKey1
 		$I->pressKey("#page", ['ctrl', 'a'],'new'); // stepKey: pressKey2
 		$I->pressKey("#page", ['shift', '111'],'1','x'); // stepKey: pressKey3

dev/tests/verification/Resources/BasicFunctionalTest.txt

@@ -1,31 +0,0 @@
-<?php
-namespace Magento\AcceptanceTest\_default\Backend;
-
-use Magento\FunctionalTestingFramework\AcceptanceTester;
-use \Codeception\Util\Locator;
-use Yandex\Allure\Adapter\Annotation\Features;
-use Yandex\Allure\Adapter\Annotation\Stories;
-use Yandex\Allure\Adapter\Annotation\Title;
-use Yandex\Allure\Adapter\Annotation\Description;
-use Yandex\Allure\Adapter\Annotation\Parameter;
-use Yandex\Allure\Adapter\Annotation\Severity;
-use Yandex\Allure\Adapter\Model\SeverityLevel;
-use Yandex\Allure\Adapter\Annotation\TestCaseId;
-
-/**
- * @Description("<h3>Test files</h3>verification/TestModule/Test/ExecuteInSeleniumTest.xml<br>")
- */
-class ExecuteInSeleniumTestCest
-{
-	/**
-	 * @Features({"TestModule"})
-	 * @Parameter(name = "AcceptanceTester", value="$I")
-	 * @param AcceptanceTester $I
-	 * @return void
-	 * @throws \Exception
-	 */
-	public function ExecuteInSeleniumTest(AcceptanceTester $I)
-	{
-		$I->executeInSelenium(function ($webdriver) { return "Hello, World!"}); // stepKey: executeInSeleniumStep
-	}
-}

dev/tests/verification/Resources/ExecuteInSeleniumTest.txt

@@ -78,8 +78,6 @@
         <doubleClick selector="1" stepKey="dblclick2"/>
         <dragAndDrop selector1="1" selector2="2" stepKey="dragndrop1"/>
         <dragAndDrop selector1="1" selector2="2" stepKey="dragndrop2"/>
-        <executeInSelenium function="1" stepKey="executeSelenium1"/>
-        <executeInSelenium function="1" stepKey="executeSelenium2"/>
         <executeJS function="1" stepKey="execJS1"/>
         <executeJS function="1" stepKey="execJS2"/>
         <fillField stepKey="fill1"/>
@@ -126,8 +124,6 @@
         <parseFloat stepKey="parsefloat12"/>
         <pauseExecution stepKey="pause1"/>
         <pauseExecution stepKey="pause12"/>
-        <performOn selector="1" function="1" stepKey="performon1"/>
-        <performOn selector="1" function="1" stepKey="performon12"/>
         <pressKey selector="1" stepKey="press1"/>
         <pressKey selector="1" stepKey="press12"/>
         <reloadPage stepKey="reload1"/>

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

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

@@ -89,7 +89,6 @@
         <moveMouseOver selector=".functionalTestSelector" stepKey="moveMouseOverKey1"/>
         <openNewTab stepKey="openNewTabKey1"/>
         <pauseExecution stepKey="pauseExecutionKey1"/>
-        <performOn selector="#selector" function="function(\WebDriverElement $el) {return $el->isDisplayed();}" stepKey="performOnKey1"/>
         <pressKey selector="#page" userInput="a" stepKey="pressKey1"/>
         <pressKey selector="#page" parameterArray="[['ctrl','a'],'new']" stepKey="pressKey2"/>
         <pressKey selector="#page" parameterArray="[['shift','111'],'1','x']" stepKey="pressKey3"/>