Skip to content

Commit 6afe4b6

Browse files
MTO-104: [Test] Export Customer Addresses
- Tests fixed.
1 parent 4536c8a commit 6afe4b6

File tree

1 file changed

+15
-5
lines changed

1 file changed

+15
-5
lines changed

dev/tests/functional/tests/app/Magento/CustomerImportExport/Test/Constraint/AssertExportCustomerAddresses.php

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,23 @@ private function isAddressDataInFile(
6969
Address $address,
7070
Data $exportData
7171
) {
72-
$regexp = '/';
72+
$expectedFields = [];
73+
$result = true;
74+
7375
foreach ($fields as $field) {
7476
$fixture = ($field == 'email') ? $customer : $address;
75-
$regexp .= '.*(' . $fixture->getData($field) . ')';
77+
$expectedFields[] = $fixture->getData($field);
7678
}
77-
$regexp .= '/U';
78-
preg_match($regexp, $exportData->getContent(), $matches);
79-
return !empty($matches);
79+
80+
$content = $exportData->getContent();
81+
82+
foreach ($expectedFields as $expectedField) {
83+
if (strpos($content, $expectedField) === false) {
84+
$result = false;
85+
break;
86+
}
87+
}
88+
89+
return $result;
8090
}
8191
}

0 commit comments

Comments
 (0)