Fixes waitForTextIn() broken in v7.11.2

Signed-off-by: Mior Muhammad Zaki <[email protected]>

src/Concerns/WaitsForElements.php

@@ -9,6 +9,7 @@
 use Facebook\WebDriver\WebDriverExpectedCondition;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
+use PHPUnit\Framework\ExpectationFailedException;
 
 trait WaitsForElements
 {
@@ -124,8 +125,8 @@ public function waitForTextIn($selector, $text, $seconds = null)
         $message = 'Waited %s seconds for text "'.$this->escapePercentCharacters($text).'" in selector '.$selector;
 
         return $this->waitUsing($seconds, 100, function () use ($selector, $text) {
-            return $this->assertSeeIn($selector, $text);
-        }, $message);
+            return Str::contains($this->resolver->findOrFail($selector)->getText(), $text);
+        }, $message)->assertSeeIn($selector, $text);
     }
 
     /**
@@ -394,8 +395,12 @@ public function waitUsing($seconds, $interval, Closure $callback, $message = nul
 
         $this->driver->wait($seconds, $interval)->until(
             function ($driver) use ($callback) {
-                if ($callback()) {
-                    return true;
+                try {
+                    if ($callback()) {
+                        return true;
+                    }
+                } catch (ExpectationFailedException $e) {
+                    return false;
                 }
             },
             $message ? sprintf($message, $seconds) : "Waited {$seconds} seconds for callback."