Skip to content
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.

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

MQE-565: User are not able to use <actionGroup> after updating the la… #16

Merged
merged 1 commit into from
Dec 1, 2017
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -35,6 +35,14 @@ class ActionGroupFunctionalCest
$ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson");
$this->createPersonParam = new DataPersistenceHandler($ReplacementPerson);
$this->createPersonParam->createEntity();
$I->fillField("#foo", "myData1");
$I->fillField("#bar", "myData2");
}

public function _after(AcceptanceTester $I)
{
$I->fillField("#foo", "myData1");
$I->fillField("#bar", "myData2");
}

/**
Original file line number Diff line number Diff line change
@@ -18,6 +18,7 @@
</annotations>
<before>
<createData entity="ReplacementPerson" mergeKey="createPersonParam"/>
<actionGroup ref="FunctionalActionGroup" mergeKey="beforeGroup"/>
</before>
<test name="BasicActionGroupTest">
<amOnPage mergeKey="step1" url="/someUrl"/>
@@ -67,5 +68,8 @@
<argument name="myArg" value="DefaultPerson"/>
</actionGroup>
</test>
<after>
<actionGroup ref="FunctionalActionGroup" mergeKey="afterGroup"/>
</after>
</cest>
</config>
12 changes: 9 additions & 3 deletions src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd
Original file line number Diff line number Diff line change
@@ -69,18 +69,24 @@
</xs:complexType>
<xs:complexType name="hookType">
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:group ref="actionTypeTags"/>
<xs:group ref="testTypeTags"/>
</xs:choice>
</xs:complexType>
<xs:complexType name="testType">
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:group ref="actionTypeTags" />
<xs:group ref="testTypeTags" />
<xs:element type="annotationsType" name="annotations" minOccurs="0"/>
<xs:element type="actions" name="actionGroup" minOccurs="0"/>
</xs:choice>
<xs:attribute type="xs:string" name="name"/>
<xs:attribute type="xs:boolean" name="remove" default="false"/>
</xs:complexType>
<xs:group name="testTypeTags">
<xs:choice>
<xs:group ref="actionTypeTags"/>
<xs:element type="actions" name="actionGroup" minOccurs="0"/>
</xs:choice>
</xs:group>

<xs:group name="actionTypeTags">
<xs:choice>
<xs:group ref="dataOperationTags"/>