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

Merge branch '5.0' into 5

Browse Source
This commit is contained in:
github-actions 2023-11-18 14:23:19 +00:00
commit d946d69f17
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Context/EmailContext.php
View File

@ -64,7 +64,7 @@ class EmailContext implements Context
*/ */
public function thereIsAnEmailFromTo($negate, $direction, $email) public function thereIsAnEmailFromTo($negate, $direction, $email)
{ {
$to = ($direction == 'to') ? $email : null; $to = ($direction == 'to') ? $email : '';
$from = ($direction == 'from') ? $email : null; $from = ($direction == 'from') ? $email : null;
$match = $this->mailer->findEmail($to, $from); $match = $this->mailer->findEmail($to, $from);
if (trim($negate ?? '')) { if (trim($negate ?? '')) {
@ -84,7 +84,7 @@ class EmailContext implements Context
*/ */
public function thereIsAnEmailFromToTitled($negate, $direction, $email, $subject) public function thereIsAnEmailFromToTitled($negate, $direction, $email, $subject)
{ {
$to = ($direction == 'to') ? $email : null; $to = ($direction == 'to') ? $email : '';
$from = ($direction == 'from') ? $email : null; $from = ($direction == 'from') ? $email : null;
$match = $this->mailer->findEmail($to, $from, $subject); $match = $this->mailer->findEmail($to, $from, $subject);
$allMails = $this->mailer->findEmails($to, $from); $allMails = $this->mailer->findEmails($to, $from);

4
src/Utility/DebugTools.php
View File

@ -133,10 +133,6 @@ trait DebugTools
{ {
// Validate driver // Validate driver
$driver = $this->getSession()->getDriver(); $driver = $this->getSession()->getDriver();
if (!($driver instanceof FacebookWebDriver)) {
$this->logMessage('ScreenShots are only supported for FacebookWebDriver: skipping');
return;
}
$feature = $event->getFeature(); $feature = $event->getFeature();
$step = $event->getStep(); $step = $event->getStep();
$path = $this->prepareScreenshotPath(); $path = $this->prepareScreenshotPath();