Skip to content

Commit 665005c

Browse files
imeron2433imeron2433
committed
MQE-224:Update Object Model to reflect updated XML schema
- move Cest Objects into Test/Objects dir - change CestDataManager to CestArrayProcessor - update objects to reflect new schema
1 parent 90d4bdb commit 665005c

File tree

13 files changed

+1549
-435
lines changed

13 files changed

+1549
-435
lines changed

‎entryPoint.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
<?php
22

33
require_once 'bootstrap.php';
4+
5+
/** @var Magento\AcceptanceTestFramework\Dummy $dummy */
6+
//$dummy = $objectManager->create(\Magento\AcceptanceTestFramework\Dummy::class);
7+
//$dummy->readPageObjects();

‎etc/di.xml

Lines changed: 35 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,24 @@
4949
</arguments>
5050
</type>
5151
<type name="Magento\AcceptanceTestFramework\Util\ModuleResolver\SequenceSorter" />
52-
52+
<type name="Magento\AcceptanceTestFramework\Generate\GeneratePage">
53+
<arguments>
54+
<argument name="configData" xsi:type="object">Magento\AcceptanceTestFramework\Page\Config\Data</argument>
55+
</arguments>
56+
</type>
57+
<type name="Magento\AcceptanceTestFramework\Generate\GenerateBlock">
58+
<arguments>
59+
<argument name="configData" xsi:type="object">Magento\AcceptanceTestFramework\Block\Config\Data</argument>
60+
</arguments>
61+
</type>
62+
<type name="Magento\AcceptanceTestFramework\Generate\Pool">
63+
<arguments>
64+
<argument name="pool" xsi:type="array">
65+
<item name="page" xsi:type="object">Magento\AcceptanceTestFramework\Generate\GeneratePage</item>
66+
<item name="block" xsi:type="object">Magento\AcceptanceTestFramework\Generate\GenerateBlock</item>
67+
</argument>
68+
</arguments>
69+
</type>
5370
<!--
5471
Array item can be of any type just like an argument, including array type itself, which creates circular dependency.
5572
Proxy is used to resolve the circular dependency, so that array items undergo the same interpretation as arguments.
@@ -204,15 +221,6 @@
204221
<argument name="idAttributes" xsi:type="array">
205222
<item name="/config/cest" xsi:type="string">name</item>
206223
<item name="/config/cest/test" xsi:type="string">name</item>
207-
<item name="/config/cest/annotations/features" xsi:type="string">value</item>
208-
<item name="/config/cest/annotations/stories" xsi:type="string">value</item>
209-
<item name="/config/cest/annotations/title" xsi:type="string">value</item>
210-
<item name="/config/cest/annotations/description" xsi:type="string">value</item>
211-
<item name="/config/cest/annotations/severity" xsi:type="string">value</item>
212-
<item name="/config/cest/annotations/testCaseId" xsi:type="string">value</item>
213-
<item name="/config/cest/annotations/group" xsi:type="string">value</item>
214-
<item name="/config/cest/annotations/env" xsi:type="string">value</item>
215-
<item name="/config/cest/annotations/return" xsi:type="string">value</item>
216224
<item name="/config/cest/test/(acceptPopup|amOnPage|appendField|assertArraySubset|attachFile|cancelPopup|checkOption|click|clickWithLeftButton|clickWithRightButton|closeTab|dontSee|dontSeeCheckboxIsChecked|dontSeeCookie|dontSeeCurrentUrlEquals|dontSeeCurrentUrlMatches|dontSeeElement|dontSeeElementInDOM|dontSeeInCurrentUrl|dontSeeInField|dontSeeInPageSource|dontSeeInSource|dontSeeInTitle|dontSeeLink|dontSeeOptionIsSelected|doubleClick|dragAndDrop|executeJS|fillField|grabAttributeFrom|grabCookie|grabFromCurrentUrl|grabMultiple|grabTextFrom|grabValueFrom|makeScreenshot|maximizeWindow|moveBack|moveForward|moveMouseOver|openNewTab|pauseExecution|pressKey|reloadPage|resetCookie|resizeWindow|scrollTo|see|seeCheckboxIsChecked|seeCookie|seeCurrentUrlEquals|seeCurrentUrlMatches|seeElement|seeElementInDOM|seeInCurrentUrl|seeInField|seeInPageSource|seeInPopup|seeInSource|seeInTitle|seeLink|seeNumberOfElements|seeOptionIsSelected|selectOption|setCookie|switchToIFrame|switchToNextTab|switchToPreviousTab|switchToWindow|typeInPopup|uncheckOption|unselectOption|wait|waitForElement|waitForElementNotVisible|waitForElementVisible|waitForJS|waitForText)" xsi:type="string">mergeKey</item>
217225
</argument>
218226
<argument name="fileName" xsi:type="string">*Cest.xml</argument>
@@ -229,6 +237,23 @@
229237
</argument>
230238
<argument name="numericArrays" xsi:type="array">
231239
<item name="/config/cest/annotations/env" xsi:type="string">/config/cest/annotations/env</item>
240+
<item name="/config/cest/annotations/features" xsi:type="string">/config/cest/annotations/features</item>
241+
<item name="/config/cest/annotations/stories" xsi:type="string">/config/cest/annotations/stories</item>
242+
<item name="/config/cest/annotations/title" xsi:type="string">/config/cest/annotations/title</item>
243+
<item name="/config/cest/annotations/description" xsi:type="string">/config/cest/annotations/description</item>
244+
<item name="/config/cest/annotations/severity" xsi:type="string">/config/cest/annotations/severity</item>
245+
<item name="/config/cest/annotations/testCaseId" xsi:type="string">/config/cest/annotations/testCaseId</item>
246+
<item name="/config/cest/annotations/group" xsi:type="string">/config/cest/annotations/group</item>
247+
<item name="/config/cest/annotations/return" xsi:type="string">/config/cest/annotations/return</item>
248+
<item name="/config/cest/test/annotations/features" xsi:type="string">/config/cest/test/annotations/features</item>
249+
<item name="/config/cest/test/annotations/stories" xsi:type="string">/config/cest/test/annotations/stories</item>
250+
<item name="/config/cest/test/annotations/title" xsi:type="string">/config/cest/test/annotations/title</item>
251+
<item name="/config/cest/test/annotations/description" xsi:type="string">/config/cest/test/annotations/description</item>
252+
<item name="/config/cest/test/annotations/severity" xsi:type="string">/config/cest/test/annotations/severity</item>
253+
<item name="/config/cest/test/annotations/testCaseId" xsi:type="string">/config/cest/test/annotations/testCaseId</item>
254+
<item name="/config/cest/test/annotations/group" xsi:type="string">/config/cest/test/annotations/group</item>
255+
<item name="/config/cest/test/annotations/env" xsi:type="string">/config/cest/test/annotations/env</item>
256+
<item name="/config/cest/test/annotations/return" xsi:type="string">/config/cest/test/annotations/return</item>
232257
</argument>
233258
</arguments>
234259
</virtualType>

‎src/Magento/AcceptanceTestFramework/Test/ActionObject.php

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

‎src/Magento/AcceptanceTestFramework/Test/CestDataConstants.php

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,22 @@
44

55
class CestDataConstants
66
{
7-
const CEST_ROOT = 'cest';
7+
const CEST_ROOT = 'config';
88
const CEST_ANNOTATIONS = 'annotations';
99

1010
const CEST_BEFORE_HOOK = 'before';
1111
const CEST_AFTER_HOOK = 'after';
1212

13-
const CEST_USE_STATEMENTS = 'use';
14-
const CEST_USE_PATH = 'path';
1513
const CEST_TEST_TAG = 'test';
16-
1714
const TEST_ANNOTATIONS = 'annotations';
18-
const TEST_DEPENDENCY = 'dependency';
19-
const TEST_DEPENDENCY_ACTOR = 'actor';
20-
21-
const TEST_ACTION = 'action';
22-
const TEST_ACTION_FUNCTION = 'function';
23-
const TEST_ACTION_ACTOR = 'actor';
24-
const TEST_ACTION_PARAMETER = 'parameter';
25-
const TEST_ACTION_SELECTOR = 'selector';
15+
2616
const TEST_ACTION_BEFORE = 'before';
2717
const TEST_ACTION_AFTER = 'after';
28-
const TEST_ACTION_USER_INPUT = 'userInput';
29-
const TEST_ACTION_RETURN_VARIABLE = 'returnVariable';
18+
19+
const TEST_STEP_MERGE_KEY = 'mergeKey';
20+
const NODE_NAME = 'nodeName';
21+
const NAME = 'name';
3022

3123
const ANNOTATION_VALUE = 'value';
3224

33-
}
25+
}

‎src/Magento/AcceptanceTestFramework/Test/CestDataManager.php

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

0 commit comments

Comments
 (0)