Skip to content

Commit 1f59783

Browse files
okolesnykokolesnyk
committed
MQE-1964: MFTF Helper - Implementation
1 parent 24c7dfe commit 1f59783

20 files changed

+322
-472
lines changed

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"files": ["src/Magento/FunctionalTestingFramework/_bootstrap.php"],
5454
"psr-4": {
5555
"Magento\\FunctionalTestingFramework\\": "src/Magento/FunctionalTestingFramework",
56-
"MFTF\\": "dev/tests/functional/MFTF"
56+
"MFTF\\": "dev/tests/functional/tests/MFTF"
5757
}
5858
},
5959
"autoload-dev": {

‎dev/tests/functional/tests/MFTF/DevDocs/ActionGroup/DeprecatedCommentActionGroup.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,15 @@
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1010
<actionGroup name="DeprecatedCommentActionGroup" deprecated="This Action Group is outdated and will be deleted next release.">
11+
<arguments>
12+
<argument name="test" type="string" />
13+
</arguments>
1114
<comment userInput="Action group to demonstrate deprecation notices." stepKey="comment" />
15+
<helper class="\MFTF\DevDocs\Helper\CustomHelper" method="goTo" stepKey="custobhhmHelper">
16+
<argument name="test">{{contentSection.pageIntro}}</argument>
17+
<argument name="module">['{{test}}', 'Bla']</argument>
18+
<argument name="url">{{test}}</argument>
19+
</helper>
20+
1221
</actionGroup>
1322
</actionGroups>

‎dev/tests/functional/tests/MFTF/DevDocs/Helper/CustomHelper.php

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?php
2+
3+
namespace MFTF\DevDocs\Helper;
4+
5+
use Magento\FunctionalTestingFramework\Helper\Helper;
6+
7+
class CustomHelper extends Helper
8+
{
9+
public function goTo(string $url, $test, array $module = [], $superBla = null, $bla = 'blaValue', array $arraysomething = [])
10+
{
11+
print("this is it: " . $url . PHP_EOL);
12+
}
13+
}

‎dev/tests/functional/tests/MFTF/DevDocs/Test/DeprecatedDevDocsTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
<!-- Open MFTF DevDocs Page -->
2323
<amOnPage stepKey="openMFTFDevDocPage" url="{{DeprecatedMFTFDocPage.url}}" />
2424
<see stepKey="verifyPageIntroText" selector="{{DeprecatedContentSection.pageIntro}}" userInput="{{DeprecatedMessageData.message}}" />
25-
<actionGroup ref="DeprecatedCommentActionGroup" stepKey="commentActionGroup" />
25+
<actionGroup ref="DeprecatedCommentActionGroup" stepKey="commentActionGroup">
26+
<argument name="test" value="{{DeprecatedContentSection.pageIntro}}" />
27+
</actionGroup>
2628
</test>
2729
</tests>

‎dev/tests/functional/tests/MFTF/DevDocs/Test/DevDocsTest.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,10 @@
2222
<!-- Open MFTF DevDocs Page -->
2323
<amOnPage stepKey="openMFTFDevDocPage" url="{{MFTFDocPage.url}}" />
2424
<see stepKey="verifyPageIntroText" selector="{{contentSection.pageIntro}}" userInput="{{MessageData.message}}" />
25+
<helper class="\MFTF\DevDocs\Helper\CustomHelper" method="goTo" stepKey="customHelper">
26+
<argument name="test">{{contentSection.pageIntro}}</argument>
27+
<argument name="module">['Test', 'Bla']</argument>
28+
<argument name="url">{{MFTFDocPage.url}}</argument>
29+
</helper>
2530
</test>
2631
</tests>

‎etc/config/functional.suite.dist.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ namespace: Magento\FunctionalTestingFramework
1212
modules:
1313
enabled:
1414
- \Magento\FunctionalTestingFramework\Module\MagentoWebDriver
15-
- \Magento\FunctionalTestingFramework\Helper\Acceptance
16-
- \Magento\FunctionalTestingFramework\Helper\MagentoFakerData
1715
- \Magento\FunctionalTestingFramework\Module\MagentoSequence
1816
- \Magento\FunctionalTestingFramework\Module\MagentoAssert
1917
- \Magento\FunctionalTestingFramework\Module\MagentoActionProxies

‎etc/di.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<!-- Entity value gets replaced in Dom.php before reading $xml -->
1010
<!DOCTYPE config [
11-
<!ENTITY commonTestActions "acceptPopup|actionGroup|amOnPage|amOnUrl|amOnSubdomain|appendField|assertArrayIsSorted|assertArraySubset|assertElementContainsAttribute|attachFile|cancelPopup|checkOption|clearField|click|clickWithLeftButton|clickWithRightButton|closeAdminNotification|closeTab|comment|conditionalClick|createData|deleteData|updateData|getData|dontSee|dontSeeJsError|dontSeeCheckboxIsChecked|dontSeeCookie|dontSeeCurrentUrlEquals|dontSeeCurrentUrlMatches|dontSeeElement|dontSeeElementInDOM|dontSeeInCurrentUrl|dontSeeInField|dontSeeInFormFields|dontSeeInPageSource|dontSeeInSource|dontSeeInTitle|dontSeeLink|dontSeeOptionIsSelected|doubleClick|dragAndDrop|entity|executeJS|fillField|formatMoney|generateDate|grabAttributeFrom|grabCookie|grabFromCurrentUrl|grabMultiple|grabPageSource|grabTextFrom|grabValueFrom|loadSessionSnapshot|loginAsAdmin|magentoCLI|magentoCron|makeScreenshot|maximizeWindow|moveBack|moveForward|moveMouseOver|mSetLocale|mResetLocale|openNewTab|pauseExecution|parseFloat|pressKey|reloadPage|resetCookie|submitForm|resizeWindow|saveSessionSnapshot|scrollTo|scrollToTopOfPage|searchAndMultiSelectOption|see|seeCheckboxIsChecked|seeCookie|seeCurrentUrlEquals|seeCurrentUrlMatches|seeElement|seeElementInDOM|seeInCurrentUrl|seeInField|seeInFormFields|seeInPageSource|seeInPopup|seeInSource|seeInTitle|seeLink|seeNumberOfElements|seeOptionIsSelected|selectOption|setCookie|submitForm|switchToIFrame|switchToNextTab|switchToPreviousTab|switchToWindow|typeInPopup|uncheckOption|unselectOption|wait|waitForAjaxLoad|waitForElement|waitForElementChange|waitForElementNotVisible|waitForElementVisible|waitForPwaElementNotVisible|waitForPwaElementVisible|waitForJS|waitForLoadingMaskToDisappear|waitForPageLoad|waitForText|assertArrayHasKey|assertArrayNotHasKey|assertArraySubset|assertContains|assertCount|assertEmpty|assertEquals|assertFalse|assertFileExists|assertFileNotExists|assertGreaterOrEquals|assertGreaterThan|assertGreaterThanOrEqual|assertInstanceOf|assertInternalType|assertIsEmpty|assertLessOrEquals|assertLessThan|assertLessThanOrEqual|assertNotContains|assertNotEmpty|assertNotEquals|assertNotInstanceOf|assertNotNull|assertNotRegExp|assertNotSame|assertNull|assertRegExp|assertSame|assertStringStartsNotWith|assertStringStartsWith|assertTrue|expectException|fail|dontSeeFullUrlEquals|dontSee|dontSeeFullUrlMatches|dontSeeInFullUrl|seeFullUrlEquals|seeFullUrlMatches|seeInFullUrl|grabFromFullUrl">
11+
<!ENTITY commonTestActions "acceptPopup|actionGroup|amOnPage|amOnUrl|amOnSubdomain|appendField|assertArrayIsSorted|assertArraySubset|assertElementContainsAttribute|attachFile|cancelPopup|checkOption|clearField|click|clickWithLeftButton|clickWithRightButton|closeAdminNotification|closeTab|comment|conditionalClick|createData|deleteData|updateData|getData|dontSee|dontSeeJsError|dontSeeCheckboxIsChecked|dontSeeCookie|dontSeeCurrentUrlEquals|dontSeeCurrentUrlMatches|dontSeeElement|dontSeeElementInDOM|dontSeeInCurrentUrl|dontSeeInField|dontSeeInFormFields|dontSeeInPageSource|dontSeeInSource|dontSeeInTitle|dontSeeLink|dontSeeOptionIsSelected|doubleClick|dragAndDrop|entity|executeJS|fillField|formatMoney|generateDate|grabAttributeFrom|grabCookie|grabFromCurrentUrl|grabMultiple|grabPageSource|grabTextFrom|grabValueFrom|loadSessionSnapshot|loginAsAdmin|magentoCLI|magentoCron|makeScreenshot|maximizeWindow|moveBack|moveForward|moveMouseOver|mSetLocale|mResetLocale|openNewTab|pauseExecution|parseFloat|pressKey|reloadPage|resetCookie|submitForm|resizeWindow|saveSessionSnapshot|scrollTo|scrollToTopOfPage|searchAndMultiSelectOption|see|seeCheckboxIsChecked|seeCookie|seeCurrentUrlEquals|seeCurrentUrlMatches|seeElement|seeElementInDOM|seeInCurrentUrl|seeInField|seeInFormFields|seeInPageSource|seeInPopup|seeInSource|seeInTitle|seeLink|seeNumberOfElements|seeOptionIsSelected|selectOption|setCookie|submitForm|switchToIFrame|switchToNextTab|switchToPreviousTab|switchToWindow|typeInPopup|uncheckOption|unselectOption|wait|waitForAjaxLoad|waitForElement|waitForElementChange|waitForElementNotVisible|waitForElementVisible|waitForPwaElementNotVisible|waitForPwaElementVisible|waitForJS|waitForLoadingMaskToDisappear|waitForPageLoad|waitForText|assertArrayHasKey|assertArrayNotHasKey|assertArraySubset|assertContains|assertCount|assertEmpty|assertEquals|assertFalse|assertFileExists|assertFileNotExists|assertGreaterOrEquals|assertGreaterThan|assertGreaterThanOrEqual|assertInstanceOf|assertInternalType|assertIsEmpty|assertLessOrEquals|assertLessThan|assertLessThanOrEqual|assertNotContains|assertNotEmpty|assertNotEquals|assertNotInstanceOf|assertNotNull|assertNotRegExp|assertNotSame|assertNull|assertRegExp|assertSame|assertStringStartsNotWith|assertStringStartsWith|assertTrue|expectException|fail|dontSeeFullUrlEquals|dontSee|dontSeeFullUrlMatches|dontSeeInFullUrl|seeFullUrlEquals|seeFullUrlMatches|seeInFullUrl|grabFromFullUrl|helper">
1212
]>
1313

1414
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../src/Magento/FunctionalTestingFramework/ObjectManager/etc/config.xsd">
@@ -222,6 +222,8 @@
222222
<item name="/tests/test/(createData|updateData|getData)/requiredEntity" xsi:type="string">createDataKey</item>
223223
<item name="/tests/test/(createData|updateData|getData)/field" xsi:type="string">key</item>
224224
<item name="/tests/test/(actionGroup|&commonTestActions;)" xsi:type="string">stepKey</item>
225+
<item name="/tests/test/helper/argument" xsi:type="string">name</item>
226+
<item name="/tests/test/(before|after)/helper/argument" xsi:type="string">name</item>
225227
<item name="/tests/test/(before|after)/(actionGroup|&commonTestActions;)" xsi:type="string">stepKey</item>
226228
<item name="/tests/test/remove" xsi:type="string">keyForRemoval</item>
227229
<item name="/tests/test/(before|after)/remove" xsi:type="string">keyForRemoval</item>
@@ -239,6 +241,8 @@
239241
<argument name="assocArrayAttributes" xsi:type="array">
240242
<item name="/tests/test/(actionGroup|&commonTestActions;)" xsi:type="string">stepKey</item>
241243
<item name="/tests/test/(before|after)/(actionGroup|&commonTestActions;)" xsi:type="string">stepKey</item>
244+
<item name="/tests/test/helper/argument" xsi:type="string">name</item>
245+
<item name="/tests/test/(before|after)/helper/argument" xsi:type="string">name</item>
242246
<item name="/tests/test/remove" xsi:type="string">keyForRemoval</item>
243247
<item name="/tests/test/(before|after)/remove" xsi:type="string">keyForRemoval</item>
244248
<item name="/tests/test" xsi:type="string">name</item>
@@ -299,6 +303,7 @@
299303
<argument name="idAttributes" xsi:type="array">
300304
<item name="/actionGroups/actionGroup" xsi:type="string">name</item>
301305
<item name="/actionGroups/actionGroup/arguments/argument" xsi:type="string">name</item>
306+
<item name="/actionGroups/actionGroup/helper/argument" xsi:type="string">name</item>
302307
<item name="/actionGroups/actionGroup/(&commonTestActions;)" xsi:type="string">stepKey</item>
303308
<item name="/actionGroups/actionGroup/(createData|updateData|getData)/requiredEntity" xsi:type="string">createDataKey</item>
304309
<item name="/actionGroups/actionGroup/(createData|updateData|getData)/field" xsi:type="string">key</item>
@@ -316,6 +321,7 @@
316321
<item name="/actionGroups/actionGroup/remove" xsi:type="string">keyForRemoval</item>
317322
<item name="/actionGroups/actionGroup" xsi:type="string">name</item>
318323
<item name="/actionGroups/actionGroup/arguments/argument" xsi:type="string">name</item>
324+
<item name="/actionGroups/actionGroup/helper/argument" xsi:type="string">name</item>
319325
<item name="/actionGroups/actionGroup/(createData|updateData|getData)/requiredEntity" xsi:type="string">createDataKey</item>
320326
<item name="/actionGroups/actionGroup/(createData|updateData|getData)/field" xsi:type="string">key</item>
321327
</argument>

‎src/Magento/FunctionalTestingFramework/Helper/Acceptance.php

Lines changed: 0 additions & 42 deletions
This file was deleted.

0 commit comments

Comments
 (0)