MQE-541: deprecated 'mergeKey' for test schema.

Author: jilu1

dev/tests/verification/Resources/MergeFunctionalCest.txt

@@ -55,8 +55,6 @@ class MergeFunctionalCest
 		$I->searchAndMultiSelectOption("#foo", ["Jane", "Dane"]);
 		$I->see("#element .Jane");
 		$I->click("#step10MergedInResult");
-		$I->click("#step11MergedInResult");
-		$I->click("#step12MergedInResult");
 	}
 
 	/**

dev/tests/verification/TestModule/Cest/MergeBaseFunctionalCest.xml

@@ -28,8 +28,6 @@
             <fillField stepKey="step5" selector="#password" userInput="step5"/>
             <click stepKey="step6" selector=".step6"/>
             <click stepKey="step10" selector="#step10ShouldNotInResult"/>
-            <click mergeKey="step11" selector="#step11ShouldNotInResult"/>
-            <click stepKey="step12" selector="#step12ShouldNotInResult"/>
         </test>
         <test name="MergedReferencesTest">
             <fillField stepKey="fillField1" selector="{{SampleSection.mergeElement}}" userInput="{{DefaultPerson.mergedField}}"/>

dev/tests/verification/TestModule/Cest/MergeInFunctionalCest.xml

@@ -25,8 +25,6 @@
             <click stepKey="step6" remove="true"/>
             <click stepKey="step6Merge" selector="#step6Merged" after="step5"/>
             <click stepKey="step10" selector="#step10MergedInResult"/>
-            <click mergeKey="step11" selector="#step11MergedInResult"/>
-            <click mergeKey="step12" selector="#step12MergedInResult"/>
             <actionGroup ref="FunctionalActionGroupWithData" stepKey="step8Merge" after="step7Merge"/>
         </test>
     </cest>

src/Magento/FunctionalTestingFramework/Config/Dom.php

@@ -6,8 +6,6 @@
 
 namespace Magento\FunctionalTestingFramework\Config;
 
-use Magento\FunctionalTestingFramework\Util\GlobalConstants;
-
 /**
  * Magento configuration XML DOM utility
  */
@@ -224,14 +222,6 @@ protected function getNodePathByParent(\DOMElement $node, $parentPath)
                 if ($value = $node->getAttribute($idAttributeValue)) {
                     $path .= "[@{$idAttributeValue}='{$value}']";
                     break;
-                    // TODO Remove the following elseif block once the 'mergeKey' attribute has been fully deprecated.
-                } elseif (empty($value) && $idAttributeValue === GlobalConstants::TEST_ID_ATTRIBUTE) {
-                    print "use of the 'mergeKey' attribute will be deprecated in the next release.\n";
-                    $idAttributeValue = GlobalConstants::DEPRECATED_TEST_ID_ATTRIBUTE;
-                    if ($value = $node->getAttribute($idAttributeValue)) {
-                        $path .= "[@{$idAttributeValue}='{$value}']";
-                        break;
-                    }
                 }
             }
         }

src/Magento/FunctionalTestingFramework/Test/Config/Converter/Dom/Flat.php

@@ -8,7 +8,6 @@
 
 use Magento\FunctionalTestingFramework\Config\ConverterInterface;
 use Magento\FunctionalTestingFramework\Config\Dom\ArrayNodeConfig;
-use Magento\FunctionalTestingFramework\Util\GlobalConstants;
 
 /**
  * Universal converter of any XML data to an array representation with no data loss
@@ -86,14 +85,6 @@ public function convertXml(\DOMNode $source, $basePath = '')
                 }
 
                 $nodeData = $this->convertXml($node, $nodePath);
-
-                // TODO Remove the following if block once the 'mergeKey' attribute has been fully deprecated.
-                if (!isset($nodeData[GlobalConstants::TEST_ID_ATTRIBUTE])
-                        && isset($nodeData[GlobalConstants::DEPRECATED_TEST_ID_ATTRIBUTE])) {
-                    $nodeData[GlobalConstants::TEST_ID_ATTRIBUTE] =
-                        $nodeData[GlobalConstants::DEPRECATED_TEST_ID_ATTRIBUTE];
-                    unset($nodeData[GlobalConstants::DEPRECATED_TEST_ID_ATTRIBUTE]);
-                }
                 if ($isArrayNode) {
                     if ($isNumericArrayNode) {
                         $value[$nodeName][] = $nodeData;

src/Magento/FunctionalTestingFramework/Test/Util/ActionObjectExtractor.php

@@ -44,7 +44,7 @@ public function extractActions($testActions)
         $actions = [];
 
         foreach ($testActions as $actionName => $actionData) {
-            $mergeKey = $actionData[self::TEST_STEP_MERGE_KEY];
+            $stepKey = $actionData[self::TEST_STEP_MERGE_KEY];
             if ($actionData[self::NODE_NAME] === TestEntityExtractor::TEST_STEP_ENTITY_CREATION) {
                 $actionData = $this->stripDataFields($actionData);
             }
@@ -79,7 +79,7 @@ public function extractActions($testActions)
             }*/
 
             $actions[] = new ActionObject(
-                $mergeKey,
+                $stepKey,
                 $actionData[self::NODE_NAME],
                 $actionAttributes,
                 $linkedAction,