Skip to content

Commit a23a169

Browse files
committed
MQE-68 - Create Configurable Product test generator adjustments.
1 parent 08459ac commit a23a169

File tree

2 files changed

+9
-18
lines changed

2 files changed

+9
-18
lines changed

src/Magento/AcceptanceTestFramework/Test/etc/testSchema.xsd

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -895,7 +895,8 @@
895895
<xs:simpleContent>
896896
<xs:extension base="xs:string">
897897
<xs:attribute type="xs:string" name="selector" use="required"/>
898-
<xs:attribute type="xs:string" name="parameterArray" use="required"/>
898+
<xs:attribute type="xs:string" name="userInput"/>
899+
<xs:attribute type="xs:string" name="parameterArray"/>
899900
<xs:attribute type="xs:string" name="requiredAction"/>
900901
<xs:attribute type="xs:string" name="mergeKey" use="required"/>
901902
<xs:attribute type="xs:boolean" name="remove" default="false"/>
@@ -1146,6 +1147,7 @@
11461147
<xs:complexType name="switchToIFrameType">
11471148
<xs:simpleContent>
11481149
<xs:extension base="xs:string">
1150+
<xs:attribute type="xs:string" name="selector"/>
11491151
<xs:attribute type="xs:string" name="userInput"/>
11501152
<xs:attribute type="xs:string" name="mergeKey" use="required"/>
11511153
<xs:attribute type="xs:boolean" name="remove" default="false"/>

src/Magento/AcceptanceTestFramework/Util/TestGenerator.php

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ private function generateClassAnnotationsPhp($classAnnotationsObject)
249249
}
250250

251251
if ($annotationType == "testCaseId") {
252-
$classAnnotationsPhp .= sprintf(" * TestCaseId(\"%s\")", $annotationName[0]);
252+
$classAnnotationsPhp .= sprintf(" * TestCaseId(\"%s\")\n", $annotationName[0]);
253253
}
254254

255255
if ($annotationType == "group") {
@@ -503,7 +503,7 @@ private function generateStepsPhp($stepsObject, $hookObject = false)
503503
$testSteps .= sprintf(
504504
"\t\t$%s->%s(%s, \"%s\");\n",
505505
$actor,
506-
actionName,
506+
$actionName,
507507
$input,
508508
$customActionAttributes['locale']
509509
);
@@ -653,22 +653,11 @@ private function generateStepsPhp($stepsObject, $hookObject = false)
653653
break;
654654
case "searchAndMultiSelectOption":
655655
if (isset($customActionAttributes['requiredAction'])) {
656-
$testSteps .= sprintf(
657-
"\t\t$%s->%s(%s, %s, %s);\n",
658-
$actor,
659-
$actionName,
660-
$selector,
661-
$customActionAttributes['parameterArray'],
662-
$customActionAttributes['requiredAction']
663-
);
656+
$testSteps .= sprintf("\t\t$%s->%s(%s, %s, %s);\n", $actor, $actionName, $selector, $customActionAttributes['parameterArray'], $customActionAttributes['requiredAction']);
657+
} else if (isset($customActionAttributes['parameterArray'])) {
658+
$testSteps .= sprintf("\t\t$%s->%s(%s, %s);\n", $actor, $actionName, $selector, $customActionAttributes['parameterArray']);
664659
} else {
665-
$testSteps .= sprintf(
666-
"\t\t$%s->%s(%s, %s);\n",
667-
$actor,
668-
$actionName,
669-
$selector,
670-
$customActionAttributes['parameterArray']
671-
);
660+
$testSteps .= sprintf("\t\t$%s->%s(%s, [%s]);\n", $actor, $actionName, $selector, $input);
672661
}
673662
break;
674663
case "see":

0 commit comments

Comments
 (0)