Merge pull request #496 from magento-commerce/MFTF6.0.1

Mftf6.0.1

Author: Karishmathakare19

CHANGELOG.md

@@ -1,6 +1,12 @@
 Magento Functional Testing Framework Changelog
 ================================================
 
+6.0.1
+---------
+### Fixes
+* Added uniqueness validation for step key in testsuite.
+* Removed unnecessary chrome configuration flags
+
 6.0.0
 ---------
 ### Enhancement

composer.json

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

etc/config/functional.suite.dist.yml

@@ -38,4 +38,4 @@ modules:
             capabilities:
                 unhandledPromptBehavior: "ignore"
                 chromeOptions:
-                    args: ["--no-sandbox", "--window-size=1920,1080", "--disable-extensions", "--enable-automation", "--disable-gpu", "--enable-Passthrough", "--disable-dev-shm-usage", "--disable-component-update", "--disable-features=OptimizationHints","--disable-background-networking","--disable-domain-reliability","--disable-breakpad","--disable-features=ThirdPartyCookieBlocking,SameSiteByDefaultCookies,StoragePartitioning,AutofocusPreventsAccidentalCrossOriginActivation,BlockInsecurePrivateNetworkRequests","--disable-web-security","--allow-running-insecure-content","--disable-site-isolation-trials","--disable-features=site-per-process"]
+                    args: ["--no-sandbox", "--window-size=1920,1080", "--disable-extensions", "--enable-automation", "--disable-gpu", "--enable-Passthrough", "--disable-dev-shm-usage", "--disable-component-update", "--disable-features=OptimizationHints","--disable-background-networking","--disable-domain-reliability","--disable-breakpad","--disable-web-security"]

src/Magento/FunctionalTestingFramework/Suite/Config/SuiteDom.php

@@ -7,6 +7,7 @@
 namespace Magento\FunctionalTestingFramework\Suite\Config;
 
 use Magento\FunctionalTestingFramework\Exceptions\Collector\ExceptionCollector;
+use Magento\FunctionalTestingFramework\Util\Validation\DuplicateNodeValidationUtil;
 use Magento\FunctionalTestingFramework\Util\Validation\SingleNodePerFileValidationUtil;
 
 /**
@@ -16,6 +17,14 @@
 class SuiteDom extends \Magento\FunctionalTestingFramework\Config\MftfDom
 {
     const SUITE_META_FILENAME_ATTRIBUTE = "filename";
+    const SUITE_META_NAME_ATTRIBUTE = "name";
+
+    /**
+     * Duplicate stepKey validation for suite hook actions
+     *
+     * @var DuplicateNodeValidationUtil
+     */
+    private $actionsValidationUtil;
 
     /** SingleNodePerFileValidationUtil
      *
@@ -42,6 +51,7 @@ public function __construct(
         $schemaFile = null,
         $errorFormat = self::ERROR_FORMAT_DEFAULT
     ) {
+        $this->actionsValidationUtil = new DuplicateNodeValidationUtil('stepKey', $exceptionCollector);
         $this->singleNodePerFileValidationUtil = new SingleNodePerFileValidationUtil($exceptionCollector);
         parent::__construct(
             $xml,
@@ -76,6 +86,24 @@ public function initDom($xml, $filename = null)
                 /** @var \DOMElement $suiteNode */
                 $suiteNode = $dom->getElementsByTagName('suite')[0];
                 $suiteNode->setAttribute(self::SUITE_META_FILENAME_ATTRIBUTE, $filename);
+                $suiteName = $suiteNode->getAttribute(self::SUITE_META_NAME_ATTRIBUTE);
+                $beforeNode = $suiteNode->getElementsByTagName('before')->item(0);
+                $afterNode = $suiteNode->getElementsByTagName('after')->item(0);
+
+                if ($beforeNode instanceof \DOMElement) {
+                    $this->actionsValidationUtil->validateChildUniqueness(
+                        $beforeNode,
+                        $filename,
+                        $suiteName . '/before'
+                    );
+                }
+                if ($afterNode instanceof \DOMElement) {
+                    $this->actionsValidationUtil->validateChildUniqueness(
+                        $afterNode,
+                        $filename,
+                        $suiteName . '/after'
+                    );
+                }
             }
         }