From 9305d6f8069ebd12908805c65542969a49bfd0ea Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Mon, 15 Apr 2019 13:10:49 +0300
Subject: [PATCH 1/2] executeInSelenium generation fix

---
 .../Resources/ExecuteInSeleniumTest.txt       | 32 +++++++++++++++++++
 .../TestModule/Test/ExecuteInSeleniumTest.xml | 14 ++++++++
 .../Tests/ExecuteInSeleniumTest.php           | 22 +++++++++++++
 .../Test/Objects/ActionObject.php             |  2 +-
 4 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 dev/tests/verification/Resources/ExecuteInSeleniumTest.txt
 create mode 100644 dev/tests/verification/TestModule/Test/ExecuteInSeleniumTest.xml
 create mode 100644 dev/tests/verification/Tests/ExecuteInSeleniumTest.php

diff --git a/dev/tests/verification/Resources/ExecuteInSeleniumTest.txt b/dev/tests/verification/Resources/ExecuteInSeleniumTest.txt
new file mode 100644
index 000000000..323b2ffb9
--- /dev/null
+++ b/dev/tests/verification/Resources/ExecuteInSeleniumTest.txt
@@ -0,0 +1,32 @@
+<?php
+namespace Magento\AcceptanceTest\_default\Backend;
+
+use Magento\FunctionalTestingFramework\AcceptanceTester;
+use Magento\FunctionalTestingFramework\DataGenerator\Handlers\CredentialStore;
+use Magento\FunctionalTestingFramework\DataGenerator\Handlers\PersistedObjectHandler;
+use \Codeception\Util\Locator;
+use Yandex\Allure\Adapter\Annotation\Features;
+use Yandex\Allure\Adapter\Annotation\Stories;
+use Yandex\Allure\Adapter\Annotation\Title;
+use Yandex\Allure\Adapter\Annotation\Description;
+use Yandex\Allure\Adapter\Annotation\Parameter;
+use Yandex\Allure\Adapter\Annotation\Severity;
+use Yandex\Allure\Adapter\Model\SeverityLevel;
+use Yandex\Allure\Adapter\Annotation\TestCaseId;
+
+/**
+ */
+class ExecuteInSeleniumTestCest
+{
+	/**
+	 * @Features({"TestModule"})
+	 * @Parameter(name = "AcceptanceTester", value="$I")
+	 * @param AcceptanceTester $I
+	 * @return void
+	 * @throws \Exception
+	 */
+	public function ExecuteInSeleniumTest(AcceptanceTester $I)
+	{
+		$I->executeInSelenium(function ($webdriver) { return 'Hello, World!'});
+	}
+}
diff --git a/dev/tests/verification/TestModule/Test/ExecuteInSeleniumTest.xml b/dev/tests/verification/TestModule/Test/ExecuteInSeleniumTest.xml
new file mode 100644
index 000000000..0a72189b4
--- /dev/null
+++ b/dev/tests/verification/TestModule/Test/ExecuteInSeleniumTest.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<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"/>
+    </test>
+</tests>
diff --git a/dev/tests/verification/Tests/ExecuteInSeleniumTest.php b/dev/tests/verification/Tests/ExecuteInSeleniumTest.php
new file mode 100644
index 000000000..aee01b40b
--- /dev/null
+++ b/dev/tests/verification/Tests/ExecuteInSeleniumTest.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace tests\verification\Tests;
+
+use tests\util\MftfTestCase;
+
+class ExecuteInSeleniumTest extends MftfTestCase
+{
+    /**
+     * Tests generation of executeInSelenium action.
+     *
+     * @throws \Exception
+     * @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
+     */
+    public function testExecuteJsTest()
+    {
+        $this->generateAndCompareTest('ExecuteInSeleniumTest');
+    }
+}
diff --git a/src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php b/src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php
index 32e314be9..8a3bb27a6 100644
--- a/src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php
+++ b/src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php
@@ -60,7 +60,7 @@ class ActionObject
     const ASSERTION_VALUE_ATTRIBUTE = "value";
     const DELETE_DATA_MUTUAL_EXCLUSIVE_ATTRIBUTES = ["url", "createDataKey"];
     const EXTERNAL_URL_AREA_INVALID_ACTIONS = ['amOnPage'];
-    const FUNCTION_CLOSURE_ACTIONS = ['waitForElementChange', 'performOn'];
+    const FUNCTION_CLOSURE_ACTIONS = ['waitForElementChange', 'performOn', 'executeInSelenium'];
     const MERGE_ACTION_ORDER_AFTER = 'after';
     const MERGE_ACTION_ORDER_BEFORE = 'before';
     const ACTION_ATTRIBUTE_TIMEZONE = 'timezone';

From 2ec980643db7b85e4466e07f25597d05ef92d827 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Mon, 22 Apr 2019 22:09:04 +0300
Subject: [PATCH 2/2] executeInSelenium generation fix

---
 dev/tests/verification/Tests/ExecuteInSeleniumTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/verification/Tests/ExecuteInSeleniumTest.php b/dev/tests/verification/Tests/ExecuteInSeleniumTest.php
index aee01b40b..36532b362 100644
--- a/dev/tests/verification/Tests/ExecuteInSeleniumTest.php
+++ b/dev/tests/verification/Tests/ExecuteInSeleniumTest.php
@@ -15,7 +15,7 @@ class ExecuteInSeleniumTest extends MftfTestCase
      * @throws \Exception
      * @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
      */
-    public function testExecuteJsTest()
+    public function testExecuteInSeleniumTest()
     {
         $this->generateAndCompareTest('ExecuteInSeleniumTest');
     }