tonyair/silverstripe-behat-extension
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-behat-extension synced 2024-10-22 17:05:32 +02:00
Code Issues Projects Releases Wiki Activity

FIX Emails are arrays

Browse Source 
Work missed during #232
This commit is contained in:
Guy Sartorelli 2023-01-27 15:54:42 +13:00
parent dfcafd60cb
commit 73126eab5c
No known key found for this signature in database
GPG Key ID: F313E3B9504D496A
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/Context/EmailContext.php
View File

@ -125,10 +125,10 @@ class EmailContext implements Context
$email = $this->lastMatchedEmail;
$emailContent = null;
if ($email->Content) {
$emailContent = $email->Content;
if ($email['Content']) {
$emailContent = $email['Content'];
} else {
$emailContent = $email->PlainContent;
$emailContent = $email['PlainContent'];
}
if (trim($negate ?? '')) {
@ -154,8 +154,7 @@ class EmailContext implements Context
}
$email = $this->lastMatchedEmail;
$emailContent = ($email->Content) ? ($email->Content) : ($email->PlainContent);
$emailPlainText = strip_tags($emailContent ?? '');
$emailPlainText = $email['PlainContent'] ? $email['PlainContent'] : strip_tags($email['Content']);
$emailPlainText = preg_replace("/\h+/", " ", $emailPlainText ?? '');
Assert::assertStringContainsString($content, $emailPlainText);
@ -219,7 +218,7 @@ class EmailContext implements Context
}
$match = $this->lastMatchedEmail;
$crawler = new Crawler($match->Content);
$crawler = new Crawler($match['Content']);
$linkEl = $crawler->selectLink($linkSelector);
Assert::assertNotNull($linkEl);
$link = $linkEl->attr('href');
@ -254,10 +253,10 @@ class EmailContext implements Context
$email = $this->lastMatchedEmail;
$emailContent = null;
if ($email->Content) {
$emailContent = $email->Content;
if ($email['Content']) {
$emailContent = $email['Content'];
} else {
$emailContent = $email->PlainContent;
$emailContent = $email['PlainContent'];
}
// Convert html content to plain text
$emailContent = strip_tags($emailContent ?? '');
@ -309,9 +308,9 @@ class EmailContext implements Context
$match = $this->lastMatchedEmail;
if (trim($negate ?? '')) {
Assert::assertStringNotContainsString($from, $match->From);
Assert::assertStringNotContainsString($from, $match['From']);
} else {
Assert::assertStringContainsString($from, $match->From);
Assert::assertStringContainsString($from, $match['From']);
}
}
@ -328,9 +327,9 @@ class EmailContext implements Context
$match = $this->lastMatchedEmail;
if (trim($negate ?? '')) {
Assert::assertStringNotContainsString($to, $match->To);
Assert::assertStringNotContainsString($to, $match['To']);
} else {
Assert::assertStringContainsString($to, $match->To);
Assert::assertStringContainsString($to, $match['To']);
}
}
@ -348,7 +347,7 @@ class EmailContext implements Context
}
$email = $this->lastMatchedEmail;
$html = $email->Content;
$html = $email['Content'];
$dom = new \DOMDocument();
$dom->loadHTML($html);