Merge branch '5.0' into 5

silverstripe · Nov 18, 2023 · d946d69 · d946d69
2 parents b834b59 + c3fa40f
commit d946d69
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/src/Context/EmailContext.php b/src/Context/EmailContext.php
@@ -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 ?? '')) {
@@ -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);

diff --git a/src/Utility/DebugTools.php b/src/Utility/DebugTools.php
@@ -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();