Skip to content

Commit

Permalink
Merge branch '5.0' into 5
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] committed Nov 18, 2023
2 parents b834b59 + c3fa40f commit d946d69
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
4 changes: 2 additions & 2 deletions src/Context/EmailContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public function before(BeforeScenarioScope $event)
*/
public function thereIsAnEmailFromTo($negate, $direction, $email)
{
$to = ($direction == 'to') ? $email : null;
$to = ($direction == 'to') ? $email : '';
$from = ($direction == 'from') ? $email : null;
$match = $this->mailer->findEmail($to, $from);
if (trim($negate ?? '')) {
Expand All @@ -84,7 +84,7 @@ public function thereIsAnEmailFromTo($negate, $direction, $email)
*/
public function thereIsAnEmailFromToTitled($negate, $direction, $email, $subject)
{
$to = ($direction == 'to') ? $email : null;
$to = ($direction == 'to') ? $email : '';
$from = ($direction == 'from') ? $email : null;
$match = $this->mailer->findEmail($to, $from, $subject);
$allMails = $this->mailer->findEmails($to, $from);
Expand Down
4 changes: 0 additions & 4 deletions src/Utility/DebugTools.php
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,6 @@ public function takeScreenshot(StepScope $event)
{
// Validate driver
$driver = $this->getSession()->getDriver();
if (!($driver instanceof FacebookWebDriver)) {
$this->logMessage('ScreenShots are only supported for FacebookWebDriver: skipping');
return;
}
$feature = $event->getFeature();
$step = $event->getStep();
$path = $this->prepareScreenshotPath();
Expand Down

0 comments on commit d946d69

Please sign in to comment.