Merge pull request magento#599 from magento/2.6.1-RC

2.6.1 rc to Master

Author: okolesnyk

Diff for: dev/tests/verification/Resources/BasicFunctionalTest.txt

@@ -15,7 +15,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
 /**
  * @Title("[NO TESTCASEID]: A Functional Cest")
  * @group functional
- * @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>")
+ * @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
 {

Diff for: dev/tests/verification/Resources/ExecuteInSeleniumTest.txt

@@ -13,7 +13,7 @@ use Yandex\Allure\Adapter\Model\SeverityLevel;
 use Yandex\Allure\Adapter\Annotation\TestCaseId;
 
 /**
- * @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>")
+ * @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
 {

Diff for: src/Magento/FunctionalTestingFramework/Util/TestGenerator.php

@@ -1043,7 +1043,7 @@ public function generateStepsPhp($actionObjects, $generationScope = TestGenerato
                     );
                     break;
                 case "executeInSelenium":
-                    $this->deprecationMessages[] = "DEPRECATED ACTION in Test: at step {$stepKey} \"executeInSelenium\""
+                    $this->deprecationMessages[] = "DEPRECATED ACTION in Test: at step {$stepKey} 'executeInSelenium'"
                         . self::MFTF_3_O_0_DEPRECATION_MESSAGE;
                     $testSteps .= $this->wrapFunctionCall($actor, $actionObject, $function);
                     break;
@@ -1056,7 +1056,7 @@ public function generateStepsPhp($actionObjects, $generationScope = TestGenerato
                     );
                     break;
                 case "performOn":
-                    $this->deprecationMessages[] = "DEPRECATED ACTION in Test: at step {$stepKey} \"performOn\""
+                    $this->deprecationMessages[] = "DEPRECATED ACTION in Test: at step {$stepKey} 'performOn'"
                         . self::MFTF_3_O_0_DEPRECATION_MESSAGE;
                     $testSteps .= $this->wrapFunctionCall(
                         $actor,