Skip to content

Commit 455b947

Browse files
committed
MAGETWO-33053: MTF Configuration pull request
1 parent 5c2b0da commit 455b947

File tree

1 file changed

+17
-7
lines changed

1 file changed

+17
-7
lines changed

dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerForm.php

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,13 @@ public function processAssert(
7070

7171
$pageCustomerIndex->open();
7272
$pageCustomerIndex->getCustomerGridBlock()->searchAndOpen($filter);
73+
74+
/** @var \Magento\Mtf\System\Event\EventManagerInterface $eventManager */
75+
$eventManager = $this->objectManager->get('Magento\Mtf\System\Event\EventManagerInterface');
76+
$eventManager->dispatchEvent(['exception'], [var_export($data, true)]);
77+
7378
$dataForm = $pageCustomerIndexEdit->getCustomerForm()->getDataCustomer($customer, $address);
74-
$dataDiff = $this->verify($data, $dataForm);;
79+
$dataDiff = $this->verify($data, $dataForm);
7580
\PHPUnit_Framework_Assert::assertTrue(
7681
empty($dataDiff),
7782
'Customer data on edit page(backend) not equals to passed from fixture.'
@@ -95,17 +100,22 @@ protected function verify(array $dataFixture, array $dataForm)
95100
if (in_array($name, $this->customerSkippedFields)) {
96101
continue;
97102
}
98-
if (!isset($dataForm['customer'][$name])) {
99-
$msg = print_r($dataFixture, true) . print_r($dataForm, true);;
100-
throw new \Exception('Testmsg ' . $msg . ' Testmsg');
103+
if (isset($dataForm['customer'][$name])) {
104+
$result[] = "\ncustomer {$name}: \"{$dataForm['customer'][$name]}\" instead of \"{$value}\"";
105+
} else {
106+
$result[] = "\ncustomer {$name}: Field is absent. Expected value \"{$value}\"";
101107
}
102-
$result[] = "\ncustomer {$name}: \"{$dataForm['customer'][$name]}\" instead of \"{$value}\"";
103108
}
104109
foreach ($dataFixture['addresses'] as $key => $address) {
105110
$addressDiff = array_diff($address, $dataForm['addresses'][$key]);
106111
foreach ($addressDiff as $name => $value) {
107-
$result[] = "\naddress #{$key} {$name}: \"{$dataForm['addresses'][$key][$name]}"
108-
. "\" instead of \"{$value}\"";
112+
if (isset($dataForm['addresses'][$key][$name])) {
113+
$result[] = "\naddress #{$key} {$name}: \"{$dataForm['addresses'][$key][$name]}"
114+
. "\" instead of \"{$value}\"";
115+
} else {
116+
$result[] = "\naddress #{$key} {$name}: Field absent. Expected value \"{$value}\"";
117+
}
118+
109119
}
110120
}
111121

0 commit comments

Comments
 (0)