Merge branch 'MQE-630' into sprint-develop

Author: tomreece

dev/tests/verification/Resources/ParameterArrayCest.txt

@@ -39,5 +39,12 @@ class ParameterArrayCest
 		$I->searchAndMultiSelectOption("#selector", ['someKey' => "name"]);
 		$I->searchAndMultiSelectOption("#selector", ['someKey' => msq("simpleParamData")."prename"]);
 		$I->searchAndMultiSelectOption("#selector", ['someKey' => "postname".msq("simpleParamData")]);
+		$I->unselectOption("#selector", ['foo']);
+		$I->unselectOption("#selector", ['foo', 'bar']);
+		$I->unselectOption("#selector", ["name"]);
+		$I->unselectOption("#selector", [msq("simpleParamData")."prename"]);
+		$I->unselectOption("#selector", ["postname".msq("simpleParamData")]);
+		$I->unselectOption("#selector", [$simpleDataKey->getCreatedDataByName('name')]);
+		$I->unselectOption("#selector", ["name", $simpleDataKey->getCreatedDataByName('name')]);
 	}
 }

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

@@ -20,6 +20,14 @@
             <searchAndMultiSelectOption selector="#selector" parameterArray="['someKey' => {{simpleParamData.name}}]" stepKey="literalKeyToStatic"/>
             <searchAndMultiSelectOption selector="#selector" parameterArray="['someKey' => {{simpleParamData.uniqueNamePre}}]" stepKey="literalKeyToPrefixUnique"/>
             <searchAndMultiSelectOption selector="#selector" parameterArray="['someKey' => {{simpleParamData.uniqueNamePost}}]" stepKey="literalKeyToSuffixUnique"/>
+
+            <unselectOption selector="#selector" parameterArray="['foo']" stepKey="000"/>
+            <unselectOption selector="#selector" parameterArray="['foo','bar']" stepKey="001"/>
+            <unselectOption selector="#selector" parameterArray="[{{simpleParamData.name}}]" stepKey="002"/>
+            <unselectOption selector="#selector" parameterArray="[{{simpleParamData.uniqueNamePre}}]" stepKey="003"/>
+            <unselectOption selector="#selector" parameterArray="[{{simpleParamData.uniqueNamePost}}]" stepKey="004"/>
+            <unselectOption selector="#selector" parameterArray="[$simpleDataKey.name$]" stepKey="005"/>
+            <unselectOption selector="#selector" parameterArray="[{{simpleParamData.name}}, $simpleDataKey.name$]" stepKey="006"/>
         </test>
     </cest>
 </config>

src/Magento/FunctionalTestingFramework/Util/TestGenerator.php

@@ -813,6 +813,7 @@ private function generateStepsPhp($stepsObject, $hookObject = false)
                     $testSteps .= $this->wrapFunctionCall($actor, $actionName, $selector, $input, $parameterArray);
                     break;
                 case "selectOption":
+                case "unselectOption":
                     $testSteps .= $this->wrapFunctionCall($actor, $actionName, $selector, $input, $parameterArray);
                     break;
                 case "submitForm":
@@ -934,7 +935,6 @@ private function generateStepsPhp($stepsObject, $hookObject = false)
                 case "loadSessionSnapshot":
                 case "seeInField":
                 case "seeOptionIsSelected":
-                case "unselectOption":
                     $testSteps .= $this->wrapFunctionCall($actor, $actionName, $selector, $input);
                     break;
                 case "seeNumberOfElements":