Skip to content

Commit bba6a43

Browse files
committed
MQE-19: Implemented test modules composer packaging.
1 parent 46ce94c commit bba6a43

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

src/Magento/AcceptanceTestFramework/Util/TestGenerator.php

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -684,15 +684,19 @@ private function generateStepsPhp($stepsObject, $hookObject = false)
684684
default:
685685
if ($returnVariable) {
686686
if ($selector) {
687-
if (isset($customActionAttributes['userInput'])) {
687+
if ($input) {
688+
$testSteps .= sprintf("\t\t$%s = $%s->%s(%s, %s);\n", $returnVariable, $actor, $actionName, $selector, $input);
689+
} elseif (isset($customActionAttributes['userInput'])) {
688690
$testSteps .= sprintf("\t\t$%s = $%s->%s(%s, \"%s\");\n", $returnVariable, $actor, $actionName, $selector, $customActionAttributes['userInput']);
689691
} elseif (isset($customActionAttributes['parameter'])) {
690692
$testSteps .= sprintf("\t\t$%s = $%s->%s(%s, %s);\n", $returnVariable, $actor, $actionName, $selector, $customActionAttributes['parameter']);
691693
} else {
692694
$testSteps .= sprintf("\t\t$%s = $%s->%s(%s);\n", $returnVariable, $actor, $actionName, $selector);
693695
}
694696
} else {
695-
if (isset($customActionAttributes['userInput'])) {
697+
if ($input) {
698+
$testSteps .= sprintf("\t\t$%s = $%s->%s(%s);\n", $returnVariable, $actor, $actionName, $input);
699+
} elseif (isset($customActionAttributes['userInput'])) {
696700
$testSteps .= sprintf("\t\t$%s = $%s->%s(\"%s\");\n", $returnVariable, $actor, $actionName, $customActionAttributes['userInput']);
697701
} elseif (isset($customActionAttributes['parameter'])) {
698702
$testSteps .= sprintf("\t\t$%s = $%s->%s(%s);\n", $returnVariable, $actor, $actionName, $customActionAttributes['parameter']);
@@ -702,15 +706,19 @@ private function generateStepsPhp($stepsObject, $hookObject = false)
702706
}
703707
} else {
704708
if ($selector) {
705-
if (isset($customActionAttributes['userInput'])) {
709+
if ($input) {
710+
$testSteps .= sprintf("\t\t$%s->%s(%s, %s);\n", $actor, $actionName, $selector, $input);
711+
} elseif (isset($customActionAttributes['userInput'])) {
706712
$testSteps .= sprintf("\t\t$%s->%s(%s, \"%s\");\n", $actor, $actionName, $selector, $customActionAttributes['userInput']);
707713
} elseif (isset($customActionAttributes['parameter'])) {
708714
$testSteps .= sprintf("\t\t$%s->%s(%s, %s);\n", $actor, $actionName, $selector, $customActionAttributes['parameter']);
709715
} else {
710716
$testSteps .= sprintf("\t\t$%s->%s(%s);\n", $actor, $actionName, $selector);
711717
}
712718
} else {
713-
if (isset($customActionAttributes['userInput'])) {
719+
if ($input) {
720+
$testSteps .= sprintf("\t\t$%s->%s(%s);\n", $actor, $actionName, $input);
721+
} elseif (isset($customActionAttributes['userInput'])) {
714722
$testSteps .= sprintf("\t\t$%s->%s(\"%s\");\n", $actor, $actionName, $customActionAttributes['userInput']);
715723
} elseif (isset($customActionAttributes['parameter'])) {
716724
$testSteps .= sprintf("\t\t$%s->%s(%s);\n", $actor, $actionName, $customActionAttributes['parameter']);

0 commit comments

Comments
 (0)