Skip to content

executeInSelenium generation fix #2 #348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 14, 2019
Merged

executeInSelenium generation fix #2 #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a7597c9
executeInSelenium generation fix #2
zakdma May 6, 2019
3760dc8
executeInSelenium generation fix #2
zakdma May 6, 2019
da4ec73
executeInSelenium generation fix #2
zakdma May 6, 2019
96edabe
Merge branch 'develop' into executeInSelenium2
zakdma Jun 7, 2019
8ea87ea
Merge branch 'develop' into executeInSelenium2
zakdma Oct 10, 2019
43ffdbb
Merge branch 'develop' into executeInSelenium2
soumyau Oct 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dev/tests/verification/Resources/ExecuteInSeleniumTest.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ class ExecuteInSeleniumTestCest
*/
public function ExecuteInSeleniumTest(AcceptanceTester $I)
{
$I->executeInSelenium(function ($webdriver) { return 'Hello, World!'}); // stepKey: executeInSeleniumStep
$I->executeInSelenium(function ($webdriver) { return "Hello, World!"}); // stepKey: executeInSeleniumStep
}
}
2 changes: 1 addition & 1 deletion dev/tests/verification/TestModule/Test/ExecuteInSeleniumTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
<test name="ExecuteInSeleniumTest">
<executeInSelenium function="function ($webdriver) { return 'Hello, World!'}" stepKey="executeInSeleniumStep"/>
<executeInSelenium function="function ($webdriver) { return &quot;Hello, World!&quot;}" stepKey="executeInSeleniumStep"/>
</test>
</tests>
16 changes: 12 additions & 4 deletions src/Magento/FunctionalTestingFramework/Util/TestGenerator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,7 +654,10 @@ public function generateStepsPhp($actionObjects, $generationScope = TestGenerato
}

if (isset($customActionAttributes['function'])) {
$function = $this->addUniquenessFunctionCall($customActionAttributes['function']);
$function = $this->addUniquenessFunctionCall(
$customActionAttributes['function'],
$actionObject->getType() !== "executeInSelenium"
);
if (in_array($actionObject->getType(), ActionObject::FUNCTION_CLOSURE_ACTIONS)) {
// Argument must be a closure function, not a string.
$function = trim($function, '"');
Expand Down Expand Up @@ -1736,12 +1739,17 @@ private function processPressKey($input)
/**
* Add uniqueness function call to input string based on regex pattern.
*
* @param string $input
* @param string $input
* @param boolean $wrapWithDoubleQuotes
* @return string
*/
private function addUniquenessFunctionCall($input)
private function addUniquenessFunctionCall($input, $wrapWithDoubleQuotes = true)
{
$output = $this->wrapWithDoubleQuotes($input);
if ($wrapWithDoubleQuotes) {
$output = $this->wrapWithDoubleQuotes($input);
} else {
$output = $input;
}

//Match on msq(\"entityName\")
preg_match_all('/' . EntityDataObject::CEST_UNIQUE_FUNCTION . '\(\\\\"[\w]+\\\\"\)/', $output, $matches);
Expand Down