Skip to content

MQE-843: Nested Assertion syntax does not support entity resolution #52

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.

Sign up for GitHub

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

Merged
KevinBKozan merged 3 commits into from
Mar 12, 2018
Merged

MQE-843: Nested Assertion syntax does not support entity resolution #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9423502
MQE-843: Nested Assertion syntax does not support entity resolution
KevinBKozan Mar 6, 2018
e0aaf6a
MQE-843: Nested Assertion syntax does not support entity resolution
KevinBKozan Mar 9, 2018
e3ea48b
Merge branch 'develop' into MQE-843
KevinBKozan Mar 12, 2018
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
1 change: 1 addition & 0 deletions dev/tests/verification/Resources/AssertTest.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,5 +154,6 @@ class AssertTestCest
$I->assertElementContainsAttribute(".admin__menu-overlay", "border", "0");
$I->assertElementContainsAttribute("#username", "value", $createData2->getCreatedDataByName('firstname'));
$I->assertElementContainsAttribute("#username", "value", $this->createData1->getCreatedDataByName('firstname'));
$I->assertEquals("John", "Doe", "pass");
}
}
6 changes: 6 additions & 0 deletions dev/tests/verification/TestModule/Test/AssertTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,5 +283,11 @@
<assertElementContainsAttribute stepKey="assertElementContainsAttribute8" selector="#username" attribute="value">
<expectedResult type="const">$$createData1.firstname$$</expectedResult>
</assertElementContainsAttribute>

<!-- assert entity resolution -->
<assertEquals stepKey="assertEqualsEntity" message="pass">
<expectedResult type="string">{{simpleData.firstname}}</expectedResult>
<actualResult type="string">{{simpleData.lastname}}</actualResult>
</assertEquals>
</test>
</tests>
2 changes: 1 addition & 1 deletion src/Magento/FunctionalTestingFramework/Module/MagentoAssert.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public function assertArrayIsSorted(array $data, $sortOrder = "asc")
$data = array_map('strtolower', $data);
}

if ($sortOrder = "asc") {
if ($sortOrder == "asc") {
for ($i = 1; $i < $elementTotal; $i++) {
// $i >= $i-1
$this->assertLessThanOrEqual($data[$i], $data[$i-1], $message);
Expand Down
5 changes: 3 additions & 2 deletions src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ public function setTimeout($timeout)
public function resolveReferences()
{
if (empty($this->resolvedCustomAttributes)) {
$this->trimAssertionAttributes();
$this->resolveSelectorReferenceAndTimeout();
$this->resolveUrlReference();
$this->resolveDataInputReferences();
Expand Down Expand Up @@ -270,9 +271,9 @@ public function trimAssertionAttributes()
foreach ($this->actionAttributes as $key => $subAttributes) {
if (in_array($key, $relevantKeys)) {
$prefix = ActionObject::ASSERTION_ATTRIBUTES[$key];
$this->resolvedCustomAttributes[$prefix . ucfirst(ActionObject::ASSERTION_TYPE_ATTRIBUTE)] =
$this->actionAttributes[$prefix . ucfirst(ActionObject::ASSERTION_TYPE_ATTRIBUTE)] =
$subAttributes[ActionObject::ASSERTION_TYPE_ATTRIBUTE];
$this->resolvedCustomAttributes[$prefix] =
$this->actionAttributes[$prefix] =
$subAttributes[ActionObject::ASSERTION_VALUE_ATTRIBUTE];
unset($this->actionAttributes[$key]);
}
Expand Down
1 change: 0 additions & 1 deletion src/Magento/FunctionalTestingFramework/Test/Util/ActionMergeUtil.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,6 @@ private function sortActions($parsedSteps)
{
foreach ($parsedSteps as $parsedStep) {
$parsedStep->resolveReferences();
$parsedStep->trimAssertionAttributes();
if ($parsedStep->getLinkedAction()) {
$this->stepsToMerge[$parsedStep->getStepKey()] = $parsedStep;
} else {
Expand Down