Merge branch 'develop' into db_mftf_testlist_md

Author: dobooth

CHANGELOG.md

@@ -1,6 +1,22 @@
 Magento Functional Testing Framework Changelog
 ================================================
 
+2.4.3
+-----
+* Customizability
+    * Use of `_CREDS` has been extended to `<magentoCLI>` and `<createData>` actions
+* Traceability
+    * A Test step is now generated and injected in the allure report when a test is reported as `BROKEN`. 
+
+### Fixes
+* `static-checks` command now properly returns `1` if any static check failed.
+* MFTF Console Printer class correctly utilizes `--steps` and other flags passed directly to `codecept commands`.
+* `*source` actions correctly print when using `userInput` or `html` attributes.
+* XML Comments should no longer throw an error in parsing when used outside `test/actionGroup`
+
+### GitHub Issues/Pull requests:
+* [#703](https://github.com/magento/magento2-functional-testing-framework/pull/403) -- SMALL_CHANGE: Minor change suggested
+
 2.4.2
 -----
 * Traceability

bin/mftf

@@ -29,7 +29,7 @@ try {
 try {
     $application = new Symfony\Component\Console\Application();
     $application->setName('Magento Functional Testing Framework CLI');
-    $application->setVersion('2.4.2');
+    $application->setVersion('2.4.3');
     /** @var \Magento\FunctionalTestingFramework\Console\CommandListInterface $commandList */
     $commandList = new \Magento\FunctionalTestingFramework\Console\CommandList;
     foreach ($commandList->getCommands() as $command) {

composer.json

@@ -2,7 +2,7 @@
     "name": "magento/magento2-functional-testing-framework",
     "description": "Magento2 Functional Testing Framework",
     "type": "library",
-    "version": "2.4.2",
+    "version": "2.4.3",
     "license": "AGPL-3.0",
     "keywords": ["magento", "automation", "functional", "testing"],
     "config": {

composer.lock

@@ -94,6 +94,10 @@ class BasicFunctionalTestCest
 		$I->dontSeeInField(".functionalTestSelector"); // stepKey: dontSeeInFieldKey1
 		$I->dontSeeInPageSource("Cosmo Kramer"); // stepKey: dontSeeInPageSourceKey1
 		$I->dontSeeInPageSource("<p>Jerry Seinfeld</p>"); // stepKey: dontSeeInPageSourceKey2
+		$I->dontSeeInPageSource("Cosmo Kramer"); // stepKey: dontSeeInPageSourceKey3
+		$I->dontSeeInPageSource("<p>Jerry Seinfeld</p>"); // stepKey: dontSeeInPageSourceKey4
+		$I->dontSeeInPageSource("foo"); // stepKey: dontSeeInPageSourceKey5
+		$I->dontSeeInPageSource("<p>foo</p>"); // stepKey: dontSeeInPageSourceKey6
 		$I->dontSeeInSource("Cosmo Kramer"); // stepKey: dontSeeInSourceKey1
 		$I->dontSeeInSource("<p>Jerry Seinfeld</p>"); // stepKey: dontSeeInSourceKey2
 		$I->dontSeeInTitle("someInput"); // stepKey: dontSeeInTitleKey1

dev/tests/verification/Resources/BasicFunctionalTest.txt

@@ -52,6 +52,10 @@
         <dontSeeInField selector=".functionalTestSelector" stepKey="dontSeeInFieldKey1" />
         <dontSeeInPageSource html="Cosmo Kramer" stepKey="dontSeeInPageSourceKey1"/>
         <dontSeeInPageSource html="&#60;p&#62;Jerry Seinfeld&#60;&#47;p&#62;" stepKey="dontSeeInPageSourceKey2"/>
+        <dontSeeInPageSource userInput="Cosmo Kramer" stepKey="dontSeeInPageSourceKey3"/>
+        <dontSeeInPageSource userInput="&#60;p&#62;Jerry Seinfeld&#60;&#47;p&#62;" stepKey="dontSeeInPageSourceKey4"/>
+        <dontSeeInPageSource userInput="bar" html="foo" stepKey="dontSeeInPageSourceKey5"/>
+        <dontSeeInPageSource userInput="&#60;p&#62;bar&#60;&#47;p&#62;" html="&#60;p&#62;foo&#60;&#47;p&#62;" stepKey="dontSeeInPageSourceKey6"/>
         <dontSeeInSource html="Cosmo Kramer" stepKey="dontSeeInSourceKey1"/>
         <dontSeeInSource html="&#60;p&#62;Jerry Seinfeld&#60;&#47;p&#62;" stepKey="dontSeeInSourceKey2"/>
         <dontSeeInTitle userInput="someInput" stepKey="dontSeeInTitleKey1"/>

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

@@ -11,9 +11,9 @@
     $magentoObjectManager = $magentoObjectManagerFactory->create($_SERVER);
     $tokenModel = $magentoObjectManager->get(\Magento\Integration\Model\Oauth\Token::class);
 
-    $tokenPassedIn = urldecode($_POST['token'] ?? "");
-    $command = urldecode($_POST['command'] ?? "");
-    $arguments = urldecode($_POST['arguments'] ?? "");
+    $tokenPassedIn = urldecode($_POST['token']);
+    $command = urldecode($_POST['command']);
+    $arguments = urldecode($_POST['arguments']);
 
     // Token returned will be null if the token we passed in is invalid
     $tokenFromMagento = $tokenModel->loadByToken($tokenPassedIn)->getToken();
@@ -22,12 +22,7 @@
         $magentoBinary = $php . ' -f ../../../../bin/magento';
         $valid = validateCommand($magentoBinary, $command);
         if ($valid) {
-            // Turn string into array for symfony escaping
-            $commandParts = array_filter(explode(" ", $command));
-            $argumentParts = array_filter(explode(" ", $arguments));
-            $magentoBinaryParts = array_filter(explode(" ", $magentoBinary));
-            $commandArray = array_merge($magentoBinaryParts, $commandParts);
-            $process = new Symfony\Component\Process\Process($commandArray);
+            $process = new Symfony\Component\Process\Process($magentoBinary . " $command" . " $arguments");
             $process->setIdleTimeout(60);
             $process->setTimeout(0);
             $idleTimeout = false;

etc/config/command.php

@@ -172,7 +172,12 @@
         </xs:annotation>
         <xs:simpleContent>
             <xs:extension base="xs:string">
-                <xs:attribute ref="html" use="required"/>
+                <!--
+                    For backwards compatibility we accept both html and userInput.
+                    If html is specified, then html is used. Otherwise userInput is used.
+                 -->
+                <xs:attribute ref="html"/>
+                <xs:attribute ref="userInput"/>
                 <xs:attributeGroup ref="commonActionAttributes"/>
             </xs:extension>
         </xs:simpleContent>

src/Magento/FunctionalTestingFramework/Test/etc/Actions/dontSeeActions.xsd

@@ -1174,6 +1174,10 @@ public function generateStepsPhp($actionObjects, $generationScope = TestGenerato
                 case "dontSeeInPageSource":
                 case "seeInSource":
                 case "dontSeeInSource":
+                    //TODO: Deprecate allowed usage of userInput in dontSeeInPageSource
+                    if ($html === null && $input !== null) {
+                        $html = $input;
+                    }
                     $testSteps .= $this->wrapFunctionCall($actor, $actionObject, $html);
                     break;
                 case "conditionalClick":