mirror of
https://github.com/silverstripe/silverstripe-behat-extension
synced 2024-10-22 17:05:32 +02:00
Merge branch '5.0' into 5
This commit is contained in:
commit
d946d69f17
@ -64,7 +64,7 @@ class EmailContext implements Context
|
||||
*/
|
||||
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 ?? '')) {
|
||||
@ -84,7 +84,7 @@ class EmailContext implements Context
|
||||
*/
|
||||
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);
|
||||
|
@ -133,10 +133,6 @@ trait DebugTools
|
||||
{
|
||||
// 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();
|
||||
|
Loading…
Reference in New Issue
Block a user