Skip to content

Commit e2330e4

Browse files
imeron2433imeron2433
committedJan 12, 2018
MQE-325: Rename <tags-with-hyphens> to <camelCaseTags>
- add changes for createData require-entity tag rename
1 parent 835af0b commit e2330e4

File tree

5 files changed

+23
-23
lines changed

5 files changed

+23
-23
lines changed
 

‎etc/di.xml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@
149149
<item name="/entities/entity" xsi:type="string">name</item>
150150
<item name="/entities/entity/data" xsi:type="string">key</item>
151151
<item name="/entities/entity/array" xsi:type="string">key</item>
152-
<item name="/entities/entity/required-entity" xsi:type="string">name</item>
152+
<item name="/entities/entity/requiredEntity" xsi:type="string">name</item>
153153
</argument>
154154
<argument name="fileName" xsi:type="string">*Data.xml</argument>
155155
<argument name="defaultScope" xsi:type="string">Data</argument>
@@ -204,9 +204,9 @@
204204
<argument name="idAttributes" xsi:type="array">
205205
<item name="/tests/test" xsi:type="string">name</item>
206206
<item name="/tests/test/actionGroup/argument" xsi:type="string">name</item>
207-
<item name="/tests/test/createData/required-entity" xsi:type="string">createDataKey</item>
208-
<item name="/tests/test/updateData/required-entity" xsi:type="string">createDataKey</item>
209-
<item name="/tests/test/getData/required-entity" xsi:type="string">createDataKey</item>
207+
<item name="/tests/test/createData/requiredEntity" xsi:type="string">createDataKey</item>
208+
<item name="/tests/test/updateData/requiredEntity" xsi:type="string">createDataKey</item>
209+
<item name="/tests/test/getData/requiredEntity" xsi:type="string">createDataKey</item>
210210
<item name="/tests/test/(acceptPopup|actionGroup|amOnPage|amOnUrl|amOnSubdomain|appendField|assertArraySubset|assertElementContainsAttribute|attachFile|cancelPopup|checkOption|clearField|click|clickWithLeftButton|clickWithRightButton|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|executeInSelenium|fillField|formatMoney|grabAttributeFrom|grabCookie|grabFromCurrentUrl|grabMultiple|grabPageSource|grabTextFrom|grabValueFrom|loadSessionSnapshot|loginAsAdmin|makeScreenshot|maximizeWindow|moveBack|moveForward|moveMouseOver|mSetLocale|mResetLocale|openNewTab|pauseExecution|parseFloat|performOn|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|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)" xsi:type="string">stepKey</item>
211211
<item name="/tests/test/remove" xsi:type="string">keyForRemoval</item>
212212
<item name="/tests/test/before/remove" xsi:type="string">keyForRemoval</item>
@@ -227,15 +227,15 @@
227227
<item name="/tests/test/before/remove" xsi:type="string">keyForRemoval</item>
228228
<item name="/tests/test/after/remove" xsi:type="string">keyForRemoval</item>
229229
<item name="/tests/test" xsi:type="string">name</item>
230-
<item name="/tests/test/createData/required-entity" xsi:type="string">createDataKey</item>
231-
<item name="/tests/test/before/createData/required-entity" xsi:type="string">createDataKey</item>
232-
<item name="/tests/test/after/createData/required-entity" xsi:type="string">createDataKey</item>
233-
<item name="/tests/test/updateData/required-entity" xsi:type="string">createDataKey</item>
234-
<item name="/tests/test/before/updateData/required-entity" xsi:type="string">createDataKey</item>
235-
<item name="/tests/test/after/updateData/required-entity" xsi:type="string">createDataKey</item>
236-
<item name="/tests/test/getData/required-entity" xsi:type="string">createDataKey</item>
237-
<item name="/tests/test/before/getData/required-entity" xsi:type="string">createDataKey</item>
238-
<item name="/tests/test/after/getData/required-entity" xsi:type="string">createDataKey</item>
230+
<item name="/tests/test/createData/requiredEntity" xsi:type="string">createDataKey</item>
231+
<item name="/tests/test/before/createData/requiredEntity" xsi:type="string">createDataKey</item>
232+
<item name="/tests/test/after/createData/requiredEntity" xsi:type="string">createDataKey</item>
233+
<item name="/tests/test/updateData/requiredEntity" xsi:type="string">createDataKey</item>
234+
<item name="/tests/test/before/updateData/requiredEntity" xsi:type="string">createDataKey</item>
235+
<item name="/tests/test/after/updateData/requiredEntity" xsi:type="string">createDataKey</item>
236+
<item name="/tests/test/getData/requiredEntity" xsi:type="string">createDataKey</item>
237+
<item name="/tests/test/before/getData/requiredEntity" xsi:type="string">createDataKey</item>
238+
<item name="/tests/test/after/getData/requiredEntity" xsi:type="string">createDataKey</item>
239239
<item name="/tests/test/actionGroup/argument" xsi:type="string">name</item>
240240
</argument>
241241
<argument name="numericArrays" xsi:type="array">
@@ -364,8 +364,8 @@
364364
<item name="/suites/suite" xsi:type="string">name</item>
365365
<item name="/suites/suite/before/(createData|deleteData)" xsi:type="string">stepKey</item>
366366
<item name="/suites/suite/after/(createData|deleteData)" xsi:type="string">stepKey</item>
367-
<item name="/suites/suite/before/createData/required-entity" xsi:type="string">createDataKey</item>
368-
<item name="/suites/suite/after/createData/required-entity" xsi:type="string">createDataKey</item>
367+
<item name="/suites/suite/before/createData/requiredEntity" xsi:type="string">createDataKey</item>
368+
<item name="/suites/suite/after/createData/requiredEntity" xsi:type="string">createDataKey</item>
369369
<item name="/suites/suite/include/group" xsi:type="string">name</item>
370370
<item name="/suites/suite/include/test" xsi:type="string">name</item>
371371
<item name="/suites/suite/include/module" xsi:type="string">name</item>

‎src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/DataObjectHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ private function processUniquenessData($entityData)
219219
}
220220

221221
/**
222-
* Parses <required-entity> elements given entity, and returns them as an array of "EntityValue"=>"EntityType"
222+
* Parses <requiredEntity> elements given entity, and returns them as an array of "EntityValue"=>"EntityType"
223223
*
224224
* @param string[] $entityData
225225
* @return string[]

‎src/Magento/FunctionalTestingFramework/Suite/Generators/GroupClassGenerator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ private function buildReqEntitiesMustacheArray($customAttributes)
137137
continue;
138138
}
139139

140-
if ($attribute[ActionObjectExtractor::NODE_NAME] == 'required-entity') {
140+
if ($attribute[ActionObjectExtractor::NODE_NAME] == 'requiredEntity') {
141141
$requiredEntities[] = [self::ENTITY_NAME_TAG => $attribute[TestGenerator::REQUIRED_ENTITY_REFERENCE]];
142142
}
143143
}

‎src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@
453453
</xs:complexType>
454454
<xs:complexType name="createDataType">
455455
<xs:choice minOccurs="0" maxOccurs="unbounded">
456-
<xs:element type="requiredEntityType" name="required-entity" minOccurs="0" maxOccurs="unbounded"/>
456+
<xs:element type="requiredEntityType" name="requiredEntity" minOccurs="0" maxOccurs="unbounded"/>
457457
</xs:choice>
458458
<xs:attribute type="xs:string" name="entity" use="required"/>
459459
<xs:attribute type="xs:string" name="stepKey" use="required"/>
@@ -472,7 +472,7 @@
472472
</xs:complexType>
473473
<xs:complexType name="updateDataType">
474474
<xs:choice minOccurs="0" maxOccurs="unbounded">
475-
<xs:element type="requiredEntityType" name="required-entity" minOccurs="0" maxOccurs="unbounded"/>
475+
<xs:element type="requiredEntityType" name="requiredEntity" minOccurs="0" maxOccurs="unbounded"/>
476476
</xs:choice>
477477
<xs:attribute type="xs:string" name="entity" use="required"/>
478478
<xs:attribute type="xs:string" name="stepKey" use="required"/>
@@ -494,7 +494,7 @@
494494
</xs:complexType>
495495
<xs:complexType name="getDataType">
496496
<xs:choice minOccurs="0" maxOccurs="unbounded">
497-
<xs:element type="requiredEntityType" name="required-entity" minOccurs="0" maxOccurs="unbounded"/>
497+
<xs:element type="requiredEntityType" name="requiredEntity" minOccurs="0" maxOccurs="unbounded"/>
498498
</xs:choice>
499499
<xs:attribute type="xs:string" name="entity" use="required"/>
500500
<xs:attribute type="xs:string" name="stepKey" use="required"/>

‎src/Magento/FunctionalTestingFramework/Util/TestGenerator.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@ private function generateStepsPhp($stepsObject, $hookObject = false)
580580
$requiredEntities = [];
581581
$requiredEntityObjects = [];
582582
foreach ($customActionAttributes as $customAttribute) {
583-
if (is_array($customAttribute) && $customAttribute['nodeName'] = 'required-entity') {
583+
if (is_array($customAttribute) && $customAttribute['nodeName'] = 'requiredEntity') {
584584
if ($hookObject) {
585585
$requiredEntities [] = "\$this->" . $customAttribute[self::REQUIRED_ENTITY_REFERENCE] .
586586
"->getName() => " . "\$this->" . $customAttribute[self::REQUIRED_ENTITY_REFERENCE] .
@@ -663,7 +663,7 @@ private function generateStepsPhp($stepsObject, $hookObject = false)
663663
$requiredEntities = [];
664664
$requiredEntityObjects = [];
665665
foreach ($customActionAttributes as $customAttribute) {
666-
if (is_array($customAttribute) && $customAttribute['nodeName'] = 'required-entity') {
666+
if (is_array($customAttribute) && $customAttribute['nodeName'] = 'requiredEntity') {
667667
if ($hookObject) {
668668
$requiredEntities [] = "\$this->" . $customAttribute[self::REQUIRED_ENTITY_REFERENCE] .
669669
"->getName() => " . "\$this->" . $customAttribute[self::REQUIRED_ENTITY_REFERENCE] .
@@ -721,7 +721,7 @@ private function generateStepsPhp($stepsObject, $hookObject = false)
721721
$requiredEntities = [];
722722
$requiredEntityObjects = [];
723723
foreach ($customActionAttributes as $customAttribute) {
724-
if (is_array($customAttribute) && $customAttribute['nodeName'] = 'required-entity') {
724+
if (is_array($customAttribute) && $customAttribute['nodeName'] = 'requiredEntity') {
725725
if ($hookObject) {
726726
$requiredEntities [] = "\$this->" . $customAttribute[self::REQUIRED_ENTITY_REFERENCE] .
727727
"->getName() => " . "\$this->" . $customAttribute[self::REQUIRED_ENTITY_REFERENCE] .

0 commit comments

Comments
 (0)