AC-3005::Resolve the conflicts

Author: glo71317

.github/workflows/main.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.3', '7.4', '8.0', '8.1']
+        php-versions: ['7.4', '8.0', '8.1']
     steps:
       - uses: actions/checkout@v2
 
@@ -54,7 +54,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.3', '7.4', '8.0', '8.1']
+        php-versions: ['7.4', '8.0', '8.1']
     steps:
       - uses: actions/checkout@v2
 
@@ -86,7 +86,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.3', '7.4', '8.0', '8.1']
+        php-versions: ['7.4', '8.0', '8.1']
     steps:
       - uses: actions/checkout@v2
 
@@ -118,7 +118,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.3', '7.4', '8.0', '8.1']
+        php-versions: ['7.4', '8.0', '8.1']
 
     services:
       chrome:

CHANGELOG.md

@@ -1,6 +1,26 @@
 Magento Functional Testing Framework Changelog
 ================================================
 
+3.11.0
+---------
+### Enhancements
+* Composer updated to 2.4.2 version
+* Static check for duplicate step keys in action group
+
+
+### Fixes
+
+* Fixed incorrect MFTF test dependencies path
+* Removed PHP 7.3 build check from MFTF PR build as PHP 7.3 is no longer supported
+
+
+3.10.3
+---------
+
+### Fixes
+
+* Chrome settings for potential cost reductions
+
 3.10.2
 ---------
 
@@ -10,7 +30,6 @@ Magento Functional Testing Framework Changelog
 * Fixed links in docs
 
 
-
 3.10.1
 ---------
 

composer.json

@@ -2,14 +2,14 @@
     "name": "magento/magento2-functional-testing-framework",
     "description": "Magento2 Functional Testing Framework",
     "type": "library",
-    "version": "3.10.2",
+    "version": "3.11.0",
     "license": "AGPL-3.0",
     "keywords": ["magento", "automation", "functional", "testing"],
     "config": {
         "sort-packages": true
     },
     "require": {
-        "php": ">7.3",
+        "php": ">7.4",
         "ext-curl": "*",
         "ext-dom": "*",
         "ext-iconv": "*",

composer.lock

@@ -378,6 +378,48 @@ public function testTestsAndSuitesSplitByMinGroupNumber(): void
         }
     }
 
+    /**
+     * Test splitting tests and suites when none of the suites has test.
+     * For example, this can happen when --filter option is used.
+     *
+     * @return void
+     * @throws FastFailException
+     */
+    public function testTestsAndSuitesSplitByGroupNumberSuiteNoTest(): void
+    {
+        // mock tests for test object handler.
+        $this->createMockForTest(0);
+
+        // create test to size array
+        $sampleTestArray = [
+            'test1' => 1,
+            'test2' => 125,
+            'test3' => 35
+        ];
+
+        // create mock suite references
+        $sampleSuiteArray = [
+            'mockSuite1' => [],
+            'mockSuite2' => [],
+        ];
+
+        // perform sort
+        $testSorter = new ParallelGroupSorter();
+        $actualResult = $testSorter->getTestsGroupedByFixedGroupCount($sampleSuiteArray, $sampleTestArray, 3);
+        // verify the resulting groups
+        $this->assertCount(3, $actualResult);
+
+        $expectedResults =  [
+            1 => ['test2'],
+            2 => ['test3'],
+            3 => ['test1']
+        ];
+
+        foreach ($actualResult as $groupNum => $group) {
+            $this->assertEquals($expectedResults[$groupNum], array_keys($group));
+        }
+    }
+
     /**
      * Test splitting tests and suites with invalid group number.
      *

dev/tests/unit/Magento/FunctionalTestFramework/Util/Sorter/ParallelGroupSorterTest.php

@@ -37,7 +37,8 @@ class GenerateTestsCommand extends BaseGenerateCommand
     const PARALLEL_DEFAULT_TIME = 10;
     const EXTENDS_REGEX_PATTERN = '/extends=["\']([^\'"]*)/';
     const ACTIONGROUP_REGEX_PATTERN = '/ref=["\']([^\'"]*)/';
-    const TEST_DEPENDENCY_FILE_LOCATION = 'dev/tests/_output/test-dependencies.json';
+    const TEST_DEPENDENCY_FILE_LOCATION_STANDALONE = 'dev/tests/_output/test-dependencies.json';
+    const TEST_DEPENDENCY_FILE_LOCATION_EMBEDDED = 'dev/tests/acceptance/tests/_output/test-dependencies.json';
 
     /**
      * @var ScriptUtil
@@ -250,8 +251,12 @@ protected function execute(InputInterface $input, OutputInterface $output)
         if (!empty($log)) {
             if ($log === "testEntityJson") {
                 $this->getTestEntityJson($tests);
+                $testDependencyFileLocation = self::TEST_DEPENDENCY_FILE_LOCATION_EMBEDDED;
+                if (isset($_ENV['MAGENTO_BP'])) {
+                    $testDependencyFileLocation = self::TEST_DEPENDENCY_FILE_LOCATION_STANDALONE;
+                }
                 $output->writeln(
-                    "Test dependencies file created, Located in: " . self::TEST_DEPENDENCY_FILE_LOCATION
+                    "Test dependencies file created, Located in: " . $testDependencyFileLocation
                 );
             } else {
                 $output->writeln(
@@ -555,7 +560,15 @@ private function getExtendedTestDependencies(array $extendedTests): array
      */
     private function array2Json(array $array)
     {
-        $file = fopen(self::TEST_DEPENDENCY_FILE_LOCATION, 'w');
+        $testDependencyFileLocation = self::TEST_DEPENDENCY_FILE_LOCATION_EMBEDDED;
+        if (isset($_ENV['MAGENTO_BP'])) {
+            $testDependencyFileLocation = self::TEST_DEPENDENCY_FILE_LOCATION_STANDALONE;
+        }
+        $testDependencyFileLocationDir = dirname($testDependencyFileLocation);
+        if (!is_dir($testDependencyFileLocationDir)) {
+            mkdir($testDependencyFileLocationDir, 0777, true);
+        }
+        $file = fopen($testDependencyFileLocation, 'w');
         $json = json_encode($array, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT);
         fwrite($file, $json);
         fclose($file);