Merge branch 'MQE-541' into sprint-develop

# Conflicts:
#	dev/tests/verification/TestModule/ActionGroup/MergeFunctionalActionGroup.xml
#	dev/tests/verification/TestModule/Cest/MergeInFunctionalCest.xml
#	etc/di.xml
#	src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd

Author: jilu1

dev/tests/unit/Magento/FunctionalTestFramework/Test/Objects/ActionObjectTest.php

@@ -27,7 +27,7 @@ class ActionObjectTest extends TestCase
      */
     public function testConstructOrderBefore()
     {
-        $actionObject = new ActionObject('mergeKey', 'type', [], null, 'before');
+        $actionObject = new ActionObject('stepKey', 'type', [], null, 'before');
         $this->assertEquals(0, $actionObject->getOrderOffset());
     }
 
@@ -36,7 +36,7 @@ public function testConstructOrderBefore()
      */
     public function testConstructOrderAfter()
     {
-        $actionObject = new ActionObject('mergeKey', 'type', [], null, 'after');
+        $actionObject = new ActionObject('stepKey', 'type', [], null, 'after');
         $this->assertEquals(1, $actionObject->getOrderOffset());
     }
 

dev/tests/unit/Magento/FunctionalTestFramework/Test/Util/ActionMergeUtilTest.php

@@ -32,39 +32,39 @@ public function testResolveActionStepOrdering()
         $testObjNamePosAfterEnd = 'testAfterAfterMerge10';
 
         for ($i = 1; $i < $actionsLength; $i++) {
-            $mergeKey = 'mergeKey'. $i;
+            $stepKey = 'stepKey'. $i;
             $type = 'testType';
             $actionAttributes = [];
 
-            $actions[] = new ActionObject($mergeKey, $type, $actionAttributes);
+            $actions[] = new ActionObject($stepKey, $type, $actionAttributes);
         }
 
         $actions[] = new ActionObject(
             $testObjNamePosAfterEnd,
-            'mergeType',
+            'stepType',
             [],
             $testObjNamePosEnd,
             ActionObject::MERGE_ACTION_ORDER_AFTER
         );
         $actions[] = new ActionObject(
             $testObjNamePosBeforeFirst,
-            'mergeType',
+            'stepType',
             [],
             $testObjNamePosFirst,
             ActionObjectExtractor::TEST_ACTION_BEFORE
         );
         $actions[] = new ActionObject(
             $testObjNamePosFirst,
-            'mergeType',
+            'stepType',
             [],
-            'mergeKey1',
+            'stepKey1',
             ActionObjectExtractor::TEST_ACTION_BEFORE
         );
         $actions[] = new ActionObject(
             $testObjNamePosEnd,
-            'mergeType',
+            'stepType',
             [],
-            'mergeKey' . (string)($actionsLength - 1),
+            'stepKey' . (string)($actionsLength - 1),
             ActionObject::MERGE_ACTION_ORDER_AFTER
         );
 

dev/tests/verification/Resources/ActionGroupFunctionalCest.txt

@@ -31,7 +31,7 @@ class ActionGroupFunctionalCest
 
 	public function _before(AcceptanceTester $I)
 	{
-		$I->amGoingTo("create entity that has the mergeKey: createPersonParam");
+		$I->amGoingTo("create entity that has the stepKey: createPersonParam");
 		$ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson");
 		$this->createPersonParam = new DataPersistenceHandler($ReplacementPerson);
 		$this->createPersonParam->createEntity();
@@ -111,7 +111,7 @@ class ActionGroupFunctionalCest
 	 */
 	public function ActionGroupWithPersistedData(AcceptanceTester $I)
 	{
-		$I->amGoingTo("create entity that has the mergeKey: createPerson");
+		$I->amGoingTo("create entity that has the stepKey: createPerson");
 		$DefaultPerson = DataObjectHandler::getInstance()->getObject("DefaultPerson");
 		$createPerson = new DataPersistenceHandler($DefaultPerson);
 		$createPerson->createEntity();

dev/tests/verification/Resources/AssertCest.txt

@@ -26,7 +26,7 @@ class AssertCest
 
 	public function _before(AcceptanceTester $I)
 	{
-		$I->amGoingTo("create entity that has the mergeKey: createData1");
+		$I->amGoingTo("create entity that has the stepKey: createData1");
 		$ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson");
 		$this->createData1 = new DataPersistenceHandler($ReplacementPerson);
 		$this->createData1->createEntity();
@@ -39,7 +39,7 @@ class AssertCest
 	 */
 	public function AssertTest(AcceptanceTester $I)
 	{
-		$I->amGoingTo("create entity that has the mergeKey: createData2");
+		$I->amGoingTo("create entity that has the stepKey: createData2");
 		$UniquePerson = DataObjectHandler::getInstance()->getObject("UniquePerson");
 		$createData2 = new DataPersistenceHandler($UniquePerson);
 		$createData2->createEntity();

dev/tests/verification/Resources/LocatorFunctionCest.txt

@@ -26,7 +26,7 @@ class LocatorFunctionCest
 	 */
 	public function LocatorFuctionTest(AcceptanceTester $I)
 	{
-		$I->amGoingTo("create entity that has the mergeKey: data");
+		$I->amGoingTo("create entity that has the stepKey: data");
 		$ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson");
 		$data = new DataPersistenceHandler($ReplacementPerson);
 		$data->createEntity();

dev/tests/verification/Resources/MergeFunctionalCest.txt

@@ -54,6 +54,7 @@ class MergeFunctionalCest
 		$I->fillField("#bar", "Dane");
 		$I->searchAndMultiSelectOption("#foo", ["Jane", "Dane"]);
 		$I->see("#element .Jane");
+		$I->click("#step10MergedInResult");
 	}
 
 	/**

dev/tests/verification/Resources/PageReplacementCest.txt

@@ -26,7 +26,7 @@ class PageReplacementCest
 	 */
 	public function PageReplacementTest(AcceptanceTester $I)
 	{
-		$I->amGoingTo("create entity that has the mergeKey: datakey");
+		$I->amGoingTo("create entity that has the stepKey: datakey");
 		$simpleData = DataObjectHandler::getInstance()->getObject("simpleData");
 		$datakey = new DataPersistenceHandler($simpleData);
 		$datakey->createEntity();

dev/tests/verification/Resources/ParameterArrayCest.txt

@@ -26,7 +26,7 @@ class ParameterArrayCest
 	 */
 	public function ParameterArrayTest(AcceptanceTester $I)
 	{
-		$I->amGoingTo("create entity that has the mergeKey: simpleDataKey");
+		$I->amGoingTo("create entity that has the stepKey: simpleDataKey");
 		$simpleParamData = DataObjectHandler::getInstance()->getObject("simpleParamData");
 		$simpleDataKey = new DataPersistenceHandler($simpleParamData);
 		$simpleDataKey->createEntity();

dev/tests/verification/Resources/PersistedReplacementCest.txt

@@ -26,7 +26,7 @@ class PersistedReplacementCest
 
 	public function _before(AcceptanceTester $I)
 	{
-		$I->amGoingTo("create entity that has the mergeKey: createData1");
+		$I->amGoingTo("create entity that has the stepKey: createData1");
 		$ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson");
 		$this->createData1 = new DataPersistenceHandler($ReplacementPerson);
 		$this->createData1->createEntity();
@@ -39,7 +39,7 @@ class PersistedReplacementCest
 	 */
 	public function PersistedReplacementTest(AcceptanceTester $I)
 	{
-		$I->amGoingTo("create entity that has the mergeKey: createdData");
+		$I->amGoingTo("create entity that has the stepKey: createdData");
 		$simpleData = DataObjectHandler::getInstance()->getObject("simpleData");
 		$createdData = new DataPersistenceHandler($simpleData);
 		$createdData->createEntity();

dev/tests/verification/Resources/SectionReplacementCest.txt

@@ -45,7 +45,7 @@ class SectionReplacementCest
 		$I->click("#Doe".msq("uniqueData")." .stringLiteral2");
 		$I->click("#Doe".msq("uniqueData")."-stringLiteral2 .stringLiteral3");
 		$I->click("#Doe".msq("uniqueData")."-stringLiteral2 .Doe");
-		$I->amGoingTo("create entity that has the mergeKey: createdData");
+		$I->amGoingTo("create entity that has the stepKey: createdData");
 		$simpleData = DataObjectHandler::getInstance()->getObject("simpleData");
 		$createdData = new DataPersistenceHandler($simpleData);
 		$createdData->createEntity();